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/admin/cli/apps/MonApp/src/main/java/com/elf/enterprise/monitoring/ProbeServlet.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MonApp/src/main/java/com/elf/enterprise/monitoring/ProbeServlet.java
index d309c68..3b4dca8 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MonApp/src/main/java/com/elf/enterprise/monitoring/ProbeServlet.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MonApp/src/main/java/com/elf/enterprise/monitoring/ProbeServlet.java
@@ -75,10 +75,10 @@
// KISS
for (Iterator<String> it = getAllProbes().iterator(); it.hasNext();) {
String s = it.next();
-
+
if(s.startsWith("fooblog"))
s = "<b>" + s + "</b>";
-
+
pr("<li>" + s + "</li>");
}
pr("</ul>");
@@ -147,7 +147,7 @@
processRequest(request, response);
}
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -160,7 +160,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-app-client/build.xml b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-app-client/build.xml
index 622bcbd..1a137a1 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-app-client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-app-client/build.xml
@@ -30,9 +30,9 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
@@ -58,12 +58,12 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
- The targets of interest are:
+ The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
@@ -71,7 +71,7 @@
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
- run: execution of project
+ run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
@@ -83,10 +83,10 @@
</exec>
</target>
- Notice that the overridden target depends on the jar target and not only on
- the compile target as the regular run target does. Again, for a list of available
+ Notice that the overridden target depends on the jar target and not only on
+ the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
- nbproject/build-impl.xml file.
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/build.xml b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/build.xml
index ee23c07..678c116 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/build.xml
@@ -30,9 +30,9 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
@@ -48,7 +48,7 @@
(Targets beginning with '-' are not intended to be called on their own.)
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -56,20 +56,20 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -77,10 +77,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
index 06ff63e..516e9ba 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
@@ -31,5 +31,5 @@
public interface MySessionBeanRemote {
String getMessage();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/build.xml b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/build.xml
index 08502d0..e431ad5 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
index 0558fea..cbc738c 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
@@ -65,7 +65,7 @@
}
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -78,7 +78,7 @@
processRequest(request, response);
}
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -91,7 +91,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/build.xml b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/build.xml
index 5696571..896689a 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/build.xml
@@ -30,21 +30,21 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- pre-init: called before initialization of project properties
- post-init: called after initialization of project properties
- pre-compile: called before javac compilation
- post-compile: called after javac compilation
- pre-dist: called before archive building
- post-dist: called after archive building
- post-clean: called after cleaning build products
+ pre-init: called before initialization of project properties
+ post-init: called after initialization of project properties
+ pre-compile: called before javac compilation
+ post-compile: called after javac compilation
+ pre-dist: called before archive building
+ post-dist: called after archive building
+ post-clean: called after cleaning build products
pre-run-deploy: called before deploying
post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -52,17 +52,17 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
do-dist: archive building
- run: execution of project
+ run: execution of project
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -70,10 +70,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/Zombie/pom.xml b/appserver/tests/appserv-tests/devtests/admin/cli/apps/Zombie/pom.xml
index 6838322..336e951 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/Zombie/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/Zombie/pom.xml
@@ -40,16 +40,16 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.elf</groupId>
- <artifactId>glassfish</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <dependency>
+ <groupId>com.elf</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
+ <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/build.xml b/appserver/tests/appserv-tests/devtests/admin/cli/build.xml
index 3811523..d9be326 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/build.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/build.xml
@@ -173,7 +173,7 @@
<antcall target="dev-report"/>
<echo message="Detailed results available under ${env.APS_HOME}/test_results.html"/>
</target>
-
+
<target name="clientstubs" depends="init">
<runtest classname="admin.ClientStubsTests"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/pom.xml b/appserver/tests/appserv-tests/devtests/admin/cli/pom.xml
index 14ea247..ffa709f 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/pom.xml
@@ -35,7 +35,7 @@
<developerConnection>scm:git:git://github.com/eclipse-ee4j/glassfish</developerConnection>
<url>https://github.com/eclipse-ee4j/glassfish</url>
</scm>
-
+
<modules>
<module>cluster</module>
<module>instance</module>
@@ -79,7 +79,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkCount>0</forkCount>
+ <forkCount>0</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminObjectTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminObjectTest.java
index 236ee4e..d5aac4b 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminObjectTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/AdminObjectTest.java
@@ -36,7 +36,7 @@
private static final String DELETE_RESOURCE_REF = "delete-resource-ref";
private static final String LIST_RESOURCE_REF = "list-resource-refs";
private static final String LIST_JNDI_ENTRIES = "list-jndi-entries";
-
+
private static final String DELETE_ADMIN_OBJECT = "delete-admin-object";
private static final String CREATE_ADMIN_OBJECT = "create-admin-object";
private static final String LIST_ADMIN_OBJECTS = "list-admin-objects";
@@ -221,7 +221,7 @@
reportResultStatus(testName, result);
reportExpectedResult(testName, result, "");
}
-
+
private void testDeleteAdminObjectExpectFailure(String target){
String testName = "testDeleteAdminObjectExpectFailure";
AsadminReturn result = asadminWithOutput(DELETE_ADMIN_OBJECT,TARGET_OPTION, target, RESOURCE_NAME);
@@ -347,7 +347,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, STANDALONE_INSTANCE_NAME, INSTANCE1_NAME, INSTANCE2_NAME);
reportExpectedResult(testName, result, "Administered object resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER, CLUSTER_NAME);
}
@@ -357,7 +357,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, INSTANCE1_NAME, INSTANCE2_NAME, STANDALONE_INSTANCE_NAME);
reportExpectedResult(testName, result, "Administered object resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER);
}
@@ -409,7 +409,7 @@
reportExpectedResult(testName, result);
//reportExpectedResult(testName, result, INSTANCE2_NAME, INSTANCE1_NAME, STANDALONE_INSTANCE_NAME);
reportExpectedResult(testName, result, "Administered object resource-1 created.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME);
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ChangeMasterBrokerTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ChangeMasterBrokerTest.java
index beef6fa..dc973ba 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ChangeMasterBrokerTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ChangeMasterBrokerTest.java
@@ -122,9 +122,9 @@
public Object jmxCall(String jmsProviderPort, String objectName, String attrName){
/*
* Commented out because building this code depends on having GlassFish already downloaded.
- * The admin devtest must build without having GlassFish present.
+ * The admin devtest must build without having GlassFish present.
try{
-
+
AdminConnectionFactory acf = new AdminConnectionFactory();
acf.setProperty(AdminConnectionConfiguration.imqAddress, "localhost:" + jmsProviderPort);
JMXConnector connector = acf.createConnection("admin","admin");
@@ -137,11 +137,11 @@
Object attrvalue = mbsc.getAttribute(objName, attrName);
connector.close();
return attrvalue;
-
+
}catch(Exception ex){
ex.printStackTrace();
}
- *
+ *
*/
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureArbitaryBrokerPropertiesTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureArbitaryBrokerPropertiesTest.java
index 184b916..5f57ef5 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureArbitaryBrokerPropertiesTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureArbitaryBrokerPropertiesTest.java
@@ -109,7 +109,7 @@
public Object jmxCall(String jmsProviderPort, String objectName, String attributeName){
/*
* Commented out because building this code depends on having GlassFish already downloaded.
- * The admin devtest must build without having GlassFish present.
+ * The admin devtest must build without having GlassFish present.
try{
AdminConnectionFactory acf = new AdminConnectionFactory();
acf.setProperty(AdminConnectionConfiguration.imqAddress, "localhost:" + jmsProviderPort);
@@ -132,7 +132,7 @@
}catch(Exception ex){
ex.printStackTrace();
}
- *
+ *
*/
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureJmsClusterTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureJmsClusterTest.java
index 4d8c633..70e6244 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureJmsClusterTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConfigureJmsClusterTest.java
@@ -20,7 +20,7 @@
/*
import com.sun.messaging.AdminConnectionConfiguration;
import com.sun.messaging.AdminConnectionFactory;
- *
+ *
*/
import javax.management.MBeanServerConnection;
@@ -162,7 +162,7 @@
public Object jmxCall(String jmsProviderPort, String objectName, String attrName){
/*
* Commented out because building this code depends on having GlassFish already downloaded.
- * The admin devtest must build without having GlassFish present.
+ * The admin devtest must build without having GlassFish present.
try{
AdminConnectionFactory acf = new AdminConnectionFactory();
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConnectorResourceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConnectorResourceTest.java
index c4a6d8c..4d35e73 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConnectorResourceTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ConnectorResourceTest.java
@@ -429,7 +429,7 @@
reportExpectedResult(testName, result);
//reportExpectedResult(testName, result, INSTANCE2_NAME, INSTANCE1_NAME);
reportExpectedResult(testName, result, "Connector resource resource-1 created.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME);
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/CustomResourceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/CustomResourceTest.java
index 72c8524..0465d15 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/CustomResourceTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/CustomResourceTest.java
@@ -123,7 +123,7 @@
testListCustomResourceTargetDomain();
testCreateResourceRefInCluster();
- testListResourceRefInCluster();
+ testListResourceRefInCluster();
//testListJndiEntriesInCluster();
testListCustomResourceTargetCluster();
testDeleteCustomResourceInDomainExpectFailure();
@@ -134,8 +134,8 @@
testCreateResourceRefInStandaloneInstance();
- testListResourceRefInStandaloneInstance();
- //testListJndiEntriesInStandaloneInstance();
+ testListResourceRefInStandaloneInstance();
+ //testListJndiEntriesInStandaloneInstance();
testListCustomResourceTargetStandaloneInstance();
testDeleteCustomResourceInDomainExpectFailure();
testDeleteCustomResourceExpectFailure(CLUSTER_NAME);
@@ -284,7 +284,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, STANDALONE_INSTANCE_NAME, INSTANCE1_NAME, INSTANCE2_NAME);
reportExpectedResult(testName, result, "Custom resource resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER, CLUSTER_NAME);
}
@@ -294,7 +294,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, INSTANCE1_NAME, INSTANCE2_NAME, STANDALONE_INSTANCE_NAME);
reportExpectedResult(testName, result, "Custom resource resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER);
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DomainTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DomainTest.java
index bcb11c4..ae10e67 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DomainTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DomainTest.java
@@ -46,7 +46,7 @@
_brandingProperties.load(new FileInputStream(brandingFile));
} catch (IOException e) {
System.out.println("Not able to load branding file.");
- }
+ }
}
}
@@ -99,7 +99,7 @@
*
* @param name Domain name.
* @param templatePath absolute template path.
- * @return true if the given template is used for domain creation.
+ * @return true if the given template is used for domain creation.
*/
boolean checkDomain(String name, String templatePath) {
File domInfoXml = TestEnv.getDomainInfoXml(name);
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DynamicSyncBrokerListTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DynamicSyncBrokerListTest.java
index f114905..a9e4f69 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DynamicSyncBrokerListTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/DynamicSyncBrokerListTest.java
@@ -151,7 +151,7 @@
public Object jmxCall(String jmsProviderPort, String objectName){
/*
* Commented out because building this code depends on having GlassFish already downloaded.
- * The admin devtest must build without having GlassFish present.
+ * The admin devtest must build without having GlassFish present.
try{
AdminConnectionFactory acf = new AdminConnectionFactory();
acf.setProperty(AdminConnectionConfiguration.imqAddress, "localhost:" + jmsProviderPort);
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ExternalJndiResourceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ExternalJndiResourceTest.java
index da769de..0a4076f 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ExternalJndiResourceTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ExternalJndiResourceTest.java
@@ -287,7 +287,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, STANDALONE_INSTANCE_NAME, INSTANCE1_NAME, INSTANCE2_NAME);
reportExpectedResult(testName, result, "Jndi resource resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER, CLUSTER_NAME);
}
@@ -297,7 +297,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, INSTANCE1_NAME, INSTANCE2_NAME, STANDALONE_INSTANCE_NAME);
reportExpectedResult(testName, result, "Jndi resource resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER);
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/GetSetTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/GetSetTest.java
index 700ad50..44bce2e 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/GetSetTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/GetSetTest.java
@@ -33,7 +33,7 @@
}
public static void main(String[] args) {
- new GetSetTest().runTests();
+ new GetSetTest().runTests();
}
private String encodeStar(String s) {
@@ -52,20 +52,20 @@
startDomain();
report("create-cluster", asadmin("create-cluster", "gs1"));
}
-
+
@Override
public void cleanup() {
report("delete-cluster", asadmin("delete-cluster", "gs1"));
- stopDomain();
+ stopDomain();
}
-
+
/*
* Use "get *" to get all settable values, and then use set to set the attribute
* to the current value.
*/
private void testGetSetAll() {
final String t = "getsetall-";
-
+
AsadminReturn rv = asadminWithOutput("get", encodeStar("*"));
report(t + "get", rv.returnValue);
String[] lines = rv.out.split("[\r\n]");
@@ -80,7 +80,7 @@
}
testSets(t, setlines);
}
-
+
/*
* Use "get *" to get all settable alias values, and then use set to set the attribute
* to the current value using the alias for the value.
@@ -94,7 +94,7 @@
};
List<String> setlines = new ArrayList();
-
+
for (String a : aliases) {
AsadminReturn rv = asadminWithOutput("get", encodeStar(a + ".*"));
report(t + "get", rv.returnValue);
@@ -102,12 +102,12 @@
if (!rv.returnValue) continue;
filterJunk(lines);
-
+
for (String line : lines) {
line = filterSet(line);
if (line == null) continue;
line = line.replace(a + ".", "");
-
+
if (line.contains("server.name") ||
line.contains("gs1.name")) continue;
setlines.add(line);
@@ -115,9 +115,9 @@
}
testSets(t, setlines);
}
-
+
/*
- * Filter out set requests that are known not work.
+ * Filter out set requests that are known not work.
* Encode the request if necessary.
*/
private String filterSet(String line) {
@@ -140,14 +140,14 @@
if (line.contains("security-configurations")) return null;
// escape the "." in some property names
- final String[] dottedprops = {
- "encryption.key.alias",
+ final String[] dottedprops = {
+ "encryption.key.alias",
"signature.key.alias",
"dynamic.username.password",
"security.config",
"administrative.domain.name",
};
-
+
for (String dp : dottedprops) {
if (line.contains(dp)) {
line = line.replace(dp, dp.replace(".", "\\."));
@@ -157,7 +157,7 @@
return line;
}
- /*
+ /*
* Test a list of set requests by running asadmin set repeatedly.
*/
private void testSets(String tname, List<String> reqs) {
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/InstanceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/InstanceTest.java
index 41d938e..7599ec8 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/InstanceTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/InstanceTest.java
@@ -95,10 +95,10 @@
testRendezvous();
testUpgrade();
testNode();
- testCreateInstanceConfigNode();
+ testCreateInstanceConfigNode();
testPortBase();
invalidConfigRef();
-
+
if(!isHadas())
deleteDirectory(nodeDir);
@@ -268,7 +268,7 @@
ret = asadminWithOutput("get", "servers.server." + iname + ".system-property.prop1.value");
success = ret.outAndErr.indexOf("servers.server." + iname + ".system-property.prop1.value=valA") >= 0;
report("create-instance-prop1value", success);
-
+
ret = asadminWithOutput("get", "servers.server." + iname + ".system-property.prop3.name");
success = ret.outAndErr.indexOf("servers.server." + iname + ".system-property.prop3.name=prop3") >= 0;
report("create-instance-prop3name", success);
@@ -304,7 +304,7 @@
report("delete-instance-regdas", !asadmin("get", "servers.server." + iname));
report("delete-instance-config", !asadmin("get", "configs.config." + iname + "-config"));
}
-
+
private void createAdminCommandFail() {
printf("Call remote AdminCommand create-instance with bad params");
String iname = "badapple";
@@ -362,7 +362,7 @@
String nodedir = installdir + File.separator + "mynodes";
String node = "n1";
String instance = "i1";
-
+
report("create-local-instance-nosuchnode", !asadmin("create-local-instance",
"--node", "bogus", "bogusinstance"));
@@ -443,18 +443,18 @@
// see JIRA issue 16579
String node = "test-node";
String instance = "test-instance";
- String testName = "create-node-config-offline";
+ String testName = "create-node-config-offline";
- // Creates config node without the installdir
+ // Creates config node without the installdir
report(testName + "0", asadmin("create-node-config",
- "--nodehost", "localhost",node));
- report(testName+"1", asadmin("create-instance", "--node", node, instance));
- // check that installdir was set
+ "--nodehost", "localhost",node));
+ report(testName+"1", asadmin("create-instance", "--node", node, instance));
+ // check that installdir was set
report(testName+"2",asadmin("get", "nodes.node." + node + ".install-dir"));
-
- //cleanup
- report(testName +"3", asadmin("delete-instance", instance ));
- report(testName +"4", asadmin("delete-node-config", node ));
+
+ //cleanup
+ report(testName +"3", asadmin("delete-instance", instance ));
+ report(testName +"4", asadmin("delete-node-config", node ));
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java
index 5e95888..b2766d1 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java
@@ -287,7 +287,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, STANDALONE_INSTANCE_NAME, INSTANCE1_NAME, INSTANCE2_NAME);
reportExpectedResult(testName, result, "Mail resource resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER, CLUSTER_NAME);
}
@@ -297,7 +297,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, INSTANCE1_NAME, INSTANCE2_NAME, STANDALONE_INSTANCE_NAME);
reportExpectedResult(testName, result, "Mail resource resource-1 deleted.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, SERVER);
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JdbcResourceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JdbcResourceTest.java
index bb15351..0826a06 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JdbcResourceTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JdbcResourceTest.java
@@ -21,7 +21,7 @@
*/
public class JdbcResourceTest extends AdminBaseDevTest {
- //TODO test-case for IT 12614
+ //TODO test-case for IT 12614
public static final String CLUSTER_NAME = "cluster1";
public static final String INSTANCE1_NAME = "instance1";
@@ -352,7 +352,7 @@
reportResultStatus(testName, result);
//reportExpectedResult(testName, result, INSTANCE1_NAME, INSTANCE2_NAME);
reportExpectedResult(testName, result, "JDBC resource resource-1 deleted successfully");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME);
}
@@ -400,7 +400,7 @@
reportExpectedResult(testName, result);
//reportExpectedResult(testName, result, INSTANCE2_NAME, INSTANCE1_NAME);
reportExpectedResult(testName, result, "JDBC resource resource-1 created successfully.");
- /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
+ /*Commenting out the failed test, can be uncommented after fixing Glassfish Issue 21774 */
//reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME);
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LBCommandsTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LBCommandsTest.java
index 63950f1..e17b5a6 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LBCommandsTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LBCommandsTest.java
@@ -316,7 +316,7 @@
deleteInstances();
asadmin("stop-domain");
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LoggingCommandTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LoggingCommandTest.java
index c48ba75..70c141a 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LoggingCommandTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/LoggingCommandTest.java
@@ -21,7 +21,7 @@
*/
public class LoggingCommandTest extends AdminBaseDevTest {
- //TODO test-case for IT 12614
+ //TODO test-case for IT 12614
public static final String CLUSTER_NAME = "cluster1";
public static final String INSTANCE1_NAME = "instance1";
@@ -30,16 +30,16 @@
private static final String SET_LOG_LEVEL = "set-log-levels";
private static final String SET_LOG_ATTRIBUTE = "set-log-attributes";
- private static final String LIST_LOG_ATTRIBUTE = "list-log-attributes";
- private static final String LIST_LOG_LEVEL = "list-log-levels";
- private static final String COLLECT_LOG_FILES = "collect-log-files";
-
- private static final String TARGET_OPTION = "--target";
- private static final String PACKAGE_NAME ="logging.command.test=INFO";
+ private static final String LIST_LOG_ATTRIBUTE = "list-log-attributes";
+ private static final String LIST_LOG_LEVEL = "list-log-levels";
+ private static final String COLLECT_LOG_FILES = "collect-log-files";
- private static final String ATTRIBUTE_NAME ="java.util.logging.FileHandler.count=10";
+ private static final String TARGET_OPTION = "--target";
+ private static final String PACKAGE_NAME ="logging.command.test=INFO";
- private static final String SERVER = "server";
+ private static final String ATTRIBUTE_NAME ="java.util.logging.FileHandler.count=10";
+
+ private static final String SERVER = "server";
public static final String[] EXPECTED_TOKENS = {PACKAGE_NAME};
@@ -49,7 +49,7 @@
new LoggingCommandTest().runTests();
}
- @Override
+ @Override
public String getTestName() {
return "Logging";
}
@@ -66,7 +66,7 @@
asadmin("stop-local-instance", INSTANCE1_NAME);
asadmin("stop-local-instance", INSTANCE2_NAME);
asadmin("stop-cluster", CLUSTER_NAME);
- asadmin("delete-local-instance", STANDALONE_INSTANCE_NAME);
+ asadmin("delete-local-instance", STANDALONE_INSTANCE_NAME);
asadmin("delete-local-instance", INSTANCE1_NAME);
asadmin("delete-local-instance", INSTANCE2_NAME);
asadmin("delete-cluster", CLUSTER_NAME);
@@ -77,8 +77,8 @@
public void runTests() {
startDomain();
-
- asadmin("create-cluster", CLUSTER_NAME);
+
+ asadmin("create-cluster", CLUSTER_NAME);
asadmin("create-local-instance", "--cluster", CLUSTER_NAME,
/*"--node", "localhost",*/ "--systemproperties",
@@ -98,39 +98,39 @@
asadmin("start-cluster", CLUSTER_NAME);
asadmin("start-local-instance", STANDALONE_INSTANCE_NAME);
- testSetLogLevelInServer();
+ testSetLogLevelInServer();
testSetLogLevelInCluster();
testSetLogLevelInStandaloneInstance();
testSetLogLevelInServerConfig();
testSetLogLevelInClusterConfig();
testSetLogLevelInStandaloneInstanceConfig();
-
- testSetLogAttributeInServer();
+
+ testSetLogAttributeInServer();
testSetLogAttributeInCluster();
testSetLogAttributeInStandaloneInstance();
testSetLogAttributeInServerConfig();
testSetLogAttributeInClusterConfig();
testSetLogAttributeInStandaloneInstanceConfig();
- testListLogAttributeInServer();
- testListLogAttributeInServer();
+ testListLogAttributeInServer();
+ testListLogAttributeInServer();
testListLogAttributeInCluster();
testListLogAttributeInStandaloneInstance();
testListLogAttributeInServerConfig();
testListLogAttributeInClusterConfig();
testListLogAttributeInStandaloneInstanceConfig();
- testListLogLevleInServer();
- testListLogLevleInServer();
+ testListLogLevleInServer();
+ testListLogLevleInServer();
testListLogLevleInCluster();
testListLogLevleInStandaloneInstance();
testListLogLevleInServerConfig();
testListLogLevleInClusterConfig();
testListLogLevleInStandaloneInstanceConfig();
- testCollectLogFilesInServer();
- testCollectLogFilesInCluster();
- testCollectLogFilesStandaloneInstance();
+ testCollectLogFilesInServer();
+ testCollectLogFilesInCluster();
+ testCollectLogFilesStandaloneInstance();
cleanup();
stopDomain();
@@ -158,7 +158,7 @@
reportExpectedResult(testName, result, SERVER );
}
- private void testSetLogLevelInClusterConfig() {
+ private void testSetLogLevelInClusterConfig() {
String testName = "testSetLogLevelInClusterConfig";
AsadminReturn result = asadminWithOutput(SET_LOG_LEVEL,TARGET_OPTION, CLUSTER_NAME+"-config", PACKAGE_NAME);
reportResultStatus(testName, result);
@@ -180,7 +180,7 @@
}
- private void testSetLogAttributeInCluster() {
+ private void testSetLogAttributeInCluster() {
String testName = "testSetLogAttributeInCluster";
AsadminReturn result = asadminWithOutput(SET_LOG_ATTRIBUTE,TARGET_OPTION, CLUSTER_NAME, ATTRIBUTE_NAME);
reportResultStatus(testName, result);
@@ -201,7 +201,7 @@
reportExpectedResult(testName, result, SERVER );
}
- private void testSetLogAttributeInClusterConfig() {
+ private void testSetLogAttributeInClusterConfig() {
String testName = "testSetLogAttributeInClusterConfig";
AsadminReturn result = asadminWithOutput(SET_LOG_ATTRIBUTE,TARGET_OPTION, CLUSTER_NAME+"-config", ATTRIBUTE_NAME);
reportResultStatus(testName, result);
@@ -222,94 +222,94 @@
reportExpectedResult(testName, result, SERVER );
}
- private void testListLogAttributeInServer(){
+ private void testListLogAttributeInServer(){
String testName = "testListLogAttributeInServer";
AsadminReturn result = asadminWithOutput(LIST_LOG_ATTRIBUTE, SERVER);
- reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
+ reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
}
- private void testListLogAttributeInCluster(){
+ private void testListLogAttributeInCluster(){
String testName = "testListLogAttributeInCluster";
AsadminReturn result = asadminWithOutput(LIST_LOG_ATTRIBUTE, CLUSTER_NAME);
- reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
+ reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
}
- private void testListLogAttributeInStandaloneInstance(){
+ private void testListLogAttributeInStandaloneInstance(){
String testName = "testListLogAttributeInStandaloneInstance";
AsadminReturn result = asadminWithOutput(LIST_LOG_ATTRIBUTE, STANDALONE_INSTANCE_NAME);
- reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
+ reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
}
- private void testListLogAttributeInServerConfig(){
+ private void testListLogAttributeInServerConfig(){
String testName = "testListLogAttributeInServerConfig";
AsadminReturn result = asadminWithOutput(LIST_LOG_ATTRIBUTE, SERVER+"-config");
- reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
+ reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
}
- private void testListLogAttributeInClusterConfig(){
+ private void testListLogAttributeInClusterConfig(){
String testName = "testListLogAttributeInClusterConfig";
AsadminReturn result = asadminWithOutput(LIST_LOG_ATTRIBUTE, CLUSTER_NAME+"-config");
- reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
+ reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
}
- private void testListLogAttributeInStandaloneInstanceConfig(){
+ private void testListLogAttributeInStandaloneInstanceConfig(){
String testName = "testListLogAttributeInStandaloneInstanceConfig";
AsadminReturn result = asadminWithOutput(LIST_LOG_ATTRIBUTE, STANDALONE_INSTANCE_NAME+"-config");
- reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
+ reportExpectedResult(testName, result, "log4j.logger.org.hibernate.validator.util.Version");
}
- private void testListLogLevleInServer(){
+ private void testListLogLevleInServer(){
String testName = "testListLogLevleInServer";
AsadminReturn result = asadminWithOutput(LIST_LOG_LEVEL, SERVER);
- reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
+ reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
}
- private void testListLogLevleInCluster(){
+ private void testListLogLevleInCluster(){
String testName = "testListLogLevleInCluster";
AsadminReturn result = asadminWithOutput(LIST_LOG_LEVEL, CLUSTER_NAME);
- reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
+ reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
}
- private void testListLogLevleInStandaloneInstance(){
+ private void testListLogLevleInStandaloneInstance(){
String testName = "testListLogLevleInStandaloneInstance";
AsadminReturn result = asadminWithOutput(LIST_LOG_LEVEL, STANDALONE_INSTANCE_NAME);
- reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
+ reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
}
- private void testListLogLevleInServerConfig(){
+ private void testListLogLevleInServerConfig(){
String testName = "testListLogLevleInServerConfig";
AsadminReturn result = asadminWithOutput(LIST_LOG_LEVEL, SERVER+"-config");
- reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
+ reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
}
- private void testListLogLevleInClusterConfig(){
+ private void testListLogLevleInClusterConfig(){
String testName = "testListLogLevleInClusterConfig";
AsadminReturn result = asadminWithOutput(LIST_LOG_LEVEL, CLUSTER_NAME+"-config");
- reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
+ reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
}
- private void testListLogLevleInStandaloneInstanceConfig(){
+ private void testListLogLevleInStandaloneInstanceConfig(){
String testName = "testListLogLevleInStandaloneInstanceConfig";
AsadminReturn result = asadminWithOutput(LIST_LOG_LEVEL, STANDALONE_INSTANCE_NAME+"-config");
- reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
+ reportExpectedResult(testName, result, "jakarta.enterprise.system.ssl.security","java.util.logging.ConsoleHandler");
}
- private void testCollectLogFilesInServer(){
+ private void testCollectLogFilesInServer(){
String testName = "testCollectLogFilesInServer";
AsadminReturn result = asadminWithOutput(COLLECT_LOG_FILES,TARGET_OPTION, SERVER);
- reportExpectedResult(testName, result, "Created Zip file under");
+ reportExpectedResult(testName, result, "Created Zip file under");
}
- private void testCollectLogFilesInCluster(){
+ private void testCollectLogFilesInCluster(){
String testName = "testCollectLogFilesInCluster";
AsadminReturn result = asadminWithOutput(COLLECT_LOG_FILES,TARGET_OPTION, CLUSTER_NAME);
- reportExpectedResult(testName, result, "Created Zip file under");
+ reportExpectedResult(testName, result, "Created Zip file under");
}
- private void testCollectLogFilesStandaloneInstance(){
+ private void testCollectLogFilesStandaloneInstance(){
String testName = "testCollectLogFilesStandaloneInstance";
AsadminReturn result = asadminWithOutput(COLLECT_LOG_FILES,TARGET_OPTION, STANDALONE_INSTANCE_NAME);
- reportExpectedResult(testName, result, "Created Zip file under");
+ reportExpectedResult(testName, result, "Created Zip file under");
}
@@ -327,5 +327,5 @@
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ManualSyncTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ManualSyncTest.java
index 0a2d1a3..13ec607 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ManualSyncTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ManualSyncTest.java
@@ -390,7 +390,7 @@
long dasDomainXmlTS = dasDomainXml.lastModified();
report("export-sync-bundle-" + testname, asadmin("export-sync-bundle", "--target", testname));
-
+
report("check-domainxml-" + testname, instDomainXml.exists());
stopDomain();
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/NodeTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/NodeTest.java
index d67bbe6..7f7d82a 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/NodeTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/NodeTest.java
@@ -97,9 +97,9 @@
testLocalHostNode();
testCreateNodeSsh();
testCreateNodeConfig();
- testCreateOfflineConfig();
- testUpdateNodes();
- testListNodes();
+ testCreateOfflineConfig();
+ testUpdateNodes();
+ testListNodes();
testValidateNodeCommand();
testBasicCluster();
stopDomain();
@@ -118,7 +118,7 @@
// WBN File Layout May 2012
String paramName = "--domaindir";
-
+
if (!TestEnv.isHadas())
paramName = "--nodedir";
@@ -265,7 +265,7 @@
final String testNamePrefixValidate = "validateOfflineConfig-";
final String testNamePrefixValidateDelete = "validateDeleteOfflineConfig-";
final String nodeNamePrefix = "n_config_";
- final String instanceName = "offline-config-ins";
+ final String instanceName = "offline-config-ins";
String nodeName = String.format("%s%d", nodeNamePrefix, 0);
@@ -277,21 +277,21 @@
testName = testNamePrefixValidate + "0";
report(testName, asadmin("get", propPrefix + nodeName + "." + "name"));
- // Update the node hostname using create-local-instance
- testName = testNamePrefixCreateInstance + "0";
- report(testName, asadmin("create-local-instance", "--node", nodeName, instanceName));
+ // Update the node hostname using create-local-instance
+ testName = testNamePrefixCreateInstance + "0";
+ report(testName, asadmin("create-local-instance", "--node", nodeName, instanceName));
- // Make sure hostname is filled in
- testName = testNamePrefixValidate + "1";
- report (testName, asadmin("get", propPrefix+nodeName+"."+"node-host"));
+ // Make sure hostname is filled in
+ testName = testNamePrefixValidate + "1";
+ report (testName, asadmin("get", propPrefix+nodeName+"."+"node-host"));
- // Make sure installdir is filled in
- testName = testNamePrefixValidate + "2";
- report (testName, asadmin("get", propPrefix+nodeName+"."+"install-dir"));
+ // Make sure installdir is filled in
+ testName = testNamePrefixValidate + "2";
+ report (testName, asadmin("get", propPrefix+nodeName+"."+"install-dir"));
- // Delete the instance
- testName = testNamePrefixDelete + "0";
- report (testName, asadmin("delete-local-instance", "--node", nodeName, instanceName));
+ // Delete the instance
+ testName = testNamePrefixDelete + "0";
+ report (testName, asadmin("delete-local-instance", "--node", nodeName, instanceName));
// Delete it
testName = testNamePrefixDelete + "1";
@@ -321,17 +321,17 @@
testName = testNamePrefixValidate + "0";
report(testName, asadmin("get", propPrefix + nodeName + "." + "name"));
- testName = testNamePrefixUpdateConfig + "0";
- report(testName, asadmin("update-node-config", "--nodehost", "localhost", nodeName));
+ testName = testNamePrefixUpdateConfig + "0";
+ report(testName, asadmin("update-node-config", "--nodehost", "localhost", nodeName));
- testName = testNamePrefixUpdateConfig + "1";
- AsadminReturn ret = asadminWithOutput("get", propPrefix+nodeName+"."+"node-host");
+ testName = testNamePrefixUpdateConfig + "1";
+ AsadminReturn ret = asadminWithOutput("get", propPrefix+nodeName+"."+"node-host");
boolean success = ret.outAndErr.indexOf("localhost") >=0;
report(testName, success);
// Create an ssh node with no hostname or installdir
testName = testNamePrefixCreate + "1";
- String nodeName1 = String.format("%s%d", nodeNamePrefix, 1);
+ String nodeName1 = String.format("%s%d", nodeNamePrefix, 1);
report(testName, asadmin("create-node-ssh", "--nodehost", "acb", "--force", nodeName1));
// Make sure it is there by getting its name
@@ -339,20 +339,20 @@
report(testName, asadmin("get", propPrefix + nodeName1 + "." + "name"));
testName = testNamePrefixUpdateConfig + "2";
- report(testName, asadmin("update-node-config", "--nodehost", "abc", nodeName1));
+ report(testName, asadmin("update-node-config", "--nodehost", "abc", nodeName1));
testName = testNamePrefixUpdateConfig + "3";
ret = asadminWithOutput("get", propPrefix+nodeName1+"."+"node-host");
success = ret.outAndErr.indexOf("abc") >=0;
report(testName, success);
-
+
testName = testNamePrefixUpdateConfig + "4";
ret = asadminWithOutput("get", propPrefix+nodeName1+"."+"type");
success = ret.outAndErr.indexOf("CONFIG") >=0;
report(testName, success);
-
+
testName = testNamePrefixUpdateSsh + "0";
- report(testName, asadmin("update-node-ssh", "--nodehost", "abc", "--force", nodeName1));
+ report(testName, asadmin("update-node-ssh", "--nodehost", "abc", "--force", nodeName1));
testName = testNamePrefixUpdateSsh + "1";
ret = asadminWithOutput("get", propPrefix+nodeName1+"."+"type");
success = ret.outAndErr.indexOf("SSH") >=0;
@@ -389,11 +389,11 @@
String nodeName = String.format("%s%d", nodeNamePrefix, 0);
- // List the nodes should see the default node
+ // List the nodes should see the default node
String testName = testNamePrefixList + "0";
- AsadminReturn ret = asadminWithOutput("list-nodes");
- boolean success = ret.outAndErr.indexOf("localhost-domain1") >=0;
- report(testName, success);
+ AsadminReturn ret = asadminWithOutput("list-nodes");
+ boolean success = ret.outAndErr.indexOf("localhost-domain1") >=0;
+ report(testName, success);
// Create a config node, default is a CONFIG node
testName = testNamePrefixCONFIGList + "0";
@@ -403,46 +403,46 @@
testName = testNamePrefixValidate + "0";
report(testName, asadmin("get", propPrefix + nodeName + "." + "name"));
- // List the nodes, should be 2
- testName = testNamePrefixList + "1";
- ret = asadminWithOutput("list-nodes");
+ // List the nodes, should be 2
+ testName = testNamePrefixList + "1";
+ ret = asadminWithOutput("list-nodes");
success = ret.outAndErr.indexOf("localhost-domain1") >=0;
- boolean success2 = ret.outAndErr.indexOf(nodeName)>=0;
- if (success && success2)
- report(testName, true);
- else
- report(testName, false);
+ boolean success2 = ret.outAndErr.indexOf(nodeName)>=0;
+ if (success && success2)
+ report(testName, true);
+ else
+ report(testName, false);
- // List the nodes using list-nodes-config, should be 2
- testName = testNamePrefixCONFIGList + "1";
- ret = asadminWithOutput("list-nodes-config");
+ // List the nodes using list-nodes-config, should be 2
+ testName = testNamePrefixCONFIGList + "1";
+ ret = asadminWithOutput("list-nodes-config");
success = ret.outAndErr.indexOf("localhost-domain1") >=0;
- success2 = ret.outAndErr.indexOf(nodeName)>=0;
- if (success && success2)
- report(testName, true);
- else
- report(testName, false);
+ success2 = ret.outAndErr.indexOf(nodeName)>=0;
+ if (success && success2)
+ report(testName, true);
+ else
+ report(testName, false);
- // Create an ssh node (force) and list again, should be 3
- testName = testNamePrefixSSHList + "0";
+ // Create an ssh node (force) and list again, should be 3
+ testName = testNamePrefixSSHList + "0";
String nodeName1 = String.format("%s%d", nodeNamePrefix, 1);
- report (testName, asadmin("create-node-ssh","--force", "--nodehost", "abc", nodeName1));
+ report (testName, asadmin("create-node-ssh","--force", "--nodehost", "abc", nodeName1));
- testName = testNamePrefixList + "2";
- ret = asadminWithOutput("list-nodes");
+ testName = testNamePrefixList + "2";
+ ret = asadminWithOutput("list-nodes");
success = ret.outAndErr.indexOf("localhost-domain1") >=0;
- success2 = ret.outAndErr.indexOf(nodeName)>=0;
- boolean success3 = ret.outAndErr.indexOf(nodeName1)>=0;
- if (success && success2 && success3)
- report(testName, true);
- else
- report(testName, false);
+ success2 = ret.outAndErr.indexOf(nodeName)>=0;
+ boolean success3 = ret.outAndErr.indexOf(nodeName1)>=0;
+ if (success && success2 && success3)
+ report(testName, true);
+ else
+ report(testName, false);
- // List the nodes using list-nodes-ssh, should be 1
- testName = testNamePrefixSSHList + "1";
- ret = asadminWithOutput("list-nodes-ssh");
+ // List the nodes using list-nodes-ssh, should be 1
+ testName = testNamePrefixSSHList + "1";
+ ret = asadminWithOutput("list-nodes-ssh");
success = ret.outAndErr.indexOf(nodeName1) >=0;
- report(testName, success);
+ report(testName, success);
// Delete config node
testName = testNamePrefixDelete + "0";
@@ -452,18 +452,18 @@
testName = testNamePrefixValidateDelete + "0";
report(testName, !asadmin("get", propPrefix + nodeName + "." + "name"));
- // List the nodes, should be 2
- testName = testNamePrefixList + "3";
- ret = asadminWithOutput("list-nodes");
+ // List the nodes, should be 2
+ testName = testNamePrefixList + "3";
+ ret = asadminWithOutput("list-nodes");
success = ret.outAndErr.indexOf("localhost-domain1") >=0;
- success2 = ret.outAndErr.indexOf(nodeName)>=0;
- success3 = ret.outAndErr.indexOf(nodeName1)>=0;
- if (success2)
- report(testName, false);
- else if (success && success3)
- report(testName, true);
- else
- report(testName, false);
+ success2 = ret.outAndErr.indexOf(nodeName)>=0;
+ success3 = ret.outAndErr.indexOf(nodeName1)>=0;
+ if (success2)
+ report(testName, false);
+ else if (success && success3)
+ report(testName, true);
+ else
+ report(testName, false);
// Delete ssh node
testName = testNamePrefixDelete + "1";
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshRemoteTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshRemoteTest.java
index e5f5a96..8c9ab4d 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshRemoteTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshRemoteTest.java
@@ -153,7 +153,7 @@
//clean up the password file
removePasswords("SSH");
stopDomain();
- stat.printSummary();
+ stat.printSummary();
}
private boolean testKeyDistributionWithoutKeyGeneration() {
@@ -244,7 +244,7 @@
/*
* In-order to run this test, one needs to generate the public-private key first, enable this test and run it. Pre-generated id_dsa and id_dsa.pub keys are
* being removed.
- */
+ */
private void testEncryptedKey() {
//pass correct ssh password for each test
addPassword(PasswordValue.RIGHT, PasswordType.SSH_PASS);
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshTest.java
index 906e078..3c1c144 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshTest.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/SetupSshTest.java
@@ -169,7 +169,7 @@
//clean up the password file
removePasswords("SSH");
- stat.printSummary();
+ stat.printSummary();
}
private boolean testKeyDistributionWithoutKeyGeneration() {
@@ -254,7 +254,7 @@
/*
* In-order to run this test, one needs to generate the public-private key first, enable this test and run it. Pre-generated id_dsa and id_dsa.pub keys are
* being removed.
- */
+ */
private void testEncryptedKey() {
//pass correct ssh password for each test
addPassword(PasswordValue.RIGHT, PasswordType.SSH_PASS);
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/TestEnv.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/TestEnv.java
index dc1f2a7..637fe2b 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/TestEnv.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/TestEnv.java
@@ -80,7 +80,7 @@
else
return new File(TestEnv.getInstancesHome(nodeName), DAS_PROPS_PATH);
}
-
+
public static File getInstancesHome(String domainName, String nodeName) {
if(isHadas())
return getDomainHome(domainName);
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ValidationTests.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ValidationTests.java
index 250920e..0d5166e 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ValidationTests.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/ValidationTests.java
@@ -73,9 +73,9 @@
report("issue11200-create-message-sec-provider", !asadmin( "create-message-security-provider", "--classname", "com.sun.foo", "--layer" ,"SOAP" ,"<script>alert(\"x\")</script>"));
- report("create-message-sec-provider-invalid-classname", ! asadmin( "create-message-security-provider", "--layer", "SOAP",
+ report("create-message-sec-provider-invalid-classname", ! asadmin( "create-message-security-provider", "--layer", "SOAP",
"--classname", "com/sun", "ggg"));
-
+
report("create-audit-module-invalid-classname",! asadmin( "create-audit-module",
"--classname", "*fffs344:33", "foo1"));
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/Whacker.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/Whacker.java
index ffb6509..c8772d5 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/Whacker.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/Whacker.java
@@ -24,13 +24,13 @@
*/
public class Whacker extends AdminBaseDevTest {
public static void main(String[] args) {
- ProcessUtils.killJvm("ASMain");
- ProcessUtils.killJvm("AsadminMain");
- ProcessUtils.killJvm("DerbyControl");
- ProcessUtils.killJvm("admin-cli.jar");
- ProcessUtils.killJvm("derbyrun.jar");
- ProcessUtils.killJvm("glassfish.jar");
- new Whacker().report("Killed old JVMs", true);
+ ProcessUtils.killJvm("ASMain");
+ ProcessUtils.killJvm("AsadminMain");
+ ProcessUtils.killJvm("DerbyControl");
+ ProcessUtils.killJvm("admin-cli.jar");
+ ProcessUtils.killJvm("derbyrun.jar");
+ ProcessUtils.killJvm("glassfish.jar");
+ new Whacker().report("Killed old JVMs", true);
}
@Override
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Enabler.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Enabler.java
index f6e313d..800ae51 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Enabler.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Enabler.java
@@ -19,7 +19,7 @@
import static admin.monitoring.Constants.*;
/**
- * Enable Monitoring
+ * Enable Monitoring
* @author Byron Nevins
*/
public class Enabler extends MonTest {
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jdbc.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jdbc.java
index 0a85d1b..fa4e603 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jdbc.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jdbc.java
@@ -45,7 +45,7 @@
asadminWithOutput("get", "-m", "server.resources.jdbc-onlygetconnectionservlet-pool.numconnfree-current"),
"server.resources.jdbc-onlygetconnectionservlet-pool.numconnfree-current = 8"),
"jdbc-check-getm-numconnfree-count");
-
+
report(checkForString(
asadminWithOutput("get", "-m", "server.resources.jdbc-onlygetconnectionservlet-pool.numconnacquired-count"),
"server.resources.jdbc-onlygetconnectionservlet-pool.numconnacquired-count = 1"),
@@ -107,7 +107,7 @@
- /* After grizzly 2.0 integration numconfree changed from 5 to 7. The onlygetconnectionservlet is being invoked
+ /* After grizzly 2.0 integration numconfree changed from 5 to 7. The onlygetconnectionservlet is being invoked
in the *same* thread and com.sun.enterprise.resource.pool.AssocWithThreadResourcePool in this case doesn't allocate
new resource, but uses the one already associated with the thread. */
//Comment out - this number seems upredictable to test - sometimes 6, sometimes 7 - JC
@@ -115,7 +115,7 @@
// asadminWithOutput("get", "-m", "server.resources.jdbc-onlygetconnectionservlet-pool.numconnfree-current"),
// "server.resources.jdbc-onlygetconnectionservlet-pool.numconnfree-current = 7"),
// "jdbc-check-getm-numconnfree-count");
-
+
report(checkForString(
@@ -130,7 +130,7 @@
asadminWithOutput("get", "-m", "server.resources.jdbc-onlygetconnectionservlet-pool.numconnreleased-count"),
"server.resources.jdbc-onlygetconnectionservlet-pool.numconnreleased-count = 0"),
"jdbc-check-getm-numconnreleased-count-0-reset");
-
+
report(wget(8080, "onlygetconnectionservlet/onlygetconnectionservlet"), "hit 4 onlygetconnectionservlet on 8080-");
report(checkForString(
@@ -227,7 +227,7 @@
}
}
-
+
private static final File connApp = new File(RESOURCES_DIR, "jdbc-onlygetconnection-servletApp.ear");
private static final String connectionURL = "jdbc:derby://localhost:1527/testdb;create=true;";
private static final String dbDriver ="org.apache.derby.jdbc.ClientDriver";
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jira.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jira.java
index 8534db7..43c0f91 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jira.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Jira.java
@@ -33,10 +33,10 @@
void runTests(TestDriver driver) {
setDriver(driver);
report(true, "Hello from JIRA Tests!");
- /* turn off this intermittent test for now.
+ /* turn off this intermittent test for now.
test14389();
- */
+ */
test21646();
test16313();
@@ -315,7 +315,7 @@
report(false, "LogListener.getFile() returned null");
return;
}
-
+
report(logfile.exists(), prepend + "logfile exists");
report(logfile.isFile(), prepend + "logfile is-a-file");
report(logfile.canRead(), prepend + "logfile is readable");
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/TestDriver.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/TestDriver.java
index 61e59f0..819f70c 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/TestDriver.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/TestDriver.java
@@ -73,7 +73,7 @@
new Ejb(),
new Jdbc(),
new Jira(),
- new Web(),
+ new Web(),
new TearDown(),
};
}
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Web.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Web.java
index b3ebfdc..f6114e6 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Web.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/monitoring/Web.java
@@ -21,8 +21,8 @@
import static admin.monitoring.Constants.*;
/**
- * Tests web monitoring.
- * @author Carla Mott
+ * Tests web monitoring.
+ * @author Carla Mott
*/
public class Web extends MonTest {
@Override
@@ -30,7 +30,7 @@
setDriver(driver);
report(true, "Hello from Web Monitoring Tests!");
basicTests();
- jspTests();
+ jspTests();
testMyWeb();
}
@@ -53,7 +53,7 @@
final String getmArg = ".applications.HelloWeb.server.totaljspcount-count";
final String getmKey = "1";
- report(wget(28080, uri), "jspload on 28080-"); // commands increment the session count
+ report(wget(28080, uri), "jspload on 28080-"); // commands increment the session count
report(wget(28081, uri), "jspload on 28081-");
report(verifyGetm(CLUSTERED_INSTANCE_NAME1+getmArg, getmKey), "jsploadtest-1");
@@ -69,7 +69,7 @@
private void testMyWeb() {
final String uri = "HelloWeb/HelloWorld";
final String uri2 = "HelloWeb/MyServlet";
- final String sessionCount =".applications.HelloWeb.server.sessionstotal-count";
+ final String sessionCount =".applications.HelloWeb.server.sessionstotal-count";
final String activatedCount =".web.session.activatedsessionstotal-count";
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/Jps.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/Jps.java
index 75541d4..e4cd757 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/Jps.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/Jps.java
@@ -45,7 +45,7 @@
/**
* return the platform-specific process-id of a JVM
- * @param mainClassName The main class - this is how we identify the right JVM.
+ * @param mainClassName The main class - this is how we identify the right JVM.
* You can pass in a fully-qualified name or just the classname.
* E.g. com.sun.enterprise.glassfish.bootstrap.ASMain and ASMain work the same.
* @return the process id if possible otherwise 0
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/ProcessUtils.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/ProcessUtils.java
index 2f2cd40..18aab10 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/ProcessUtils.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/ProcessUtils.java
@@ -157,10 +157,10 @@
pm.execute();
String out = pm.getStdout() + pm.getStderr();
- /* output is either
- (1)
+ /* output is either
+ (1)
INFO: No tasks running with the specified criteria.
- (2)
+ (2)
Image Name PID Session Name Session# Mem Usage
========================= ====== ================ ======== ============
java.exe 3760 Console 0 64,192 K
@@ -230,18 +230,18 @@
private static boolean debug;
public static boolean isWindows() {
String osname = System.getProperty("os.name");
-
+
if(osname == null || osname.length() <= 0)
return false;
-
+
// case insensitive compare...
- osname = osname.toLowerCase();
-
+ osname = osname.toLowerCase();
+
if(osname.indexOf("windows") >= 0)
return true;
-
+
return false;
-
+
}
static boolean ok(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/SmartFile.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/SmartFile.java
index 4cc9585..5caf731 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/SmartFile.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/SmartFile.java
@@ -24,6 +24,6 @@
*/
public class SmartFile {
static File sanitize(File f) {
- return f.getAbsoluteFile();
- }
+ return f.getAbsoluteFile();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml
index 1b51d15..448cf07 100644
--- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.main</groupId>
- <artifactId>batch-dev-tests</artifactId>
+ <artifactId>batch-dev-tests</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>batch-commands-tests</artifactId>
@@ -36,5 +36,5 @@
<artifactId>batch-tests-utils</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/src/test/java/org/glassfish/javaee7/batch/test/BatchCommandsTest.java b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/src/test/java/org/glassfish/javaee7/batch/test/BatchCommandsTest.java
index 0ecb2b8..b6a6812 100644
--- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/src/test/java/org/glassfish/javaee7/batch/test/BatchCommandsTest.java
+++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-commands-tests/src/test/java/org/glassfish/javaee7/batch/test/BatchCommandsTest.java
@@ -446,12 +446,12 @@
CommandUtil cmdWithJustName = CommandUtil.getInstance().executeCommandAndGetAsList("asadmin",
"list-batch-jobs", "-o", "jobname");
- System.out.println("************************************************************************");
- System.out.println("************************************************************************");
- System.out.println("** list-batch-jobs -l ==> " + size + "; list-batch-jobs -o jobname ==> " + cmdWithJustName.result().size());
- System.out.println("************************************************************************");
- System.out.println("************************************************************************");
- System.out.println("************************************************************************");
+ System.out.println("************************************************************************");
+ System.out.println("************************************************************************");
+ System.out.println("** list-batch-jobs -l ==> " + size + "; list-batch-jobs -o jobname ==> " + cmdWithJustName.result().size());
+ System.out.println("************************************************************************");
+ System.out.println("************************************************************************");
+ System.out.println("************************************************************************");
assertTrue(cmd.ranOK());
assertTrue(cmdWithJustName.ranOK() && cmdWithJustName.result().size() == cmd.result().size());
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml
index fc65cda..d80e249 100644
--- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/batch-tests-utils/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.glassfish.main</groupId>
- <artifactId>batch-dev-tests</artifactId>
+ <artifactId>batch-dev-tests</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>batch-tests-utils</artifactId>
<packaging>jar</packaging>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml
index d009f99..40689dd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/batch-dev-tests/pom.xml
@@ -30,7 +30,7 @@
<artifactId>batch-dev-tests</artifactId>
<packaging>pom</packaging>
-
+
<modules>
<module>batch-tests-utils</module>
<module>batch-commands-tests</module>
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.properties b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.properties
index bac1121..ab87d95 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.properties
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/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="devtest-batch-bmt-chunk-job"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
<property name="batch.xml" value="descriptor/batch.xml"/>
@@ -29,11 +29,11 @@
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="batch.jobs.dir" value="descriptor/batch-jobs"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="batch_derby.sql" value="../../batch_derby.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.xml b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.xml
index 62f6060..bcd60b5 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,19 +51,19 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="copy-batch-sql" depends="build">
- <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
- <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
</target>
- <target name="deploy"
+ <target name="copy-batch-sql" depends="build">
+ <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
+ <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
index fff74a0..d4d8ada 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
@@ -26,7 +26,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -35,33 +35,33 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("batch-chunk-stateless");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(name="ejb/kk") Sless sless;
public void doTest() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
- long executionId = sless.submitJob();
- System.out.println("************************************************");
- System.out.println("******* JobID: " + executionId + " ******************");
- System.out.println("************************************************");
- String jobBatchStatus = "";
- for (int sec=10; sec>0; sec--) {
- try {
- jobBatchStatus = sless.getJobExitStatus(executionId);
- if (! "COMPLETED".equals(jobBatchStatus)) {
- System.out.println("Will sleep for " + sec + " more seconds...: " + jobBatchStatus);
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
- }
+ long executionId = sless.submitJob();
+ System.out.println("************************************************");
+ System.out.println("******* JobID: " + executionId + " ******************");
+ System.out.println("************************************************");
+ String jobBatchStatus = "";
+ for (int sec=10; sec>0; sec--) {
+ try {
+ jobBatchStatus = sless.getJobExitStatus(executionId);
+ if (! "COMPLETED".equals(jobBatchStatus)) {
+ System.out.println("Will sleep for " + sec + " more seconds...: " + jobBatchStatus);
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
+ }
stat.addStatus("batch-chunk-stateless", ("COMPLETED".equals(jobBatchStatus) ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-chunk-stateless", stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/descriptor/batch-jobs/ChunkJob.xml b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/descriptor/batch-jobs/ChunkJob.xml
index d68b3f6..4dec954 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/descriptor/batch-jobs/ChunkJob.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/descriptor/batch-jobs/ChunkJob.xml
@@ -20,9 +20,9 @@
<job id="bmt-chunk-job" xmlns="https://jakarta.ee/xml/ns/jakartaee" version="2.0">
<step id="step1">
<chunk item-count="3">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
</job>
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/IdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/IdGenerator.java
index 157ea40..b6d3f5f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/IdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/IdGenerator.java
@@ -21,5 +21,5 @@
public interface IdGenerator {
public String nextId();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleIdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleIdGenerator.java
index 782ac85..3c74b68 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleIdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleIdGenerator.java
@@ -22,9 +22,9 @@
*/
public class SimpleIdGenerator
implements IdGenerator {
-
+
private AtomicInteger counter = new AtomicInteger(0);
-
+
public String nextId() {
return "" + counter.incrementAndGet();
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
index f4308b0..c5339eb 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
@@ -23,12 +23,12 @@
// @Inject
// IdGenerator idGen;
-
+
@Override
public String processItem(Object obj) throws Exception {
- String t = (String) obj;
+ String t = (String) obj;
String[] record = t.split(", ");
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
int salary = Integer.valueOf(record[2]);
double tax = Double.valueOf(record[3]);
@@ -39,5 +39,5 @@
sb.append(", ").append(salary - (salary * tax / 100) - (salary * mediCare / 100));
return sb.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
index 702b718..6e93a9e 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
@@ -21,7 +21,7 @@
implements jakarta.batch.api.chunk.ItemReader {
private int index = 0;
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
private String[] items = new String[] {
"120-01, JAN-2013, 8000, 27, 3, 0",
@@ -33,7 +33,7 @@
"120-07, JAN-2013, 11000, 36, 5, 0",
"120-08, JAN-2013, 11500, 36, 5, 0",
};
-
+
@Override
public void open(Serializable e) throws Exception {
}
@@ -51,5 +51,5 @@
public Serializable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
index 4fb5edd..f6cad67 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
@@ -19,7 +19,7 @@
@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
implements jakarta.batch.api.chunk.ItemWriter {
-
+
@Override
public void open(Serializable e) throws Exception {
}
@@ -31,7 +31,7 @@
@Override
public void writeItems(List lst) throws Exception {
StringBuilder sb = new StringBuilder("SimpleItemWriter:");
- List<String> list = (List<String>) lst;
+ List<String> list = (List<String>) lst;
for (String s : list) {
sb.append(" ").append(s);
}
@@ -42,5 +42,5 @@
public Serializable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
index a1e09e7..7717934 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
@@ -36,32 +36,32 @@
}
public long submitJob() {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
- Properties props = new Properties();
- for (int i=0; i<9; i++)
- props.put("Chunk-Key-"+ i, "Chunk-Value-" + i);
- return jobOperator.start("ChunkJob", props);
+ Properties props = new Properties();
+ for (int i=0; i<9; i++)
+ props.put("Chunk-Key-"+ i, "Chunk-Value-" + i);
+ return jobOperator.start("ChunkJob", props);
} catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ throw new RuntimeException(ex);
+ }
}
public String getJobExitStatus(long executionId) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution je = jobOperator.getJobExecution(executionId);
- return je.getExitStatus();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution je = jobOperator.getJobExecution(executionId);
+ return je.getExitStatus();
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/build.xml b/appserver/tests/appserv-tests/devtests/batch/build.xml
index 4f7ae81..0ac876c 100755
--- a/appserver/tests/appserv-tests/devtests/batch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/build.xml
@@ -32,22 +32,22 @@
<property file="build.properties" />
<target name="all">
- <delete>
+ <delete>
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
</delete>
<delete>
<fileset dir="." includes="*.output"/>
</delete>
<record name="batch.output" action="start" />
-<!-- <ant dir="batch-dev-tests" target="all"/> -->
- <ant dir="bmt-chunk-job" target="all"/>
- <ant dir="cmt-chunk-job" target="all"/>
-<!-- <ant dir="pay-roll-job-with-ejb/stateless" target="all"/>
- <ant dir="simple-batchlet" target="all"/> -->
- <ant dir="simple-validation-test" target="all"/>
-<!-- <ant dir="two-steps-job" target="all"/> -->
- <record name="batch.output" action="stop" />
-
+<!-- <ant dir="batch-dev-tests" target="all"/> -->
+ <ant dir="bmt-chunk-job" target="all"/>
+ <ant dir="cmt-chunk-job" target="all"/>
+<!-- <ant dir="pay-roll-job-with-ejb/stateless" target="all"/>
+ <ant dir="simple-batchlet" target="all"/> -->
+ <ant dir="simple-validation-test" target="all"/>
+<!-- <ant dir="two-steps-job" target="all"/> -->
+ <record name="batch.output" action="stop" />
+
</target>
</project>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.properties b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.properties
index 6781708..742c8bb 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.properties
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/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="batch-cmt-chunk"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
<property name="batch.xml" value="descriptor/batch.xml"/>
@@ -29,11 +29,11 @@
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="batch.jobs.dir" value="descriptor/batch-jobs"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="batch_derby.sql" value="../../batch_derby.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.xml b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.xml
index 1681cb4..5c66848 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,19 +51,19 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/JobSubmitter.class"/>
</antcall>
- </target>
-
- <target name="copy-batch-sql" depends="build">
- <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
- <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
</target>
- <target name="deploy"
+ <target name="copy-batch-sql" depends="build">
+ <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
+ <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
index 86725d8..03b616a 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,45 +34,45 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("batch-cmt-chunk");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB JobSubmitter jobSubmitter;
int MAX_JOB_SIZE = 2;
long[] executionIds = new long[MAX_JOB_SIZE];
public void doTest() {
- for (int i=0; i<MAX_JOB_SIZE; i++)
- executionIds[i] = -1;
+ for (int i=0; i<MAX_JOB_SIZE; i++)
+ executionIds[i] = -1;
submitJobs();
checkJobExecution(executionIds[0]);
- isJobExecutionOK(executionIds[0]);
- checkIfOnlyJobsFromThisAppAreVisible();
+ isJobExecutionOK(executionIds[0]);
+ checkIfOnlyJobsFromThisAppAreVisible();
}
public void submitJobs() {
try {
- for (int i = 0; i< MAX_JOB_SIZE; i++) {
- executionIds[i] = jobSubmitter.submitJob("CMT-ChunkJob");
- checkBatchJobStatus(executionIds[i], 10);
- }
- boolean result = true;
- for (int i=0; i<MAX_JOB_SIZE; i++) {
- result = result && executionIds[i] != -1;
- }
+ for (int i = 0; i< MAX_JOB_SIZE; i++) {
+ executionIds[i] = jobSubmitter.submitJob("CMT-ChunkJob");
+ checkBatchJobStatus(executionIds[i], 10);
+ }
+ boolean result = true;
+ for (int i=0; i<MAX_JOB_SIZE; i++) {
+ result = result && executionIds[i] != -1;
+ }
stat.addStatus("batch-cmt-chunk-test1", (result ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-test1", stat.FAIL);
}
}
public void checkJobExecution(long executionId) {
try {
- boolean status = true;
- Map<String, String> map = jobSubmitter.toMap(executionId);
+ boolean status = true;
+ Map<String, String> map = jobSubmitter.toMap(executionId);
stat.addStatus("batch-cmt-status-checkExe-jobName", map.get("jobName") != null ? stat.PASS : stat.FAIL);
stat.addStatus("batch-cmt-status-checkExe-appName", map.get("appName") != null ? stat.PASS : stat.FAIL);
@@ -83,7 +83,7 @@
stat.addStatus("batch-cmt-status-checkExe-batchStatus", map.get("batchStatus") != null ? stat.PASS : stat.FAIL);
stat.addStatus("batch-cmt-status-checkExe-endTime", map.get("endTime") != null ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-test3", stat.FAIL);
}
}
@@ -94,18 +94,18 @@
private boolean checkOneJobExecution(long executionId) {
try {
- Map<String, String> map = jobSubmitter.toMap(executionId);
- return map != null &&
- map.get("jobName") != null &&
- map.get("appName") != null &&
- map.get("instanceCount") != null &&
- map.get("instanceID") != null &&
- map.get("executionID") != null &&
- map.get("startTime") != null &&
- map.get("batchStatus") != null &&
- map.get("endTime") != null;
+ Map<String, String> map = jobSubmitter.toMap(executionId);
+ return map != null &&
+ map.get("jobName") != null &&
+ map.get("appName") != null &&
+ map.get("instanceCount") != null &&
+ map.get("instanceID") != null &&
+ map.get("executionID") != null &&
+ map.get("startTime") != null &&
+ map.get("batchStatus") != null &&
+ map.get("endTime") != null;
- } catch (Exception ex) {
+ } catch (Exception ex) {
}
return false;
@@ -113,37 +113,37 @@
public void checkIfOnlyJobsFromThisAppAreVisible() {
try {
- boolean status = true;
+ boolean status = true;
for (long exeId : jobSubmitter.getAllExecutionIds(null)) {
- Map<String, String> map = jobSubmitter.toMap(exeId);
- String jobName = map.get("jobName");
- String appName = map.get("appName");
- if (!jobName.startsWith("cmt-chunk-job") || !appName.startsWith("server-config:batch-cmt-chunkApp")) {
- System.out.println("***********************************************");
- System.out.println("*** Job From another app? " + jobName + "; " + appName + " ***");
- System.out.println("***********************************************");
- status = false;
- break;
- }
- }
+ Map<String, String> map = jobSubmitter.toMap(exeId);
+ String jobName = map.get("jobName");
+ String appName = map.get("appName");
+ if (!jobName.startsWith("cmt-chunk-job") || !appName.startsWith("server-config:batch-cmt-chunkApp")) {
+ System.out.println("***********************************************");
+ System.out.println("*** Job From another app? " + jobName + "; " + appName + " ***");
+ System.out.println("***********************************************");
+ status = false;
+ break;
+ }
+ }
stat.addStatus("batch-cmt-chunk-checkIfOnlyJobsFromThisAppAreVisible", (status ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-checkIfOnlyJobsFromThisAppAreVisible", stat.FAIL);
}
}
public void checkBatchJobStatus(long executionId, int sec) {
- while (sec-- > 0) {
+ while (sec-- > 0) {
try {
- String status = jobSubmitter.getJobExitStatus(executionId);
- if ("COMPLETED".equalsIgnoreCase(status) || "FAILED".equalsIgnoreCase(status)) {
- System.out.println("** checkBatchJobStatus[" + executionId + "] ==> " + status);
- break;
- }
+ String status = jobSubmitter.getJobExitStatus(executionId);
+ if ("COMPLETED".equalsIgnoreCase(status) || "FAILED".equalsIgnoreCase(status)) {
+ System.out.println("** checkBatchJobStatus[" + executionId + "] ==> " + status);
+ break;
+ }
System.out.println("Will sleep for " + sec + " more seconds...");
Thread.currentThread().sleep(1000);
} catch (Exception ex) {
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/descriptor/batch-jobs/CMT-ChunkJob.xml b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/descriptor/batch-jobs/CMT-ChunkJob.xml
index f0d420a..b8456a4 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/descriptor/batch-jobs/CMT-ChunkJob.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/descriptor/batch-jobs/CMT-ChunkJob.xml
@@ -20,9 +20,9 @@
<job id="cmt-chunk-job" xmlns="https://jakarta.ee/xml/ns/jakartaee" version="2.0">
<step id="step1">
<chunk item-count="3">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
</job>
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java
index 7823249..39168a9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java
@@ -21,5 +21,5 @@
public interface IdGenerator {
public String nextId();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 959a3ac..aa5a69c 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -45,75 +45,75 @@
}
public long submitJob(String jobName) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
- Properties props = new Properties();
- for (int i=0; i<3; i++)
- props.put(jobName + "-Key-" + i, jobName+"-Value-" + i);
- return jobOperator.start(jobName, props);
+ Properties props = new Properties();
+ for (int i=0; i<3; i++)
+ props.put(jobName + "-Key-" + i, jobName+"-Value-" + i);
+ return jobOperator.start(jobName, props);
} catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ throw new RuntimeException(ex);
+ }
}
public String getJobExitStatus(long executionId) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution je = jobOperator.getJobExecution(executionId);
- return je.getExitStatus();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution je = jobOperator.getJobExecution(executionId);
+ return je.getExitStatus();
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
public Collection<String> listJobs(boolean useLongFormat) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- Set<String> jobs = new HashSet<String>();
- if (!useLongFormat) {
- for (String jobName : jobOperator.getJobNames()) {
- StringBuilder sb = new StringBuilder();
- sb.append(jobName).append(" ").append(jobOperator.getJobInstanceCount(jobName));
- jobs.add(sb.toString());
- }
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ Set<String> jobs = new HashSet<String>();
+ if (!useLongFormat) {
+ for (String jobName : jobOperator.getJobNames()) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(jobName).append(" ").append(jobOperator.getJobInstanceCount(jobName));
+ jobs.add(sb.toString());
+ }
} else {
- int index = 0;
- for (String jobName : jobOperator.getJobNames()) {
- List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
- if (exe != null) {
- for (JobInstance ji : exe) {
- for (JobExecution je : jobOperator.getJobExecutions(ji)) {
- StringBuilder sb = new StringBuilder();
+ int index = 0;
+ for (String jobName : jobOperator.getJobNames()) {
+ List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
+ if (exe != null) {
+ for (JobInstance ji : exe) {
+ for (JobExecution je : jobOperator.getJobExecutions(ji)) {
+ StringBuilder sb = new StringBuilder();
try {
sb.append(index++).append(" ").append(jobName).append(" ").append(((TaggedJobExecution) je).getTagName())
- .append(" ").append(je.getBatchStatus()).append(" ").append(je.getExitStatus());
- jobs.add(sb.toString());
+ .append(" ").append(je.getBatchStatus()).append(" ").append(je.getExitStatus());
+ jobs.add(sb.toString());
} catch (Exception ex) {
- jobs.add("Exception : " + sb.toString());
+ jobs.add("Exception : " + sb.toString());
}
}
}
- }
- }
- }
+ }
+ }
+ }
- return jobs;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ return jobs;
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
public Map<String, String> toMap(long executionId) {
HashMap<String, String> map = new HashMap<String, String>();
try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution je = jobOperator.getJobExecution(executionId);
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution je = jobOperator.getJobExecution(executionId);
map.put("jobName", ""+je.getJobName());
map.put("appName", ""+((TaggedJobExecution) je).getTagName());
- try {
+ try {
map.put("instanceCount", ""+jobOperator.getJobInstanceCount(je.getJobName()));
} catch (Exception ex) {}
@@ -129,39 +129,39 @@
return map;
}
-
+
public Collection<String> listJobExecutions(boolean useLongFormat, long... executinIds) {
- Set<String> jobs = new HashSet<String>();
- return jobs;
+ Set<String> jobs = new HashSet<String>();
+ return jobs;
}
public List<Long> getAllExecutionIds(String jobName) {
- List<Long> list = new LinkedList<Long>();
- try {
+ List<Long> list = new LinkedList<Long>();
+ try {
if (jobName != null)
getAllExecutionIds(jobName, list);
- else {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- for (String jn : jobOperator.getJobNames())
+ else {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ for (String jn : jobOperator.getJobNames())
getAllExecutionIds(jn, list);
- }
+ }
} catch (Exception ex) {
- }
- return list;
+ }
+ return list;
}
private void getAllExecutionIds(String jobName, List<Long> list)
- throws Exception {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
- if (exe != null) {
- for (JobInstance ji : exe) {
- for (JobExecution je : jobOperator.getJobExecutions(ji)) {
+ throws Exception {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
+ if (exe != null) {
+ for (JobInstance ji : exe) {
+ for (JobExecution je : jobOperator.getJobExecutions(ji)) {
list.add(je.getExecutionId());
}
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java
index 0cf4ee2..1da6447 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java
@@ -22,9 +22,9 @@
*/
public class SimpleIdGenerator
implements IdGenerator {
-
+
private AtomicInteger counter = new AtomicInteger(0);
-
+
public String nextId() {
return "" + counter.incrementAndGet();
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
index 4d5789d..d8ce273 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
@@ -23,12 +23,12 @@
// @Inject
// IdGenerator idGen;
-
+
@Override
public String processItem(Object obj) throws Exception {
- String t = (String) obj;
+ String t = (String) obj;
String[] record = t.split(", ");
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
int salary = Integer.valueOf(record[2]);
double tax = Double.valueOf(record[3]);
@@ -39,5 +39,5 @@
sb.append(", ").append(salary - (salary * tax / 100) - (salary * mediCare / 100));
return sb.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
index cc17c2f..01622f2 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
@@ -21,7 +21,7 @@
implements jakarta.batch.api.chunk.ItemReader {
private int index = 0;
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
private String[] items = new String[] {
"120-01, JAN-2013, 8000, 27, 3, 0",
@@ -33,7 +33,7 @@
"120-07, JAN-2013, 11000, 36, 5, 0",
"120-08, JAN-2013, 11500, 36, 5, 0",
};
-
+
@Override
public void open(Serializable e) throws Exception {
}
@@ -51,5 +51,5 @@
public Serializable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
index 508f9a6..c161b25 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
@@ -19,7 +19,7 @@
@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
implements jakarta.batch.api.chunk.ItemWriter {
-
+
@Override
public void open(Serializable e) throws Exception {
}
@@ -31,7 +31,7 @@
@Override
public void writeItems(List lst) throws Exception {
StringBuilder sb = new StringBuilder("SimpleItemWriter:");
- List<String> list = (List<String>) lst;
+ List<String> list = (List<String>) lst;
for (String s : list) {
sb.append(" ").append(s);
}
@@ -42,5 +42,5 @@
public Serializable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.properties b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.properties
index f5f2f47..4abd242 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.properties
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/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="devtest-intro-stateless"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
<property name="batch.xml" value="descriptor/batch.xml"/>
@@ -29,11 +29,11 @@
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="batch.jobs.dir" value="descriptor/batch-jobs"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="batch_derby.sql" value="../../batch_derby.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.xml b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.xml
index d102ff4..09fc48a 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,19 +51,19 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="copy-batch-sql" depends="build">
- <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
- <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
</target>
- <target name="deploy"
+ <target name="copy-batch-sql" depends="build">
+ <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
+ <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
index 890bdeb..5a79573 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
@@ -26,7 +26,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -35,22 +35,22 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("batch-pay-rool-job-ejb-stateless");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(name="ejb/kk") Sless sless;
public void doTest() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
- long result = sless.submitJob();
- System.out.println("************************************************");
- System.out.println("******* JobID: " + result + " ******************");
- System.out.println("************************************************");
+ long result = sless.submitJob();
+ System.out.println("************************************************");
+ System.out.println("******* JobID: " + result + " ******************");
+ System.out.println("************************************************");
stat.addStatus("batch payroll", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch payroll", stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/descriptor/batch-jobs/PayRollJob.xml b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/descriptor/batch-jobs/PayRollJob.xml
index 625f54b..cc0310f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/descriptor/batch-jobs/PayRollJob.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/descriptor/batch-jobs/PayRollJob.xml
@@ -20,16 +20,16 @@
<job id="job1" xmlns="http://batch.jsr352/jsl">
<step id="prepare" next="process">
<chunk item-count="1">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
<step id="process">
<chunk item-count="3">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
</job>
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
index 7a167e6..6b5375d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
@@ -38,10 +38,10 @@
* @author makannan
*/
public class JobSubmitterServlet extends HttpServlet {
-
+
// @Resource(name="concurrent/batch-executor-service")
// ManagedExecutorService managedExecutorService;
-
+
/**
* Processes requests for both HTTP
* <code>GET</code> and
@@ -72,7 +72,7 @@
submitJobFromXML(out);
} else if (request.getParameter("listJobs") != null) {
out.println("<tr><td>listJobs</td><td>Not implemented yet</td></tr>");
- }
+ }
out.println("</table>");
@@ -88,7 +88,7 @@
private void submitJobFromXML(PrintWriter pw)
throws Exception {
-
+
JobOperator jobOperator = BatchRuntime.getJobOperator();
pw.println("<tr><td>JobOperator class </td><td>" + jobOperator.getClass().getName() + " </td></tr>");
@@ -96,11 +96,11 @@
for (int i=0; i<9; i++)
props.put(i, i);
Long id = jobOperator.start("PayRollJob", props);
-
+
pw.println(jobInfo(jobOperator, id, pw));
-
+
}
-
+
//getJobNames()
private String jobNames(JobOperator jobOperator) {
StringBuilder sb = new StringBuilder("JobOperator.jobNames: ");
@@ -108,7 +108,7 @@
sb.append(" ").append(j);
return sb.toString();
}
-
+
private String jobInfo(JobOperator jobOperator, long id, PrintWriter pw) {
StringBuilder sb = new StringBuilder("JobOperator.jobNames: ");
sb.append("<tr><td>Id</td><td" + id + "</td></tr>");
@@ -117,7 +117,7 @@
sb.append(asString(jobOperator.getJobExecution(id)));
return sb.toString();
}
-
+
private String asString(JobExecution je) {
StringBuilder sb = new StringBuilder("JobExecution: ");
sb.append("<tr><td>=> createTime</td><td>").append(je.getCreateTime()).append("</td></tr>");
@@ -128,10 +128,10 @@
sb.append("<tr><td>=> jobParameters: </td><td>").append(je.getJobParameters()).append("</td></tr>");
sb.append("<tr><td>=> lastUpdatedTime: </td><td>").append(je.getLastUpdatedTime()).append("</td></tr>");
sb.append("<tr><td>=> status: </td><td>").append(je.getExitStatus()).append("</td></tr>");
-
+
return sb.toString();
}
-
+
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/**
* Handles the HTTP
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
index 248df8f..bc59c18 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
@@ -23,11 +23,11 @@
// @Inject
// IdGenerator idGen;
-
+
@Override
public String processItem(String t) throws Exception {
String[] record = t.split(", ");
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
int salary = Integer.valueOf(record[2]);
double tax = Double.valueOf(record[3]);
@@ -38,5 +38,5 @@
sb.append(", ").append(salary - (salary * tax / 100) - (salary * mediCare / 100));
return sb.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
index f42b504..9118cb9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
@@ -21,7 +21,7 @@
extends jakarta.batch.api.AbstractItemReader<String> {
private int index = 0;
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
private String[] items = new String[] {
"120-01, JAN-2013, 8000, 27, 3, 0",
@@ -33,7 +33,7 @@
"120-07, JAN-2013, 11000, 36, 5, 0",
"120-08, JAN-2013, 11500, 36, 5, 0",
};
-
+
@Override
public void open(Externalizable e) throws Exception {
}
@@ -51,5 +51,5 @@
public Externalizable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
index 122c8e0..aad4f9b 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
@@ -19,7 +19,7 @@
@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
extends jakarta.batch.api.AbstractItemWriter<String> {
-
+
@Override
public void open(Externalizable e) throws Exception {
}
@@ -41,5 +41,5 @@
public Externalizable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
index 57d0830..03552a6 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
@@ -32,21 +32,21 @@
}
public long submitJob() {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
- Properties props = new Properties();
- for (int i=0; i<9; i++)
- props.put(i, i);
- return jobOperator.start("PayRollJob", props);
+ Properties props = new Properties();
+ for (int i=0; i<9; i++)
+ props.put(i, i);
+ return jobOperator.start("PayRollJob", props);
} catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ throw new RuntimeException(ex);
+ }
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/run_test.sh b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
index 825f417..eae5acc 100755
--- a/appserver/tests/appserv-tests/devtests/batch/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
@@ -50,11 +50,11 @@
}
get_test_target(){
- case ${1} in
- batch_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ batch_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.properties b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.properties
index bf01b64..a80793b 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/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="devtest-intro-simple-batchlet"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
<property name="batch.xml" value="descriptor/batch.xml"/>
@@ -29,11 +29,11 @@
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="batch.jobs.dir" value="descriptor/batch-jobs"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="batch_derby.sql" value="../../batch_derby.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.xml b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.xml
index ad53320..61d348e 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,19 +51,19 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="copy-batch-sql" depends="build">
- <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
- <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
</target>
- <target name="deploy"
+ <target name="copy-batch-sql" depends="build">
+ <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
+ <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
index c3990cd..4688017 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
@@ -26,7 +26,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -35,33 +35,33 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("batch-pay-rool-job-ejb-stateless");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(name="ejb/kk") Sless sless;
public void doTest() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
- long executionId = sless.submitJob();
- System.out.println("************************************************");
- System.out.println("******* JobID: " + executionId + " ******************");
- System.out.println("************************************************");
- String jobBatchStatus = "";
- for (int sec=10; sec>0; sec--) {
- try {
- jobBatchStatus = sless.getJobExitStatus(executionId);
- if (! "COMPLETED".equals(jobBatchStatus)) {
- System.out.println("Will sleep for " + sec + " more seconds...: " + jobBatchStatus);
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
- }
+ long executionId = sless.submitJob();
+ System.out.println("************************************************");
+ System.out.println("******* JobID: " + executionId + " ******************");
+ System.out.println("************************************************");
+ String jobBatchStatus = "";
+ for (int sec=10; sec>0; sec--) {
+ try {
+ jobBatchStatus = sless.getJobExitStatus(executionId);
+ if (! "COMPLETED".equals(jobBatchStatus)) {
+ System.out.println("Will sleep for " + sec + " more seconds...: " + jobBatchStatus);
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
+ }
stat.addStatus("simple-batchlet payroll", ("COMPLETED".equals(jobBatchStatus) ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("simple-batchlet payroll", stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/IdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/IdGenerator.java
index 15b7304..bd0ccb0 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/IdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/IdGenerator.java
@@ -21,5 +21,5 @@
public interface IdGenerator {
public String nextId();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
index 2150d36..6fad795 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
@@ -25,9 +25,9 @@
public String process() throws Exception {
return "GREAT_SUCCESS";
}
-
+
@Override
public void stop() throws Exception {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleIdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleIdGenerator.java
index 58acfe6..ba6a997 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleIdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleIdGenerator.java
@@ -22,9 +22,9 @@
*/
public class SimpleIdGenerator
implements IdGenerator {
-
+
private AtomicInteger counter = new AtomicInteger(0);
-
+
public String nextId() {
return "" + counter.incrementAndGet();
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
index f78633c..e8eecf5 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
@@ -33,31 +33,31 @@
}
public long submitJob() {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
- Properties props = new Properties();
- for (int i=0; i<9; i++)
- props.put(i, i);
- return jobOperator.start("simpleBatchletJob", props);
+ Properties props = new Properties();
+ for (int i=0; i<9; i++)
+ props.put(i, i);
+ return jobOperator.start("simpleBatchletJob", props);
} catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ throw new RuntimeException(ex);
+ }
}
public String getJobExitStatus(long executionId) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution jobExecution = jobOperator.getJobExecution(executionId);
- return jobExecution.getExitStatus();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution jobExecution = jobOperator.getJobExecution(executionId);
+ return jobExecution.getExitStatus();
} catch (Exception ex) {}
- return "-1";
+ return "-1";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.properties b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.properties
index 33dfc9d..58e3638 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.properties
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/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="Simple-Validation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
<property name="batch.xml" value="descriptor/batch.xml"/>
@@ -29,11 +29,11 @@
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="batch.jobs.dir" value="descriptor/batch-jobs"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="batch_derby.sql" value="../../batch_derby.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.xml b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.xml
index 127e68a..c21d059 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,19 +51,19 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/JobSubmitter.class"/>
</antcall>
- </target>
-
- <target name="copy-batch-sql" depends="build">
- <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
- <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
</target>
- <target name="deploy"
+ <target name="copy-batch-sql" depends="build">
+ <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
+ <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
index 812a38d..87207cd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,74 +34,74 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("batch-cmt-chunk");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB JobSubmitter jobSubmitter;
int MAX_JOB_SIZE = 2;
long[] executionIds = new long[MAX_JOB_SIZE];
public void doTest() {
- for (int i=0; i<MAX_JOB_SIZE; i++)
- executionIds[i] = -1;
+ for (int i=0; i<MAX_JOB_SIZE; i++)
+ executionIds[i] = -1;
submitJobs();
listBatchJobs();
listBatchJobsInLongFormat();
checkJobExecution(executionIds[0]);
- isJobExecutionOK(executionIds[0]);
- checkAllJobExecutions();
- checkIfOnlyJobsFromThisAppAreVisible();
+ isJobExecutionOK(executionIds[0]);
+ checkAllJobExecutions();
+ checkIfOnlyJobsFromThisAppAreVisible();
}
public void submitJobs() {
try {
- for (int i = 0; i< MAX_JOB_SIZE; i++) {
- executionIds[i] = jobSubmitter.submitJob("Simple-Validation-Job");
- checkBatchJobStatus(executionIds[i], 100);
- }
- boolean result = true;
- for (int i=0; i<MAX_JOB_SIZE; i++) {
- result = result && executionIds[i] != -1;
- }
+ for (int i = 0; i< MAX_JOB_SIZE; i++) {
+ executionIds[i] = jobSubmitter.submitJob("Simple-Validation-Job");
+ checkBatchJobStatus(executionIds[i], 100);
+ }
+ boolean result = true;
+ for (int i=0; i<MAX_JOB_SIZE; i++) {
+ result = result && executionIds[i] != -1;
+ }
stat.addStatus("batch-cmt-chunk-test1", (result ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-test1", stat.FAIL);
}
}
public void listBatchJobs() {
try {
- boolean status = true;
- Collection<String> jobs = jobSubmitter.listJobs(false);
- for (String job : jobs) {
- System.out.println("** JOB ==> " + job);
- }
+ boolean status = true;
+ Collection<String> jobs = jobSubmitter.listJobs(false);
+ for (String job : jobs) {
+ System.out.println("** JOB ==> " + job);
+ }
stat.addStatus("batch-cmt-chunk-test2", (status ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-test2", stat.FAIL);
}
}
public void listBatchJobsInLongFormat() {
try {
- boolean status = true;
- Collection<String> jobs = jobSubmitter.listJobs(true);
- for (String job : jobs) {
- System.out.println("** JOB ==> " + job);
- }
+ boolean status = true;
+ Collection<String> jobs = jobSubmitter.listJobs(true);
+ for (String job : jobs) {
+ System.out.println("** JOB ==> " + job);
+ }
stat.addStatus("batch-cmt-chunk-test3", (status ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-test3", stat.FAIL);
}
}
public void checkJobExecution(long executionId) {
try {
- boolean status = true;
- Map<String, String> map = jobSubmitter.toMap(executionId);
+ boolean status = true;
+ Map<String, String> map = jobSubmitter.toMap(executionId);
stat.addStatus("batch-cmt-status-checkExe-jobName", map.get("jobName") != null ? stat.PASS : stat.FAIL);
stat.addStatus("batch-cmt-status-checkExe-appName", map.get("appName") != null ? stat.PASS : stat.FAIL);
@@ -112,7 +112,7 @@
stat.addStatus("batch-cmt-status-checkExe-batchStatus", map.get("batchStatus") != null ? stat.PASS : stat.FAIL);
stat.addStatus("batch-cmt-status-checkExe-endTime", map.get("endTime") != null ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-test3", stat.FAIL);
}
}
@@ -123,18 +123,18 @@
private boolean checkOneJobExecution(long executionId) {
try {
- Map<String, String> map = jobSubmitter.toMap(executionId);
- return map != null &&
- map.get("jobName") != null &&
- map.get("appName") != null &&
- map.get("instanceCount") != null &&
- map.get("instanceID") != null &&
- map.get("executionID") != null &&
- map.get("startTime") != null &&
- map.get("batchStatus") != null &&
- map.get("endTime") != null;
+ Map<String, String> map = jobSubmitter.toMap(executionId);
+ return map != null &&
+ map.get("jobName") != null &&
+ map.get("appName") != null &&
+ map.get("instanceCount") != null &&
+ map.get("instanceID") != null &&
+ map.get("executionID") != null &&
+ map.get("startTime") != null &&
+ map.get("batchStatus") != null &&
+ map.get("endTime") != null;
- } catch (Exception ex) {
+ } catch (Exception ex) {
}
return false;
@@ -145,45 +145,45 @@
for (long exeId : jobSubmitter.getAllExecutionIds(null)) {
if (!checkOneJobExecution(exeId)) {
result = false;
- break;
- }
+ break;
+ }
}
stat.addStatus("batch-cmt-status-checkExe-checkAllJobExecutions", result ? stat.PASS : stat.FAIL);
}
public void checkIfOnlyJobsFromThisAppAreVisible() {
try {
- boolean status = true;
+ boolean status = true;
for (long exeId : jobSubmitter.getAllExecutionIds(null)) {
- Map<String, String> map = jobSubmitter.toMap(exeId);
- String jobName = map.get("jobName");
- String appName = map.get("appName");
- if (!jobName.startsWith("Simple-Validation-Job") || !appName.startsWith("server-config:Simple-ValidationApp")) {
- System.out.println("***********************************************");
- System.out.println("*** Job From another app? " + jobName + "; " + appName + " ***");
- System.out.println("***********************************************");
- status = false;
- break;
- }
- }
+ Map<String, String> map = jobSubmitter.toMap(exeId);
+ String jobName = map.get("jobName");
+ String appName = map.get("appName");
+ if (!jobName.startsWith("Simple-Validation-Job") || !appName.startsWith("server-config:Simple-ValidationApp")) {
+ System.out.println("***********************************************");
+ System.out.println("*** Job From another app? " + jobName + "; " + appName + " ***");
+ System.out.println("***********************************************");
+ status = false;
+ break;
+ }
+ }
stat.addStatus("batch-cmt-chunk-checkIfOnlyJobsFromThisAppAreVisible", (status ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-cmt-chunk-checkIfOnlyJobsFromThisAppAreVisible", stat.FAIL);
}
}
public void checkBatchJobStatus(long executionId, int sec) {
- while (sec-- > 0) {
+ while (sec-- > 0) {
try {
- String status = jobSubmitter.getJobExitStatus(executionId);
- if ("COMPLETED".equalsIgnoreCase(status) || "FAILED".equalsIgnoreCase(status)) {
- System.out.println("** checkBatchJobStatus[" + executionId + "] ==> " + status);
- break;
- }
+ String status = jobSubmitter.getJobExitStatus(executionId);
+ if ("COMPLETED".equalsIgnoreCase(status) || "FAILED".equalsIgnoreCase(status)) {
+ System.out.println("** checkBatchJobStatus[" + executionId + "] ==> " + status);
+ break;
+ }
System.out.println("Will sleep for " + sec + " more seconds...");
Thread.currentThread().sleep(1000);
} catch (Exception ex) {
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/CMT-OneStepJob.xml b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/CMT-OneStepJob.xml
index 1de0cd6..7a2947d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/CMT-OneStepJob.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/CMT-OneStepJob.xml
@@ -20,9 +20,9 @@
<job id="cmt-chunk-job" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
<step id="step1">
<chunk item-count="3">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
</job>
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/Simple-Validation-Job.xml b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/Simple-Validation-Job.xml
index 837e1b1..c032d9f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/Simple-Validation-Job.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/descriptor/batch-jobs/Simple-Validation-Job.xml
@@ -20,16 +20,16 @@
<job id="Simple-Validation-Job" xmlns="https://jakarta.ee/xml/ns/jakartaee" version="2.0">
<step id="step1" next="step2">
<chunk item-count="3">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
<step id="step2">
<chunk item-count="2">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
</job>
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java
index 7823249..39168a9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/IdGenerator.java
@@ -21,5 +21,5 @@
public interface IdGenerator {
public String nextId();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 959a3ac..aa5a69c 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -45,75 +45,75 @@
}
public long submitJob(String jobName) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
- Properties props = new Properties();
- for (int i=0; i<3; i++)
- props.put(jobName + "-Key-" + i, jobName+"-Value-" + i);
- return jobOperator.start(jobName, props);
+ Properties props = new Properties();
+ for (int i=0; i<3; i++)
+ props.put(jobName + "-Key-" + i, jobName+"-Value-" + i);
+ return jobOperator.start(jobName, props);
} catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ throw new RuntimeException(ex);
+ }
}
public String getJobExitStatus(long executionId) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution je = jobOperator.getJobExecution(executionId);
- return je.getExitStatus();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution je = jobOperator.getJobExecution(executionId);
+ return je.getExitStatus();
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
public Collection<String> listJobs(boolean useLongFormat) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- Set<String> jobs = new HashSet<String>();
- if (!useLongFormat) {
- for (String jobName : jobOperator.getJobNames()) {
- StringBuilder sb = new StringBuilder();
- sb.append(jobName).append(" ").append(jobOperator.getJobInstanceCount(jobName));
- jobs.add(sb.toString());
- }
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ Set<String> jobs = new HashSet<String>();
+ if (!useLongFormat) {
+ for (String jobName : jobOperator.getJobNames()) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(jobName).append(" ").append(jobOperator.getJobInstanceCount(jobName));
+ jobs.add(sb.toString());
+ }
} else {
- int index = 0;
- for (String jobName : jobOperator.getJobNames()) {
- List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
- if (exe != null) {
- for (JobInstance ji : exe) {
- for (JobExecution je : jobOperator.getJobExecutions(ji)) {
- StringBuilder sb = new StringBuilder();
+ int index = 0;
+ for (String jobName : jobOperator.getJobNames()) {
+ List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
+ if (exe != null) {
+ for (JobInstance ji : exe) {
+ for (JobExecution je : jobOperator.getJobExecutions(ji)) {
+ StringBuilder sb = new StringBuilder();
try {
sb.append(index++).append(" ").append(jobName).append(" ").append(((TaggedJobExecution) je).getTagName())
- .append(" ").append(je.getBatchStatus()).append(" ").append(je.getExitStatus());
- jobs.add(sb.toString());
+ .append(" ").append(je.getBatchStatus()).append(" ").append(je.getExitStatus());
+ jobs.add(sb.toString());
} catch (Exception ex) {
- jobs.add("Exception : " + sb.toString());
+ jobs.add("Exception : " + sb.toString());
}
}
}
- }
- }
- }
+ }
+ }
+ }
- return jobs;
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ return jobs;
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
public Map<String, String> toMap(long executionId) {
HashMap<String, String> map = new HashMap<String, String>();
try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution je = jobOperator.getJobExecution(executionId);
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution je = jobOperator.getJobExecution(executionId);
map.put("jobName", ""+je.getJobName());
map.put("appName", ""+((TaggedJobExecution) je).getTagName());
- try {
+ try {
map.put("instanceCount", ""+jobOperator.getJobInstanceCount(je.getJobName()));
} catch (Exception ex) {}
@@ -129,39 +129,39 @@
return map;
}
-
+
public Collection<String> listJobExecutions(boolean useLongFormat, long... executinIds) {
- Set<String> jobs = new HashSet<String>();
- return jobs;
+ Set<String> jobs = new HashSet<String>();
+ return jobs;
}
public List<Long> getAllExecutionIds(String jobName) {
- List<Long> list = new LinkedList<Long>();
- try {
+ List<Long> list = new LinkedList<Long>();
+ try {
if (jobName != null)
getAllExecutionIds(jobName, list);
- else {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- for (String jn : jobOperator.getJobNames())
+ else {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ for (String jn : jobOperator.getJobNames())
getAllExecutionIds(jn, list);
- }
+ }
} catch (Exception ex) {
- }
- return list;
+ }
+ return list;
}
private void getAllExecutionIds(String jobName, List<Long> list)
- throws Exception {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
- if (exe != null) {
- for (JobInstance ji : exe) {
- for (JobExecution je : jobOperator.getJobExecutions(ji)) {
+ throws Exception {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ List<JobInstance> exe = jobOperator.getJobInstances(jobName, 0, Integer.MAX_VALUE - 1);
+ if (exe != null) {
+ for (JobInstance ji : exe) {
+ for (JobExecution je : jobOperator.getJobExecutions(ji)) {
list.add(je.getExecutionId());
}
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java
index 0cf4ee2..1da6447 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleIdGenerator.java
@@ -22,9 +22,9 @@
*/
public class SimpleIdGenerator
implements IdGenerator {
-
+
private AtomicInteger counter = new AtomicInteger(0);
-
+
public String nextId() {
return "" + counter.incrementAndGet();
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
index f40bab6..5f8e4b2 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
@@ -23,12 +23,12 @@
@Inject
IdGenerator idGen;
-
+
@Override
public String processItem(Object obj) throws Exception {
- String t = (String) obj;
+ String t = (String) obj;
String[] record = t.split(", ");
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
int salary = Integer.valueOf(record[2]);
double tax = Double.valueOf(record[3]);
@@ -41,5 +41,5 @@
System.out.println("IdGen ==> " + idGen);
return sb.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
index cc17c2f..01622f2 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
@@ -21,7 +21,7 @@
implements jakarta.batch.api.chunk.ItemReader {
private int index = 0;
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
private String[] items = new String[] {
"120-01, JAN-2013, 8000, 27, 3, 0",
@@ -33,7 +33,7 @@
"120-07, JAN-2013, 11000, 36, 5, 0",
"120-08, JAN-2013, 11500, 36, 5, 0",
};
-
+
@Override
public void open(Serializable e) throws Exception {
}
@@ -51,5 +51,5 @@
public Serializable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
index 15c5e9e..0178cf7 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
@@ -19,7 +19,7 @@
@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
implements jakarta.batch.api.chunk.ItemWriter {
-
+
@Override
public void open(Serializable e) throws Exception {
}
@@ -31,17 +31,17 @@
@Override
public void writeItems(List lst) throws Exception {
StringBuilder sb = new StringBuilder("SimpleItemWriter:");
- List<String> list = (List<String>) lst;
+ List<String> list = (List<String>) lst;
for (String s : list) {
sb.append(" ").append(s);
}
System.out.println(sb.toString());
- try { Thread.currentThread().sleep(1000); } catch (Exception ex) {}
+ try { Thread.currentThread().sleep(1000); } catch (Exception ex) {}
}
@Override
public Serializable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.properties b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.properties
index 50a282e..512c0f6 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.properties
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/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="devtest-batch-two-steps-job"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="beans.xml" value="descriptor/beans.xml"/>
<property name="batch.xml" value="descriptor/batch.xml"/>
@@ -29,11 +29,11 @@
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="batch.jobs.dir" value="descriptor/batch-jobs"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="batch_derby.sql" value="../../batch_derby.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.xml b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.xml
index 408654f..cd05c70 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,19 +51,19 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="copy-batch-sql" depends="build">
- <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
- <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
</target>
- <target name="deploy"
+ <target name="copy-batch-sql" depends="build">
+ <echo message="***** Copy ${batch_derby.sql} to Target dir: ${env.S1AS_HOME}/lib"/>
+ <copy file="${batch_derby.sql}" todir="${env.S1AS_HOME}/lib"/>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
index c10758d..c39f586 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
@@ -26,7 +26,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -35,33 +35,33 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("batch-two-steps-stateless");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(name="ejb/kk") Sless sless;
public void doTest() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
- long executionId = sless.submitJob();
- System.out.println("************************************************");
- System.out.println("******* JobID: " + executionId + " ******************");
- System.out.println("************************************************");
- String jobBatchStatus = "";
- for (int sec=10; sec>0; sec--) {
- try {
- jobBatchStatus = sless.getJobExitStatus(executionId);
- if (! "COMPLETED".equals(jobBatchStatus)) {
- System.out.println("Will sleep for " + sec + " more seconds...: " + jobBatchStatus);
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
- }
+ long executionId = sless.submitJob();
+ System.out.println("************************************************");
+ System.out.println("******* JobID: " + executionId + " ******************");
+ System.out.println("************************************************");
+ String jobBatchStatus = "";
+ for (int sec=10; sec>0; sec--) {
+ try {
+ jobBatchStatus = sless.getJobExitStatus(executionId);
+ if (! "COMPLETED".equals(jobBatchStatus)) {
+ System.out.println("Will sleep for " + sec + " more seconds...: " + jobBatchStatus);
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
+ }
stat.addStatus("batch-two-steps-stateless", ("COMPLETED".equals(jobBatchStatus) ? stat.PASS : stat.FAIL));
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("batch-two-steps-stateless", stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/descriptor/batch-jobs/TwoStepsJob.xml b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/descriptor/batch-jobs/TwoStepsJob.xml
index a85ba1e..bd7e081 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/descriptor/batch-jobs/TwoStepsJob.xml
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/descriptor/batch-jobs/TwoStepsJob.xml
@@ -20,16 +20,16 @@
<job id="two-steps-job" xmlns="http://batch.jsr352/jsl">
<step id="step1" next="step2">
<chunk item-count="1">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
<step id="step2">
<chunk item-count="2">
- <reader ref="SimpleItemReader"></reader>
+ <reader ref="SimpleItemReader"></reader>
<processor ref="SimpleItemProcessor"></processor>
- <writer ref="SimpleItemWriter"></writer>
+ <writer ref="SimpleItemWriter"></writer>
</chunk>
</step>
</job>
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/IdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/IdGenerator.java
index 16b06ff..c2981bd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/IdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/IdGenerator.java
@@ -21,5 +21,5 @@
public interface IdGenerator {
public String nextId();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleIdGenerator.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleIdGenerator.java
index 9dc4790..a58c494 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleIdGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleIdGenerator.java
@@ -22,9 +22,9 @@
*/
public class SimpleIdGenerator
implements IdGenerator {
-
+
private AtomicInteger counter = new AtomicInteger(0);
-
+
public String nextId() {
return "" + counter.incrementAndGet();
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
index 21f42b5..42a76b1 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
@@ -23,11 +23,11 @@
// @Inject
// IdGenerator idGen;
-
+
@Override
public String processItem(String t) throws Exception {
String[] record = t.split(", ");
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
int salary = Integer.valueOf(record[2]);
double tax = Double.valueOf(record[3]);
@@ -38,5 +38,5 @@
sb.append(", ").append(salary - (salary * tax / 100) - (salary * mediCare / 100));
return sb.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
index 6a4e688..bcff061 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
@@ -21,7 +21,7 @@
extends jakarta.batch.api.AbstractItemReader<String> {
private int index = 0;
-
+
//EMP-ID, MONTH-YEAR, SALARY, TAX%, MEDICARE%, OTHER
private String[] items = new String[] {
"120-01, JAN-2013, 8000, 27, 3, 0",
@@ -33,7 +33,7 @@
"120-07, JAN-2013, 11000, 36, 5, 0",
"120-08, JAN-2013, 11500, 36, 5, 0",
};
-
+
@Override
public void open(Externalizable e) throws Exception {
}
@@ -51,5 +51,5 @@
public Externalizable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
index ef14792..88b237f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
@@ -19,7 +19,7 @@
@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
extends jakarta.batch.api.AbstractItemWriter<String> {
-
+
@Override
public void open(Externalizable e) throws Exception {
}
@@ -41,5 +41,5 @@
public Externalizable checkpointInfo() throws Exception {
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
index b96ce96..e837e02 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
@@ -33,32 +33,32 @@
}
public long submitJob() {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
- Properties props = new Properties();
- for (int i=0; i<9; i++)
- props.put("Param-For-TwoSteps-Job-" + i, "Value-" + i);
- return jobOperator.start("TwoStepsJob", props);
+ Properties props = new Properties();
+ for (int i=0; i<9; i++)
+ props.put("Param-For-TwoSteps-Job-" + i, "Value-" + i);
+ return jobOperator.start("TwoStepsJob", props);
} catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ throw new RuntimeException(ex);
+ }
}
public String getJobExitStatus(long executionId) {
- try {
- JobOperator jobOperator = BatchRuntime.getJobOperator();
- JobExecution je = jobOperator.getJobExecution(executionId);
- return je.getExitStatus();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
+ try {
+ JobOperator jobOperator = BatchRuntime.getJobOperator();
+ JobExecution je = jobOperator.getJobExecution(executionId);
+ return je.getExitStatus();
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
-
+
}
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);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/cluster/test-bigcluster.sh b/appserver/tests/appserv-tests/devtests/cluster/test-bigcluster.sh
index 444ad44..eb987b2 100755
--- a/appserver/tests/appserv-tests/devtests/cluster/test-bigcluster.sh
+++ b/appserver/tests/appserv-tests/devtests/cluster/test-bigcluster.sh
@@ -49,9 +49,9 @@
$1 ~ /servers.server..*.system-property.HTTP_LISTENER_PORT.value/ { port[$1] = $2 }
$1 ~ /servers\.server\.[^.]*\.name$/ { iname[$2] = $2 }
$1 ~ /servers\.server\.[^.]*\.config-ref$/ { cname[$1] = $2 }
- END {
+ END {
ck = "configs.config.ch1-config.system-property.HTTP_LISTENER_PORT.value";
- for (i in iname) {
+ for (i in iname) {
if (i == "server") continue;
if (cname["servers.server." i ".config-ref"] != "ch1-config") continue;
k = "servers.server." i ".system-property.HTTP_LISTENER_PORT.value";
@@ -61,7 +61,7 @@
printf "http://%s:%s/%s\n", host[hk], port[k], ENVIRON["url"]
}
}' |
- xargs -t -n 1 -P 0 wget -q --no-proxy -P $TESTHOME/logs/$id -x
+ xargs -t -n 1 -P 0 wget -q --no-proxy -P $TESTHOME/logs/$id -x
}
bench() {
@@ -86,7 +86,7 @@
bench stop-domain $DOMAIN
bench start-domain $DOMAIN
bench restart-domain $DOMAIN
- grep 'time to parse domain.xml' $GFHOME/glassfish/domains/$DOMAIN/logs/server.log |
+ grep 'time to parse domain.xml' $GFHOME/glassfish/domains/$DOMAIN/logs/server.log |
sed -e 's/^.*Total //' -e 's/|#]//' | tail -1
echo 'size of domain.xml: ' `ls -l $GFHOME/glassfish/domains/$DOMAIN/config/domain.xml | awk '{ print $5 }'`
PIDFILE=$TESTHOME/glassfish6/glassfish/domains/domain1/config/pid
@@ -102,7 +102,7 @@
time asadmin deploy --target ch1 --name hello1 $TESTHOME/apps/helloworld-${sz}.war
echo "starting instances"
time asadmin start-cluster ch1
- benchmark_commands
+ benchmark_commands
echo "undeploying app from running cluster"
time asadmin undeploy --target ch1 hello1
echo "deploying $sz app to running cluster"
@@ -132,7 +132,7 @@
echo "create-node-config --nodehost h${c}_${i} n${c}_${i}"
echo "create-instance --cluster c$c --node n${c}_${i} i${c}_${i}"
done
- done | asadmin
+ done | asadmin
}
create_hosted_clusters() {
@@ -159,7 +159,7 @@
done
done
#echo "set configs.config.ch$c-config.dynamic-reconfiguration-enabled=true"
- done | asadmin
+ done | asadmin
}
create_local_clusters() {
@@ -192,7 +192,7 @@
create_hosted_nodes() {
echo Creating SSH nodes from the hosted_nodes file for domain $DOMAIN...
grep -v '^#' $TESTHOME/hosted-nodes |
- awk '{ printf "create-node-ssh --nodehost %s --installdir '$INSTALL_LOC'/glassfish6 --sshuser %s n-ssh-'$DOMAIN'-%d\n", $2, $1, ++n }' |
+ awk '{ printf "create-node-ssh --nodehost %s --installdir '$INSTALL_LOC'/glassfish6 --sshuser %s n-ssh-'$DOMAIN'-%d\n", $2, $1, ++n }' |
asadmin
asadmin list-nodes
}
@@ -212,7 +212,7 @@
delete_hosted_nodes() {
echo Deleting SSH nodes...
asadmin --terse list-nodes | egrep -v '^[ \t]*$' | grep n-ssh- |
- xargs -n 1 echo delete-node-ssh |
+ xargs -n 1 echo delete-node-ssh |
asadmin || return 1
}
@@ -239,7 +239,7 @@
echo Deploying an app to all clusters and instances...
asadmin deploy --name $name $file
asadmin --terse list-clusters | egrep -v '^[ \t]*$' | awk '{print $1}' |
- while read cname
+ while read cname
do
echo "create-application-ref --target $cname $name"
done | asadmin || return 1
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/build.xml
index e56cff3..a165eae 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/build.xml
@@ -38,7 +38,7 @@
</target>
<target name="usage">
- <antcall target="usage-common"/>
+ <antcall target="usage-common"/>
</target>
<target name="clean" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
index e7a62e6..218ae00 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
-<property name="appname" value="${module}-embedded-cci"/>
+<property name="appname" value="${module}-embedded-cci"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="db.type" value="pointbase"/>
@@ -29,5 +29,5 @@
<property name="sun-cmp-dbschema" value="descriptor/sec_bankadmin_schema.dbschema"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="rarname" value="cciblackbox-tx"/>
+<property name="rarname" value="cciblackbox-tx"/> \u0020
<property name="jdbc.drivers" value="com.pointbase.jdbc.jdbcUniversalDriver"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
index e932893..a766986 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&testProperties;
&run;
-
+
<target name="all" depends="build,setup,deploy,run,undeploy,unsetup"/>
<target name="run-test" depends="build,deploy,run,undeploy"/>
@@ -80,7 +80,7 @@
</target>
<!--
- Custom target for compilation with local libraries for connector
+ Custom target for compilation with local libraries for connector
-->
<target name="compile-cci" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
@@ -96,7 +96,7 @@
</target>
<target name="build">
- <antcall target="build-embedded-ear"/>
+ <antcall target="build-embedded-ear"/>
</target>
<target name="package-embedded-ejb">
@@ -124,9 +124,9 @@
<mkdir dir="${assemble.dir}"/>
<copy file="descriptor/application.xml" tofile="${assemble.dir}/application.xml"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <antcall target="package-embedded-ejb"/>
- <antcall target="package-embedded-client"/>
- <antcall target="package-rar"/>
+ <antcall target="package-embedded-ejb"/>
+ <antcall target="package-embedded-client"/>
+ <antcall target="package-rar"/>
<ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${assemble.dir}/application.xml">
<fileset dir="${assemble.dir}">
@@ -139,30 +139,30 @@
</target>
<target name="deploy" depends="init-common">
- <antcall target="deploy-common"/>
+ <antcall target="deploy-common"/>
<!--
- <antcall target="create-pool">
+ <antcall target="create-pool">
<param name="tx.mode" value="tx"/>
</antcall>
<antcall target="create-resource">
<param name="tx.mode" value="tx"/>
</antcall>
- -->
+ -->
</target>
<target name="undeploy">
<!--
- <antcall target="delete-resource"/>
+ <antcall target="delete-resource"/>
<antcall target="delete-pool"/>
- -->
- <antcall target="undeploy-common"/>
+ -->
+ <antcall target="undeploy-common"/>
</target>
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="Embedded"/>
- </antcall>
+ <target name="run" depends="init-common">
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="Embedded"/>
+ </antcall>
</target>
<target name="usage">
@@ -209,10 +209,10 @@
</target>
<target name="create-rar">
- <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
- <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
- <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
+ <copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
+ <copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
+ <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
+ <replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
</target>
<target name="package-rar" depends="init-common">
@@ -262,5 +262,5 @@
</exec>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/client/CoffeeClient.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/client/CoffeeClient.java
index d35a7b8..cf964c7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/client/CoffeeClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/client/CoffeeClient.java
@@ -30,17 +30,17 @@
String testId = "J2EE Connectors : Embedded Adapter Tests";
try {
- if (args.length == 1) {
- testId = args[0];
- }
+ if (args.length == 1) {
+ testId = args[0];
+ }
System.err.println(testId + " : CoffeeClient started in main...");
- stat.addDescription("J2EE Connectors 1.5: Embedded CCI Adapter tests");
+ stat.addDescription("J2EE Connectors 1.5: Embedded CCI Adapter tests");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCoffee");
- CoffeeRemoteHome home =
- (CoffeeRemoteHome)PortableRemoteObject.narrow(objref,
+ CoffeeRemoteHome home =
+ (CoffeeRemoteHome)PortableRemoteObject.narrow(objref,
CoffeeRemoteHome.class);
CoffeeRemote coffee = home.create();
@@ -55,23 +55,23 @@
int newCount = coffee.getCoffeeCount();
System.err.println("Coffee count = " + newCount);
- if (count==(newCount-3)) {
- stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.PASS);
- }else{
- stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.FAIL);
- }
+ if (count==(newCount-3)) {
+ stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.PASS);
+ }else{
+ stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.FAIL);
+ }
} catch (Exception ex) {
System.err.println("Caught an unexpected exception!");
- stat.addStatus("Connector:CCI Connector " + testId + " rar Test status:",stat.FAIL);
+ stat.addStatus("Connector:CCI Connector " + testId + " rar Test status:",stat.FAIL);
ex.printStackTrace();
}finally{
- //print test summary
- stat.printSummary(testId);
+ //print test summary
+ stat.printSummary(testId);
}
- }
+ }
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
index b4ccb7c..9654d7c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -60,7 +60,7 @@
IndexedRecord iRec = rf.createIndexedRecord("InputRecord");
Record oRec = ix.execute(iSpec, iRec);
Iterator iterator = ((IndexedRecord)oRec).iterator();
- while(iterator.hasNext()) {
+ while(iterator.hasNext()) {
Object obj = iterator.next();
if(obj instanceof Integer) {
count = ((Integer)obj).intValue();
@@ -99,11 +99,11 @@
private Connection getCCIConnection() {
Connection con = null;
- System.out.println("<========== IN get cci Connection ===========>");
+ System.out.println("<========== IN get cci Connection ===========>");
try {
ConnectionSpec spec = new CciConnectionSpec("DBUSER", "DBPASSWORD");
- System.out.println("<========== Created ISpec ===========>");
- System.out.println("CF value : " + cf);
+ System.out.println("<========== Created ISpec ===========>");
+ System.out.println("CF value : " + cf);
con = cf.getConnection(spec);
} catch (ResourceException ex) {
ex.printStackTrace();
@@ -123,4 +123,4 @@
public void ejbActivate() {}
public void ejbPassivate() {}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
index fa86556..0d75142 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
-<property name="appname" value="connector-cci"/>
+<property name="appname" value="connector-cci"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="db.type" value="pointbase"/>
@@ -29,5 +29,5 @@
<property name="sun-cmp-dbschema" value="descriptor/sec_bankadmin_schema.dbschema"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="rarname" value="cciblackbox-tx"/>
+<property name="rarname" value="cciblackbox-tx"/> \u0020
<property name="jdbc.drivers" value="com.pointbase.jdbc.jdbcUniversalDriver"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
index b914b9f..a22aa43 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
@@ -105,7 +105,7 @@
</target>
<target name="undeploy">
-<!--
+<!--
<antcall target="delete-resource"/>
<antcall target="delete-pool"/>
-->
@@ -119,10 +119,10 @@
<antcall target="undeploy-common"/>
</target>
-<target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="standalone"/>
- </antcall>
+<target name="run" depends="init-common">
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="standalone"/>
+ </antcall>
</target>
<!-- setup -->
@@ -139,7 +139,7 @@
<target name="create-pool">
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="cciblackbox-${tx.mode}"/>
- <param name="connection.defname"
+ <param name="connection.defname"
value="jakarta.resource.cci.ConnectionFactory"/>
<param name="connector.conpool.name" value="CCI-CONNPOOL"/>
</antcall>
@@ -181,7 +181,7 @@
<!-- create the appclient jar file with custom classes-->
<target name="appclient-jar" depends="init-common">
- <property name="appclientjar.classes"
+ <property name="appclientjar.classes"
value="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Client*.class"/>
<antcall target="package-appclientjar-common">
<param name="appclientjar.files"
@@ -215,13 +215,13 @@
</target>
<target name="create-rar">
- <copy file="descriptor/ra.xml"
+ <copy file="descriptor/ra.xml"
tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
<copy file="descriptor/sun-ra.xml"
- tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar"
+ tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
+ <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar"
tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
- <replace file="${assemble.dir}/rar/META-INF/ra.xml"
+ <replace file="${assemble.dir}/rar/META-INF/ra.xml"
token="DBURL" value="${db.url}"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/client/CoffeeClient.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/client/CoffeeClient.java
index d8c26a3..faa0c0e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/client/CoffeeClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/client/CoffeeClient.java
@@ -30,17 +30,17 @@
String testId = "J2EE Connectors 1.5 : Standalone adapter tests";
try {
- if (args.length == 1) {
- testId = args[0];
- }
+ if (args.length == 1) {
+ testId = args[0];
+ }
System.err.println(testId + " : CoffeeClient started in main...");
- stat.addDescription("J2EE Connectors 1.5 : Standalone CCI adapter Tests");
+ stat.addDescription("J2EE Connectors 1.5 : Standalone CCI adapter Tests");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCoffee");
- CoffeeRemoteHome home =
- (CoffeeRemoteHome)PortableRemoteObject.narrow(objref,
+ CoffeeRemoteHome home =
+ (CoffeeRemoteHome)PortableRemoteObject.narrow(objref,
CoffeeRemoteHome.class);
CoffeeRemote coffee = home.create();
@@ -55,22 +55,22 @@
int newCount = coffee.getCoffeeCount();
System.err.println("Coffee count = " + newCount);
- if (count==(newCount-3)) {
- stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.PASS);
- }else{
- stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.FAIL);
- }
+ if (count==(newCount-3)) {
+ stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.PASS);
+ }else{
+ stat.addStatus("Connector:cci Connector " + testId + " rar Test status:",stat.FAIL);
+ }
- //print test summary
- stat.printSummary(testId);
+ //print test summary
+ stat.printSummary(testId);
} catch (Exception ex) {
System.err.println("Caught an unexpected exception!");
- stat.addStatus("Connector:CCI Connector " + testId + " rar Test status:",stat.FAIL);
+ stat.addStatus("Connector:CCI Connector " + testId + " rar Test status:",stat.FAIL);
ex.printStackTrace();
}
- }
+ }
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
index 2883589..ff1a85f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
@@ -60,7 +60,7 @@
IndexedRecord iRec = rf.createIndexedRecord("InputRecord");
Record oRec = ix.execute(iSpec, iRec);
Iterator iterator = ((IndexedRecord)oRec).iterator();
- while(iterator.hasNext()) {
+ while(iterator.hasNext()) {
Object obj = iterator.next();
if(obj instanceof Integer) {
count = ((Integer)obj).intValue();
@@ -99,11 +99,11 @@
private Connection getCCIConnection() {
Connection con = null;
- System.out.println("<========== IN get cci Connection ===========>");
+ System.out.println("<========== IN get cci Connection ===========>");
try {
ConnectionSpec spec = new CciConnectionSpec("DBUSER", "DBPASSWORD");
- System.out.println("<========== Created ISpec ===========>");
- System.out.println("CF value : " + cf);
+ System.out.println("<========== Created ISpec ===========>");
+ System.out.println("CF value : " + cf);
con = cf.getConnection(spec);
} catch (ResourceException ex) {
ex.printStackTrace();
@@ -123,4 +123,4 @@
public void ejbActivate() {}
public void ejbPassivate() {}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/build.xml b/appserver/tests/appserv-tests/devtests/connector/build.xml
index db12520..843673f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/build.xml
@@ -37,19 +37,19 @@
<target name="pe-all">
<antcall target="backup-config-pe"/>
- <echo message="NOTE: The file ${env.APS_HOME}/config.properties is being replaced with ${basedir}/config/pe-config.properties. The file will be reverted to its original state after the completion of these tests."/>
- <copy file="${basedir}/config/pe-config.properties" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
- <antcall target="create-pe-passwordfile"/>
- <antcall target="all"/>
+ <echo message="NOTE: The file ${env.APS_HOME}/config.properties is being replaced with ${basedir}/config/pe-config.properties. The file will be reverted to its original state after the completion of these tests."/>
+ <copy file="${basedir}/config/pe-config.properties" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
+ <antcall target="create-pe-passwordfile"/>
+ <antcall target="all"/>
<antcall target="restore-config-pe"/>
</target>
-
+
<target name="das-all">
<antcall target="backup-config-pe"/>
<echo message="NOTE: The file ${env.APS_HOME}/config.properties is being replaced with ${basedir}/config/das-config.properties. The file will be reverted to its original state after the completion of these tests."/>
- <copy file="${basedir}/config/das-config.properties" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
- <antcall target="create-ee-passwordfile"/>
- <antcall target="all"/>
+ <copy file="${basedir}/config/das-config.properties" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
+ <antcall target="create-ee-passwordfile"/>
+ <antcall target="all"/>
<antcall target="restore-config-pe"/>
</target>
@@ -57,58 +57,58 @@
<antcall target="backup-config-pe"/>
<antcall target="backup-config-ee"/>
<echo message="NOTE: The file ${env.APS_HOME}/config.properties is being replaced with ${basedir}/config/das-config.properties. The file will be reverted to its original state after the completion of these tests."/>
- <copy file="${basedir}/config/ee-config.properties" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
- <copy file="${basedir}/config/ee-config.properties" tofile="${env.APS_HOME}/eeconfig/ee-config.properties" overwrite="true"/>
- <antcall target="create-ee-passwordfile"/>
- <antcall target="ee"/>
- <antcall target="all"/>
+ <copy file="${basedir}/config/ee-config.properties" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
+ <copy file="${basedir}/config/ee-config.properties" tofile="${env.APS_HOME}/eeconfig/ee-config.properties" overwrite="true"/>
+ <antcall target="create-ee-passwordfile"/>
+ <antcall target="ee"/>
+ <antcall target="all"/>
<antcall target="restore-config-pe"/>
<antcall target="restore-config-ee"/>
</target>
<target name="backup-config-pe" depends="replace-password-with-passwordfile">
- <copy file="${env.APS_HOME}/config.properties" tofile="${env.APS_HOME}/config.properties.bak" overwrite="true"/>
+ <copy file="${env.APS_HOME}/config.properties" tofile="${env.APS_HOME}/config.properties.bak" overwrite="true"/>
</target>
<target name="restore-config-pe" depends="undo-replace-password-with-passwordfile">
- <copy file="${env.APS_HOME}/config.properties.bak" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
+ <copy file="${env.APS_HOME}/config.properties.bak" tofile="${env.APS_HOME}/config.properties" overwrite="true"/>
</target>
-
+
<target name="backup-config-ee">
- <copy file="${env.APS_HOME}/eeconfig/ee-config.properties" tofile="${env.APS_HOME}/eeconfig/ee-config.properties.bak" overwrite="true"/>
+ <copy file="${env.APS_HOME}/eeconfig/ee-config.properties" tofile="${env.APS_HOME}/eeconfig/ee-config.properties.bak" overwrite="true"/>
</target>
<target name="restore-config-ee">
- <copy file="${env.APS_HOME}/eeconfig/ee-config.properties.bak" tofile="${env.APS_HOME}/eeconfig/ee-config.properties" overwrite="true"/>
+ <copy file="${env.APS_HOME}/eeconfig/ee-config.properties.bak" tofile="${env.APS_HOME}/eeconfig/ee-config.properties" overwrite="true"/>
</target>
-
+
<target name="create-pe-passwordfile">
- <property file="${env.APS_HOME}/config.properties"/>
- <echo message="AS_ADMIN_PASSWORD=${admin.password}${line.separator}" file="${env.APS_HOME}/devtests/connector/config/password.txt"/>
+ <property file="${env.APS_HOME}/config.properties"/>
+ <echo message="AS_ADMIN_PASSWORD=${admin.password}${line.separator}" file="${env.APS_HOME}/devtests/connector/config/password.txt"/>
</target>
<target name="create-ee-passwordfile">
- <property file="${env.APS_HOME}/config.properties"/>
- <echo message="AS_ADMIN_PASSWORD=${admin.password}${line.separator}" file="${env.APS_HOME}/devtests/connector/config/password.txt"/>
- <echo message="AS_ADMIN_MASTERPASSWORD=${master.password}${line.separator}" file="${env.APS_HOME}/devtests/connector/config/password.txt" append="true"/>
+ <property file="${env.APS_HOME}/config.properties"/>
+ <echo message="AS_ADMIN_PASSWORD=${admin.password}${line.separator}" file="${env.APS_HOME}/devtests/connector/config/password.txt"/>
+ <echo message="AS_ADMIN_MASTERPASSWORD=${master.password}${line.separator}" file="${env.APS_HOME}/devtests/connector/config/password.txt" append="true"/>
</target>
-
+
<target name="replace-password-with-passwordfile">
- <replace dir="${env.APS_HOME}/config/">
+ <replace dir="${env.APS_HOME}/config/">
<include name="**/*.xml"/>
- <replacetoken>--password ${admin.password}</replacetoken>
- <replacevalue>--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt</replacevalue>
- </replace>
+ <replacetoken>--password ${admin.password}</replacetoken>
+ <replacevalue>--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt</replacevalue>
+ </replace>
</target>
<target name="undo-replace-password-with-passwordfile">
- <replace dir="${env.APS_HOME}/config/">
+ <replace dir="${env.APS_HOME}/config/">
<include name="**/*.xml"/>
- <replacetoken>--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt</replacetoken>
- <replacevalue>--password ${admin.password}</replacevalue>
- </replace>
+ <replacetoken>--passwordfile ${env.APS_HOME}/devtests/connector/config/password.txt</replacetoken>
+ <replacevalue>--password ${admin.password}</replacevalue>
+ </replace>
</target>
-
+
<target name="run-test">
<antcall target="connector">
<param name="connector-target" value="run-test"/>
@@ -168,57 +168,57 @@
<target name="connector">
<record name="connector.output" action="start" />
- <echo message="@@## connector1.5 ##@@"/>
+ <echo message="@@## connector1.5 ##@@"/>
<ant dir="connector1.5" target="${connector-target}"/>
- <echo message="@@## embeddedConnector1.5 ##@@"/>
+ <echo message="@@## embeddedConnector1.5 ##@@"/>
<ant dir="embeddedConnector1.5" target="${connector-target}"/>
- <echo message="@@## embeddedweb ##@@"/>
+ <echo message="@@## embeddedweb ##@@"/>
<ant dir="embeddedweb" target="${connector-target}"/>
<echo message="@@## mq ##@@"/>
<ant dir="mq" target="${connector-target}"/>
- <echo message="@@## nonacc ##@@"/>
+ <echo message="@@## nonacc ##@@"/>
<ant dir="nonacc" target="${connector-target}"/>
-<!-- Commented out the defaultConnectorResource test because we cannot
+<!-- Commented out the defaultConnectorResource test because we cannot
add a non-XA Resource [a database connection in this case] to a global JTS transaction containing
-a XA resource, [a JMS resource in this case]. This test was passing due to a
-JTS bug, that allowed a non-XA resource enlistment after a XA-Resource enlistment in
+a XA resource, [a JMS resource in this case]. This test was passing due to a
+JTS bug, that allowed a non-XA resource enlistment after a XA-Resource enlistment in
a global transaction!
- <ant dir="defaultConnectorResource" target="${connector-target}"/>
+ <ant dir="defaultConnectorResource" target="${connector-target}"/>
-->
<!-- running web2connector twice -->
- <echo message="@@## web2connector ##@@"/>
- <ant dir="web2connector" target="${connector-target}" />
- <echo message="@@## web2connector (second time) ##@@"/>
+ <echo message="@@## web2connector ##@@"/>
+ <ant dir="web2connector" target="${connector-target}" />
+ <echo message="@@## web2connector (second time) ##@@"/>
<ant dir="web2connector" target="${connector-target}" />
<!-- this test is disabled because of dependency on point base database jar which is not available -->
- <!--echo message="@@## redeployRar ##@@"/>
+ <!--echo message="@@## redeployRar ##@@"/>
<ant dir="redeployRar" target="${connector-target}" /-->
- <echo message="@@## nonstringmcfproperties ##@@"/>
+ <echo message="@@## nonstringmcfproperties ##@@"/>
<ant dir="nonstringmcfproperties" target="${connector-target}" />
- <echo message="@@## nonstringraproperties ##@@"/>
+ <echo message="@@## nonstringraproperties ##@@"/>
<ant dir="nonstringraproperties" target="${connector-target}" />
- <echo message="@@## txlevelswitch ##@@"/>
+ <echo message="@@## txlevelswitch ##@@"/>
<ant dir="txlevelswitch" target="${connector-target}" />
- <echo message="@@## threadpool ##@@"/>
+ <echo message="@@## threadpool ##@@"/>
<ant dir="threadpool" target="${connector-target}" />
<record name="connector.output" action="stop" />
</target>
<target name="usage">
- <echo> Usage:
- ant connector1.5 (Executes the connector1.5 tests)
- ant embdeddedWeb (Executes embeddedWeb tests)
- ant mq (Executes the mq tests)
- ant nonacc (Executes the nonacc test)
- ant all (Executes all the connector tests)
- ant clean (cleans all the connector tests)
- ant build (builds all the connector tests)
- ant setup (sets up all resources for connector tests)
- ant deploy (deploys all the connector apps)
- ant run (Executes all the connector tests)
- ant undeploy (undeploys all the connector apps)
- ant unsetup (unsets all resources for connector tests)
- </echo>
+ <echo> Usage:
+ ant connector1.5 (Executes the connector1.5 tests)
+ ant embdeddedWeb (Executes embeddedWeb tests)
+ ant mq (Executes the mq tests)
+ ant nonacc (Executes the nonacc test)
+ ant all (Executes all the connector tests)
+ ant clean (cleans all the connector tests)
+ ant build (builds all the connector tests)
+ ant setup (sets up all resources for connector tests)
+ ant deploy (deploys all the connector apps)
+ ant run (Executes all the connector tests)
+ ant undeploy (undeploys all the connector apps)
+ ant unsetup (unsets all resources for connector tests)
+ </echo>
</target>
<target name="oracle">
diff --git a/appserver/tests/appserv-tests/devtests/connector/config/database.xml b/appserver/tests/appserv-tests/devtests/connector/config/database.xml
index c2c881d..b363832 100644
--- a/appserver/tests/appserv-tests/devtests/connector/config/database.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/config/database.xml
@@ -28,15 +28,15 @@
<!--
<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"/>
@@ -49,12 +49,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" />
@@ -96,15 +96,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/connector/connector1.5-resourcesxml-module-scope/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/build.xml
index 426ecdd..3548b93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/build.xml
@@ -36,18 +36,18 @@
<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="glassfish-resources-ear.xml" value="META-INF/glassfish-resources.xml"/>
+ <param name="appname" value="simplemdb"/>
+ <param name="application.xml" value="META-INF/application.xml"/>
+ <param name="glassfish-resources-ear.xml" value="META-INF/glassfish-resources.xml"/>
</antcall>
</target>
<target name="setupJdbc" depends="init-common">
<!--
<antcall target="create-jdbc-conpool-connector">
- <param name="db.class" value="com.sun.sql.jdbcx.oracle.OracleDataSource"/>
+ <param name="db.class" value="com.sun.sql.jdbcx.oracle.OracleDataSource"/>
<param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
</antcall>
<antcall target="create-jdbc-resource-common">
@@ -57,7 +57,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/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/ejb-jar.xml
index 4bdcc6f..323c0ec 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/sun-ejb-jar.xml
index 2d82ad3..1003566 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:module/eis/testAdmin</jndi-name>
+ <jndi-name>java:module/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
index bc0c9ee..6e1cf48 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
@@ -43,7 +43,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
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,18 +124,18 @@
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();
}
/*try{
-
+
Context ic = new InitialContext();
Object ds = ic.lookup("java:module/jdbc/module-level-resource");
System.out.println("java:module/jdbc/module-level-resource : " + ds);
@@ -173,7 +173,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -184,7 +184,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/client/Client.java
index 05c4265..ec77ce5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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(" Connector 1.5 test - " + testCount, stat.FAIL);
} else {
stat.addStatus(" Connector 1.5 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("simplemdb");
-
+
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/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
index 54e77ea..6b12904 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
@@ -30,41 +30,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -75,7 +75,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -91,10 +91,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() {}
@@ -104,63 +104,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:app/jdbc/XAPointbase");
//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:app/jdbc/XAPointbase");
//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:app/jdbc/XAPointbase");
//debug("Looked up Datasource\n");
@@ -171,7 +171,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -180,9 +180,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
@@ -198,9 +198,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();
@@ -213,9 +213,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/connector/connector1.5-resourcesxml-module-scope/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/build.xml
index 8b0380e..a068e1c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/build.xml
@@ -62,7 +62,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/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/build.xml
index 2b77489..783991d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/DeliveryWork.java
index 1f59b98..652d68b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/DeliveryWork.java
@@ -28,7 +28,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
@@ -37,7 +37,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;
@@ -45,7 +45,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;
@@ -56,7 +56,7 @@
public void run() {
debug("ENTER...");
-
+
try {
//Method onMessage = getOnMessageMethod();
//ep.beforeDelivery(onMessage);
@@ -79,11 +79,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -94,14 +94,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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/MyAdminObject.java
index 10483ed..1d02c62 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/MyAdminObject.java
@@ -38,13 +38,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/SimpleResourceAdapterImpl.java
index 6e5353f..3df7070 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/TestWMWork.java
index bb05534..de93bc1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/WorkDispatcher.java
index aec89be..75d7530 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/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();
}
@@ -246,7 +246,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -261,14 +261,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();
}
@@ -291,13 +291,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;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/XID.java
index 0cb77b2..2bea121 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/src/connector/XID.java
@@ -31,8 +31,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++;
@@ -50,10 +50,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;
@@ -93,7 +93,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/build.xml
index ddd053e..f04f097 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/build.xml
@@ -36,18 +36,18 @@
<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="glassfish-resources-ear.xml" value="src/META-INF/glassfish-resources.xml"/>
+ <param name="appname" value="simplemdb"/>
+ <param name="application.xml" value="META-INF/application.xml"/>
+ <param name="glassfish-resources-ear.xml" value="src/META-INF/glassfish-resources.xml"/>
</antcall>
</target>
<target name="setupJdbc" depends="init-common">
<!--
<antcall target="create-jdbc-conpool-connector">
- <param name="db.class" value="com.sun.sql.jdbcx.oracle.OracleDataSource"/>
+ <param name="db.class" value="com.sun.sql.jdbcx.oracle.OracleDataSource"/>
<param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
</antcall>
<antcall target="create-jdbc-resource-common">
@@ -57,7 +57,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/connector/connector1.5-resourcesxml/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/META-INF/ejb-jar.xml
index 4bdcc6f..323c0ec 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml
index e46577f..cb8cd23 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:app/eis/testAdmin</jndi-name>
+ <jndi-name>java:app/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
index 7d78c41..824e036 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
@@ -43,7 +43,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
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,18 +124,18 @@
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:app/eis/testAdmin");
- System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
- Controls.initialize();
- System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls = (MyAdminObject) ic.lookup("java:app/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
/*
try{
-
+
Context ic = new InitialContext();
Object ds = ic.lookup("java:app/jdbc/app-level-resource");
System.out.println("java:app/jdbc/app-level-resource : " + ds);
@@ -173,7 +173,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -184,7 +184,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/client/Client.java
index 05c4265..ec77ce5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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(" Connector 1.5 test - " + testCount, stat.FAIL);
} else {
stat.addStatus(" Connector 1.5 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("simplemdb");
-
+
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/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
index ea919dc..cbd7094 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,63 +103,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:app/jdbc/XAPointbase");
//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:app/jdbc/XAPointbase");
//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:app/jdbc/XAPointbase");
//debug("Looked up Datasource\n");
@@ -170,7 +170,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -179,9 +179,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
@@ -197,9 +197,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();
@@ -212,9 +212,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/connector/connector1.5-resourcesxml/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/build.xml
index 8b0380e..a068e1c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/build.xml
@@ -62,7 +62,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/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/build.xml
index 2b77489..783991d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/MyAdminObject.java
index 10483ed..1d02c62 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/MyAdminObject.java
@@ -38,13 +38,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/connector1.5-resourcesxml/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/SimpleResourceAdapterImpl.java
index 6e5353f..3df7070 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/TestWMWork.java
index bb05534..de93bc1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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/connector/connector1.5-resourcesxml/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/WorkDispatcher.java
index aec89be..75d7530 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/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();
}
@@ -246,7 +246,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -261,14 +261,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();
}
@@ -291,13 +291,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;
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/XID.java
index 0cb77b2..2bea121 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/src/connector/XID.java
@@ -31,8 +31,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++;
@@ -50,10 +50,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;
@@ -93,7 +93,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/build.xml
index cd0d193..67b9828 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/build.xml
@@ -36,16 +36,16 @@
<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>
<target name="setupJdbc" depends="init-common">
<antcall target="create-jdbc-conpool-connector">
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
<param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
</antcall>
<antcall target="create-jdbc-resource-common">
@@ -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/connector/connector1.5/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/META-INF/ejb-jar.xml
index 4bdcc6f..323c0ec 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/META-INF/sun-ejb-jar.xml
index 1146a5a..0a7e0da 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,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/connector/connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
index b50d7e4..5429ea9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -43,7 +43,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
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/connector/connector1.5/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/client/Client.java
index bbdecfa..24280d9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
index b7d443b..cd9f108 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,63 +103,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");
@@ -170,7 +170,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -179,9 +179,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
@@ -197,9 +197,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();
@@ -212,9 +212,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/connector/connector1.5/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/build.xml
index 32093c8..403d973 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/build.xml
index 2b77489..783991d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/MyAdminObject.java
index 862f9ff..d199d01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
index 6e5353f..3df7070 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/TestWMWork.java
index bb05534..de93bc1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/WorkDispatcher.java
index 34a604f..cd98c45 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/connector1.5/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/XID.java
index 4ed3087..1bb805d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/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/connector/embeddedConnector1.5-resourcesxml/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/META-INF/ejb-jar.xml
index 696dd3e..5a5210e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml
index 7d812d0..0d73a92 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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>java:app/eis/testAdmin</jndi-name>
+ <jndi-name>java:app/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
index b50d7e4..5429ea9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
@@ -43,7 +43,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
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/connector/embeddedConnector1.5-resourcesxml/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/client/Client.java
index cf25e7d..4e2536c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/client/Client.java
@@ -29,23 +29,23 @@
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...");
- int testCount = 1;
+ debug("doTest() ENTER...");
+ int testCount = 1;
try{
InitialContext ic = new InitialContext();
DataSource ds = (DataSource)ic.lookup("java:app/jdbc/XAPointbase");
@@ -54,7 +54,7 @@
}catch(Exception e){
stat.addStatus("ID Connector Embedded 1.5 test - " + testCount++, stat.FAIL);
System.out.println("Exception during lookup of java:app/jdbc/XAPointbase : " + e.getMessage());
- //e.printStackTrace();
+ //e.printStackTrace();
}
try{
InitialContext ic = new InitialContext();
@@ -64,7 +64,7 @@
}catch(Exception e){
stat.addStatus("ID Connector Embedded 1.5 test - " + testCount++, stat.FAIL);
System.out.println("Exception during lookup of java:app/jdbc/test-resource: " + e.getMessage());
- //e.printStackTrace();
+ //e.printStackTrace();
}
/* try{
InitialContext ic = new InitialContext();
@@ -79,13 +79,13 @@
try {
res = "ALL TESTS PASSED";
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";
@@ -93,11 +93,11 @@
break;
} else {
stat.addStatus("ID Connector Embedded 1.5 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount++;
+ testCount++;
}
} catch (Exception ex) {
@@ -118,14 +118,14 @@
stat.printSummary("connector1.5EmbeddedID");
-
+
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();
@@ -134,7 +134,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();
@@ -142,7 +142,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();
@@ -150,7 +150,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/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
index d1d78f2..d806951 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
@@ -30,41 +30,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -75,7 +75,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -91,10 +91,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() {}
@@ -104,63 +104,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");
@@ -171,7 +171,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -180,9 +180,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
@@ -198,9 +198,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();
@@ -213,9 +213,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/connector/embeddedConnector1.5-resourcesxml/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/build.xml
index 6c848a4..172b565 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/build.xml
@@ -52,7 +52,7 @@
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.classpath" value="${env.APS_HOME}/devtests/connector/embeddedConnector1.5-resourcesxml/ra/generic-ra.jar"/>
- <param name="appname" value="generic-embedded" />
+ <param name="appname" value="generic-embedded" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/build.xml
index 2b77489..783991d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/MyAdminObject.java
index 862f9ff..d199d01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/SimpleActivationSpec.java
index 946d987..bb7918e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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;
@@ -42,7 +42,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -51,7 +51,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -60,7 +60,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -76,7 +76,7 @@
this.resourceadapter = ra;
}
- public void validate() {}
+ public void validate() {}
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/SimpleResourceAdapterImpl.java
index 21e791d..1cf5ac1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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...");
}
@@ -204,12 +204,12 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -225,7 +225,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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/TestWMWork.java
index 7e585a3..9cd0663 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/WorkDispatcher.java
index 34a604f..cd98c45 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/XID.java
index 552873e..dc87bb4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/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/connector/embeddedConnector1.5/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/build.xml
index b3d7eb4..0d8f997 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/ejb-jar.xml
index 696dd3e..5a5210e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml
index f72ad79..6e0daee 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml
@@ -83,7 +83,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/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
index b50d7e4..5429ea9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
@@ -43,7 +43,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
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/connector/embeddedConnector1.5/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/client/Client.java
index 14c1693..30f6290 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/client/Client.java
@@ -28,34 +28,34 @@
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";
@@ -63,11 +63,11 @@
break;
} else {
stat.addStatus(" Embedded-Connector-1.5 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount++;
+ testCount++;
}
} catch (Exception ex) {
@@ -78,14 +78,14 @@
stat.printSummary("Embedded-Connector-1.5");
-
+
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();
@@ -94,7 +94,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();
@@ -102,7 +102,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();
@@ -110,7 +110,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/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
index b7d443b..cd9f108 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,63 +103,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");
@@ -170,7 +170,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -179,9 +179,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
@@ -197,9 +197,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();
@@ -212,9 +212,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/connector/embeddedConnector1.5/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/build.xml
index f9f0aee..861e7bb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/build.xml
index 2b77489..783991d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/MyAdminObject.java
index 862f9ff..d199d01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/SimpleActivationSpec.java
index 946d987..bb7918e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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;
@@ -42,7 +42,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -51,7 +51,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -60,7 +60,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -76,7 +76,7 @@
this.resourceadapter = ra;
}
- public void validate() {}
+ public void validate() {}
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
index 21e791d..1cf5ac1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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...");
}
@@ -204,12 +204,12 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -225,7 +225,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/connector/embeddedConnector1.5/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/TestWMWork.java
index 7e585a3..9cd0663 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/WorkDispatcher.java
index 34a604f..cd98c45 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedConnector1.5/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/XID.java
index 552873e..dc87bb4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/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/connector/embeddedweb-resourcesxml-defaultconnpool/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/META-INF/glassfish-resources.xml
index b03bbab..dae8cac 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/META-INF/glassfish-resources.xml
@@ -34,12 +34,12 @@
<property name="URL" value="jdbc:derby://localhost:1527/testdb;create=true;"/>
</connector-connection-pool>
-
+
<connector-resource jndi-name="jdbc/ejb-subclassing" pool-name="web-subclassingApp#jdbcra#javax.sql.DataSource"/>
<admin-object-resource jndi-name="eis/jdbcAdmin" res-type="com.sun.jdbcra.spi.JdbcSetupAdmin" res-adapter="web-subclassingApp#jdbcra">
<property name="TableName" value="customer2"/>
- <property name="JndiName" value="java:app/jdbc/ejb-subclassing"/>
+ <property name="JndiName" value="java:app/jdbc/ejb-subclassing"/>
<property name="SchemaName" value="DBUSER"/>
<property name="NoOfRows" value="1"/>
</admin-object-resource>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.xml
index 9e0cb6b..b99b43f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/build.xml
@@ -32,7 +32,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<!--
<target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -41,15 +41,15 @@
<target name="all" depends="build, setup, deploy-ear, run-ear, unsetup, undeploy-ear"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
@@ -57,12 +57,12 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
</antcall>
-
+
</target>
<target name="create-pool">
<antcall target="create-connector-connpool-common">
@@ -71,9 +71,9 @@
<param name="connector.conpool.name" value="embedded-ra-pool"/>
</antcall>
<antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
</target>
<target name="create-resource">
<antcall target="create-connector-resource-common">
@@ -86,18 +86,18 @@
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--antcall target="reconfig-common"/-->
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ <!--antcall target="reconfig-common"/-->
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -105,15 +105,15 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
<!--antcall target="reconfig-common"/-->
</target>
@@ -122,7 +122,7 @@
<param name="sql.file" value="sql/dropBankTables.sql"/>
</antcall>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -132,7 +132,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -148,9 +148,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -159,27 +159,27 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <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>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
@@ -187,9 +187,9 @@
<include name="META-INF/glassfish-resources.xml"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -197,27 +197,27 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<!-- <antcall target="delete-ra-config"/>-->
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/embeddedweb-resourcesxml-defaultconnpool/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/descriptor/sun-ejb-jar.xml
index 7995ce3..51f3bec 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>java:app/jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>java:app/jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
index 5922f31..3615e16 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
@@ -46,4 +46,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerChecking.java
index ff15e7e..89dc323 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerChecking.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
index 0520b60..07220db 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavings.java
index 2740692..c45a1c5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavings.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.properties
index ee2eca0..fd21c3d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.xml
index 3bb6c3f..fc54581 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
</classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index a956d97..11ad746 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/*
@@ -279,184 +279,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -506,162 +506,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 60e1e4e..65e8fb5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -122,136 +122,136 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>9092</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBUSER</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBPASSWORD</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DatabaseName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DataSourceName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>NetworkProtocol</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Delimiter</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
</config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 411b73f..d9874a0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,55 +68,55 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
setIsolation(mc);
isValid(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -127,409 +127,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -539,35 +539,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DataSource.java
index 2068430..739ff4d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,91 +114,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
index 8295007..35b6e5c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
@@ -17,17 +17,17 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import jakarta.ejb.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -43,14 +43,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -66,14 +66,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -90,7 +90,7 @@
customerSavings = customerSavingsHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -103,7 +103,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -115,7 +115,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -127,12 +127,12 @@
customerSavingsHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -142,7 +142,7 @@
customerSavings = (CustomerSavings)customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -151,7 +151,7 @@
customerChecking = (CustomerChecking)customerCheckingHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -211,9 +211,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
index 1dbf8d6..39ae042 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
@@ -32,7 +32,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<!--
<target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -41,15 +41,15 @@
<target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
@@ -57,7 +57,7 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
@@ -65,7 +65,7 @@
<antcall target="create-pool"/>
<antcall target="create-resource"/>
<antcall target="create-admin-object"/>
-
+
</target>
<target name="create-pool">
<antcall target="create-connector-connpool-common">
@@ -74,9 +74,9 @@
<param name="connector.conpool.name" value="embedded-ra-pool"/>
</antcall>
<antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
</target>
<target name="create-resource">
<antcall target="create-connector-resource-common">
@@ -89,17 +89,17 @@
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- </target>
-
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ </target>
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -107,16 +107,16 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- </target>
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
+ </target>
<target name="unsetup">
<antcall target="execute-sql-connector">
@@ -127,7 +127,7 @@
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -137,7 +137,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -153,9 +153,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -164,34 +164,34 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="create-ra-config"/>
<antcall target="deploy-common"/>
@@ -200,27 +200,27 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/embeddedweb/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/sun-ejb-jar.xml
index 1d1200d..df4bb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
index 5922f31..3615e16 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
@@ -46,4 +46,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerChecking.java
index ff15e7e..89dc323 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerChecking.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
index 0520b60..07220db 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavings.java
index 2740692..c45a1c5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavings.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties
index ee2eca0..fd21c3d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml
index cb66a45..3aceef2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
failonerror="true">
<classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
</classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index 4632ae1..b4fd124 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,404 +53,404 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
-
+
/**
* Retrieves the the first warning reported by calls on the underlying
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
@Override
@@ -536,141 +536,141 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
-
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 60e1e4e..65e8fb5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -122,136 +122,136 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>9092</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBUSER</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBPASSWORD</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DatabaseName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DataSourceName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>NetworkProtocol</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Delimiter</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
</config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 411b73f..d9874a0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,55 +68,55 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
setIsolation(mc);
isValid(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -127,409 +127,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -539,35 +539,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
index 219a365..4bf8b7b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,22 +114,22 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
@Override
@@ -140,67 +140,67 @@
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
@Override
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
index ff76f00..882ada4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
@@ -17,17 +17,17 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import jakarta.ejb.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -43,14 +43,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -66,14 +66,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -90,7 +90,7 @@
customerSavings = customerSavingsHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -103,7 +103,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -115,7 +115,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -127,12 +127,12 @@
customerSavingsHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -142,7 +142,7 @@
customerSavings = (CustomerSavings)customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -151,7 +151,7 @@
customerChecking = (CustomerChecking)customerCheckingHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -211,9 +211,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/simpleBank.sql b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/simpleBank.sql
index 6ef75c3..e17aef4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/simpleBank.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/sql/simpleBank.sql
@@ -1,14 +1,14 @@
drop table customer2;
create table customer2 (
- SSN varchar2(9),
- lastNAme varchar2(20),
- firstname varchar2(20),
- address1 varchar2 (20),
- address2 varchar2(20),
- city varchar2(10),
- state varchar2(10),
- zipcode varchar2(5),
+ SSN varchar2(9),
+ lastNAme varchar2(20),
+ firstname varchar2(20),
+ address1 varchar2 (20),
+ address2 varchar2(20),
+ city varchar2(10),
+ state varchar2(10),
+ zipcode varchar2(5),
savingsbalance number(10) ,
checkingbalance number(10) );
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/build.properties
index af24daf..20bc85d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-markconnectionasbad.xa"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/client/Client.java
index e95a7d0..28dbfb5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/client/Client.java
@@ -117,14 +117,14 @@
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Write] : ", stat.FAIL);
}
- if (simpleBMP.test11() && getMonitorablePropertyOfConnectionPool("java:app/jdbc-shareable-pool") == 15 &&
+ if (simpleBMP.test11() && getMonitorablePropertyOfConnectionPool("java:app/jdbc-shareable-pool") == 15 &&
getMonitorablePropertyOfConnectionPool("java:app/jdbc-local-pool") == 3) {
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Read] : ", stat.PASS);
} else {
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Read] : ", stat.FAIL);
}
- if (simpleBMP.test12() && getMonitorablePropertyOfConnectionPool("java:app/jdbc-shareable-pool") == 16 &&
+ if (simpleBMP.test12() && getMonitorablePropertyOfConnectionPool("java:app/jdbc-shareable-pool") == 16 &&
getMonitorablePropertyOfConnectionPool("java:app/jdbc-local-pool") == 4) {
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Write-Read] : ", stat.PASS);
} else {
@@ -139,20 +139,20 @@
public int getMonitorablePropertyOfConnectionPool(String poolName) throws Exception {
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
// new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-mon,name=resources/" + poolName);
// new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-mon,name=applications/jdbc-markconnectionasbad.xaApp/resources/"+ poolName);
new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-mon,name=\"applications/jdbc-markconnectionasbad.xaApp/resources//"+ poolName+"\"");
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, NUM_CON_DESTROYED_COUNT);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, NUM_CON_DESTROYED_COUNT);
return new Integer(returnValue.get("count").toString());
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/create_pointbase.sql
index 46be39f..6d9a7c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (id integer , description char(50));
-
-drop table owner;
-
-create table owner ( id integer, description char(50));
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (id integer , description char(50));
+
+drop table owner;
+
+create table owner ( id integer, description char(50));
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/drop_pointbase.sql
index a5ea2f8..d87d5de 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table O_Customer;
-drop table owner;
+Drop table O_Customer;
+drop table owner;
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/build.xml
index 7fc4b5f..38ddf78 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/build.xml
@@ -86,16 +86,16 @@
</target>
<target name="usage">
- <echo> Usage:
- ant cmt (Executes the cmt test)
- ant all (Executes all the mq tests)
- ant clean (cleans all the mq tests)
- ant build (builds all the mq tests)
- ant setup (sets up all resources for mq tests)
- ant deploy (deploys all the mq apps)
- ant run (Executes all the mq tests)
- ant undeploy (undeploys all the mq apps)
- ant unsetup (unsets all resources for mq tests)
- </echo>
+ <echo> Usage:
+ ant cmt (Executes the cmt test)
+ ant all (Executes all the mq tests)
+ ant clean (cleans all the mq tests)
+ ant build (builds all the mq tests)
+ ant setup (sets up all resources for mq tests)
+ ant deploy (deploys all the mq apps)
+ ant run (Executes all the mq tests)
+ ant undeploy (undeploys all the mq apps)
+ ant unsetup (unsets all resources for mq tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.properties
index 87140b8..987f76c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="mq-cmt"/>
-<property name="appname" value="${module}-excpt"/>
+<property name="appname" value="${module}-excpt"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.mq.cmt.excpt.client.SimpleMessageClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.mq.cmt.excpt.client.SimpleMessageClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
index 7e2d433..f18d1c9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
@@ -40,7 +40,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"/>
@@ -52,12 +52,12 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
+ </target>
<target name="configure-container" depends="init-common">
<!-- Workaround for issue 18783 -->
@@ -67,12 +67,12 @@
value="mdb-container"/>
</antcall>
<antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.mdb-container.property.cmt-max-runtime-exceptions=4"/>
- </antcall>
- <antcall target="restart-server-instance-common"/>
+ <param name="admin.command" value="set"/>
+ <param name="operand.props" value="server.mdb-container.property.cmt-max-runtime-exceptions=4"/>
+ </antcall>
+ <antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common"/>
</target>
@@ -83,27 +83,27 @@
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
<exec executable="${APPCLIENT}" failonerror="false">
<env key="APPCPATH" value="${env.S1AS_HOME}/domains/domain1/lib/ext/Oranxo.jar:${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line=" ${oracleForConnector.driver} ${oracleForConnector.url} ${oracleForConnector.user} ${oracleForConnector.pwd} "/>
- <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
+ <arg line="-name ${appname}Client"/>
+ <arg line="-textauth"/>
+ <arg line="-user j2ee"/>
+ <arg line="-password j2ee"/>
+ <arg line=" ${oracleForConnector.driver} ${oracleForConnector.url} ${oracleForConnector.user} ${oracleForConnector.pwd} "/>
+ <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="undeploy-jms-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/client/SimpleMessageClient.java b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/client/SimpleMessageClient.java
index 7c6a084..c836534 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/client/SimpleMessageClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/client/SimpleMessageClient.java
@@ -23,7 +23,7 @@
public class SimpleMessageClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
@@ -39,7 +39,7 @@
QueueSender queueSender = null;
TextMessage message = null;
final int NUM_MSGS = 3;
- boolean passed = true;
+ boolean passed = true;
try {
jndiContext = new InitialContext();
@@ -77,33 +77,33 @@
for (int i = 0; i < NUM_MSGS; i++) {
message.setText("This is message " + (i + 1));
- message.setIntProperty("Id",i);
+ message.setIntProperty("Id",i);
System.out.println("Sending message: " +
message.getText());
queueSender.send(message);
}
-
- for (int i=0; i< args.length; i++)
- System.out.println("Client: "+ args[i]);
+
+ for (int i=0; i< args.length; i++)
+ System.out.println("Client: "+ args[i]);
Thread.sleep(10000);
- Class.forName(args[0]);
- String url = args[1];
- java.sql.Connection con = DriverManager.getConnection(url,args[2],args[3]);
- ResultSet rs = con.createStatement().executeQuery("select exCount from mq_cmt_excpt");
- int count = 0;
- while (rs.next()){
- count = rs.getInt(1);
- }
+ Class.forName(args[0]);
+ String url = args[1];
+ java.sql.Connection con = DriverManager.getConnection(url,args[2],args[3]);
+ ResultSet rs = con.createStatement().executeQuery("select exCount from mq_cmt_excpt");
+ int count = 0;
+ while (rs.next()){
+ count = rs.getInt(1);
+ }
rs.close();
- con.close();
- if (count != 15) {
- throw new Exception("test failed because the exception count was " + count);
- }
- System.out.println("Each message got redelivered " + (count/NUM_MSGS -1) + " times successfully and then stopped delivery");
+ con.close();
+ if (count != 15) {
+ throw new Exception("test failed because the exception count was " + count);
+ }
+ System.out.println("Each message got redelivered " + (count/NUM_MSGS -1) + " times successfully and then stopped delivery");
} catch (Throwable e) {
System.out.println("Exception occurred: " + e.toString());
- passed = false;
+ passed = false;
stat.addStatus("simple mdb main", stat.FAIL);
} finally {
if (queueConnection != null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
index 08402a5..aa18a7b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
@@ -37,18 +37,18 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In "
+ "SimpleMessageBean.setMessageDrivenContext()");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbCreate() {
- System.out.println("In SimpleMessageBean.ejbCreate()");
+ System.out.println("In SimpleMessageBean.ejbCreate()");
}
public void onMessage(Message inMessage) {
TextMessage msg = null;
System.out.println("MQ-CMT about to updateDB");
- updateDB();
+ updateDB();
System.out.println("MQ-CMT after updateDB");
try {
@@ -65,32 +65,32 @@
} catch (Throwable te) {
te.printStackTrace();
}
- throw new RuntimeException("Test exception");
+ throw new RuntimeException("Test exception");
} // onMessage
private void updateDB() {
synchronized(lock){
try {
- //Class.forName("com.inet.ora.OraDriver");
- Class.forName("org.apache.derby.jdbc.ClientDriver");
+ //Class.forName("com.inet.ora.OraDriver");
+ Class.forName("org.apache.derby.jdbc.ClientDriver");
//String url = "jdbc:inetora::wrx.india.sun.com:1521:dbsmpl1";
String url = "jdbc:derby://localhost:1527/testdb;create=true;";
- java.sql.Connection con = DriverManager.getConnection(url,"dbuser", "dbpassword");
+ java.sql.Connection con = DriverManager.getConnection(url,"dbuser", "dbpassword");
ResultSet rs = con.createStatement().executeQuery("select exCount from mq_cmt_excpt");
- int count = 0;
- while (rs.next()){
- count = rs.getInt(1);
+ int count = 0;
+ while (rs.next()){
+ count = rs.getInt(1);
System.out.println("MQ-CMT updateDB : " + count);
- }
- rs.close();
- count++;
- String qry = "update mq_cmt_excpt set exCount="+ count ;
+ }
+ rs.close();
+ count++;
+ String qry = "update mq_cmt_excpt set exCount="+ count ;
System.out.println("MQ-CMT updateDB : query : " + qry);
- con.createStatement().executeUpdate(qry);
- con.close();
- } catch(Exception e) {
+ con.createStatement().executeUpdate(qry);
+ con.close();
+ } catch(Exception e) {
System.out.println("Error:" + e.getMessage());
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/build.properties
index 0878777..a4282ed 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/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="ejb30-hello-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -27,6 +27,6 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="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/connector/mq/ejb30mdb-resources-xml/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/build.xml
index b1a0a35..552d28c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/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,15 +46,15 @@
<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" />
<param name="glassfish-resources-ear.xml" value="descriptor/glassfish-resources.xml"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -64,7 +64,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,14 +76,14 @@
<param name="appclient.application.args" value="5"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
index adfaa84..2a62ecf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
@@ -41,9 +41,9 @@
System.exit(0);
}
- @Resource(mappedName="java:app/jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(mappedName="java:app/jms/ejb_ejb30_hello_mdb_QCF")
private static QueueConnectionFactory queueConFactory;
-
+
//Target Queue
@Resource(mappedName="java:app/jms/ejb_ejb30_hello_mdb_InQueue")
private static jakarta.jms.Queue msgBeanQueue;
@@ -57,7 +57,7 @@
private QueueSender queueSender;
private QueueReceiver queueReceiver;
private int numMessages = 2;
-
+
public Client(String[] args) {
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
@@ -80,10 +80,10 @@
public void setup() throws Exception {
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Destination will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueReceiver = queueSession.createReceiver(clientQueue);
queueCon.start();
}
@@ -98,28 +98,28 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
Message message = queueSession.createTextMessage("foo #" + (i + 1));
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, message);
-
- 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 {
sendMsgs((jakarta.jms.Queue) msgBeanQueue, num);
-
- //Now attempt to receive responses to our message
+
+ //Now attempt to receive responses to our message
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/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
index 2b3bd18..bc436fa 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
@@ -24,9 +24,9 @@
@MessageDriven(mappedName="java:app/jms/ejb_ejb30_hello_mdb_InQueue")
public class MessageBean implements MessageListener {
- @Resource(mappedName="java:app/jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(mappedName="java:app/jms/ejb_ejb30_hello_mdb_QCF")
QueueConnectionFactory qcFactory;
-
+
//Destination Queue
@Resource(mappedName="java:app/jms/ejb_ejb30_hello_mdb_OutQueue")
Queue replyQueue;
@@ -35,14 +35,14 @@
System.out.println("MessageBean:: onMessage :: Got message!!!" + message);
QueueConnection connection = null;
- QueueSession session = null;
+ QueueSession session = null;
try {
connection = qcFactory.createQueueConnection();
session = connection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
QueueSender sender = session.createSender(replyQueue);
TextMessage tmessage = session.createTextMessage();
- String msgText = "Reply for " + ((TextMessage) message).getText();
+ String msgText = "Reply for " + ((TextMessage) message).getText();
tmessage.setText(msgText);
System.out.println("Sending " + msgText);
sender.send(tmessage);
@@ -50,9 +50,9 @@
e.printStackTrace();
} finally {
try {
- if (session != null) {
- session.close();
- }
+ if (session != null) {
+ session.close();
+ }
if(connection != null) {
connection.close();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/build.properties
index 0878777..a4282ed 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/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="ejb30-hello-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -27,6 +27,6 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="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/connector/mq/ejb30mdb/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/build.xml
index d4549fa..4e6f0a8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="5"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
index 2c8721e..f25e2b7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
@@ -41,9 +41,9 @@
System.exit(0);
}
- @Resource(mappedName="jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(mappedName="jms/ejb_ejb30_hello_mdb_QCF")
private static QueueConnectionFactory queueConFactory;
-
+
//Target Queue
@Resource(mappedName="jms/ejb_ejb30_hello_mdb_InQueue")
private static jakarta.jms.Queue msgBeanQueue;
@@ -57,7 +57,7 @@
private QueueSender queueSender;
private QueueReceiver queueReceiver;
private int numMessages = 2;
-
+
public Client(String[] args) {
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
@@ -80,10 +80,10 @@
public void setup() throws Exception {
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Destination will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueReceiver = queueSession.createReceiver(clientQueue);
queueCon.start();
}
@@ -98,28 +98,28 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
Message message = queueSession.createTextMessage("foo #" + (i + 1));
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, message);
-
- 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 {
sendMsgs((jakarta.jms.Queue) msgBeanQueue, num);
-
- //Now attempt to receive responses to our message
+
+ //Now attempt to receive responses to our message
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/connector/mq/ejb30mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
index 90a14a2..9aefcac 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
@@ -24,9 +24,9 @@
@MessageDriven(mappedName="jms/ejb_ejb30_hello_mdb_InQueue")
public class MessageBean implements MessageListener {
- @Resource(mappedName="jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(mappedName="jms/ejb_ejb30_hello_mdb_QCF")
QueueConnectionFactory qcFactory;
-
+
//Destination Queue
@Resource(mappedName="jms/ejb_ejb30_hello_mdb_OutQueue")
Queue replyQueue;
@@ -35,14 +35,14 @@
System.out.println("MessageBean:: onMessage :: Got message!!!" + message);
QueueConnection connection = null;
- QueueSession session = null;
+ QueueSession session = null;
try {
connection = qcFactory.createQueueConnection();
session = connection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
QueueSender sender = session.createSender(replyQueue);
TextMessage tmessage = session.createTextMessage();
- String msgText = "Reply for " + ((TextMessage) message).getText();
+ String msgText = "Reply for " + ((TextMessage) message).getText();
tmessage.setText(msgText);
System.out.println("Sending " + msgText);
sender.send(tmessage);
@@ -50,9 +50,9 @@
e.printStackTrace();
} finally {
try {
- if (session != null) {
- session.close();
- }
+ if (session != null) {
+ session.close();
+ }
if(connection != null) {
connection.close();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.properties
index 87140b8..987f76c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="mq-cmt"/>
-<property name="appname" value="${module}-excpt"/>
+<property name="appname" value="${module}-excpt"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.mq.cmt.excpt.client.SimpleMessageClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.mq.cmt.excpt.client.SimpleMessageClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
index 8591a05..b0337b5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,17 +50,17 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
+ </target>
<target name="restart-appserver" depends="init-common">
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common"/>
</target>
@@ -68,18 +68,18 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
<exec executable="${APPCLIENT}" failonerror="true">
<env key="APPCPATH" value="${env.S1AS_HOME}/domains/domain1/lib/ext/Oranxo.jar:${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
+ <arg line="-name ${appname}Client"/>
+ <arg line="-textauth"/>
+ <arg line="-user j2ee"/>
+ <arg line="-password j2ee"/>
<arg line=" ${oracleForConnector.driver} ${oracleForConnector.url} ${oracleForConnector.user} ${oracleForConnector.pwd} "/>
- <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
+ <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
</exec>
</target>
@@ -110,10 +110,10 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="undeploy-jms-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/client/SimpleMessageClient.java b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/client/SimpleMessageClient.java
index b3b7d30..90bd4a9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/client/SimpleMessageClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/client/SimpleMessageClient.java
@@ -23,7 +23,7 @@
public class SimpleMessageClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
@@ -32,23 +32,23 @@
boolean passed = false;
try {
- Class.forName(args[0]);
- String url = args[1];
- java.sql.Connection con = DriverManager.getConnection(url,args[2],args[3]);
- ResultSet rs = con.createStatement().executeQuery("select status from lifecycle_test1");
- int count = 0;
- while (rs.next()){
- count = rs.getInt(1);
- }
+ Class.forName(args[0]);
+ String url = args[1];
+ java.sql.Connection con = DriverManager.getConnection(url,args[2],args[3]);
+ ResultSet rs = con.createStatement().executeQuery("select status from lifecycle_test1");
+ int count = 0;
+ while (rs.next()){
+ count = rs.getInt(1);
+ }
rs.close();
- con.close();
- if (count == 0) {
- throw new Exception("test failed because status : " + 0);
- }
+ con.close();
+ if (count == 0) {
+ throw new Exception("test failed because status : " + 0);
+ }
passed = true;
} catch (Throwable e) {
System.out.println("Exception occurred: " + e.toString());
- passed = false;
+ passed = false;
stat.addStatus("simple lifecycle test1", stat.FAIL);
} finally {
if (passed) stat.addStatus("simple lifecycle test1", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
index 60a7e5f..5225884 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
@@ -38,17 +38,17 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In "
+ "SimpleMessageBean.setMessageDrivenContext()");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbCreate() {
- System.out.println("In SimpleMessageBean.ejbCreate()");
+ System.out.println("In SimpleMessageBean.ejbCreate()");
}
public void onMessage(Message inMessage) {
TextMessage msg = null;
- updateDB();
+ updateDB();
try {
if (inMessage instanceof TextMessage) {
@@ -64,7 +64,7 @@
} catch (Throwable te) {
te.printStackTrace();
}
- throw new RuntimeException("Test exception");
+ throw new RuntimeException("Test exception");
} // onMessage
private void updateDB() {
@@ -76,18 +76,18 @@
java.sql.Connection con = DriverManager.getConnection(url,"dbuser", "dbpassword");
//java.sql.Connection con = DriverManager.getConnection(url,"connector", "connector");
ResultSet rs = con.createStatement().executeQuery("select exCount from mq_cmt_excpt");
- int count = 0;
- while (rs.next()){
- count = rs.getInt(1);
- }
- rs.close();
- count++;
- String qry = "update mq_cmt_excpt set exCount="+ count ;
- con.createStatement().executeUpdate(qry);
- con.close();
- } catch(Exception e) {
+ int count = 0;
+ while (rs.next()){
+ count = rs.getInt(1);
+ }
+ rs.close();
+ count++;
+ String qry = "update mq_cmt_excpt set exCount="+ count ;
+ con.createStatement().executeUpdate(qry);
+ con.close();
+ } catch(Exception e) {
System.out.println("Error:" + e.getMessage());
- }
+ }
}
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/src/LifecycleListenerImpl.java b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/src/LifecycleListenerImpl.java
index c0668eb..990a278 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/src/LifecycleListenerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/src/LifecycleListenerImpl.java
@@ -34,8 +34,8 @@
* 3. READY_EVENT: Server started up applications and is ready to service requests
* 4. SHUTDOWN_EVENT: Server is shutting down applications
* 5. TERMINATION_EVENT: Server is terminating the subsystems and the runtime environment.
- *
- * In this sample, on STARTUP_EVENT, a thread is started which sends a simple JMS message to
+ *
+ * In this sample, on STARTUP_EVENT, a thread is started which sends a simple JMS message to
* sampleTopic every minute. On SHUTDOWN_EVENT, this thread is stopped.
* </p>
*/
@@ -47,37 +47,37 @@
*/
LifecycleEventContext ctx;
- /**
- * Receives a server lifecycle event
+ /**
+ * Receives a server lifecycle event
* @param event associated event
* @throws <code>ServerLifecycleException</code> for exceptional condition.
*/
- public void handleEvent(LifecycleEvent event)
+ public void handleEvent(LifecycleEvent event)
throws ServerLifecycleException {
ctx = event.getLifecycleEventContext();
- switch(event.getEventType()) {
- case LifecycleEvent.INIT_EVENT:
- onInitTask();
- break;
+ switch(event.getEventType()) {
+ case LifecycleEvent.INIT_EVENT:
+ onInitTask();
+ break;
- case LifecycleEvent.STARTUP_EVENT:
- onStartTask();
- break;
+ case LifecycleEvent.STARTUP_EVENT:
+ onStartTask();
+ break;
case LifecycleEvent.READY_EVENT:
onReadyTask();
break;
- case LifecycleEvent.SHUTDOWN_EVENT:
- onShutdownTask();
- break;
+ case LifecycleEvent.SHUTDOWN_EVENT:
+ onShutdownTask();
+ break;
- case LifecycleEvent.TERMINATION_EVENT:
- onTerminationTask();
- break;
- }
+ case LifecycleEvent.TERMINATION_EVENT:
+ onTerminationTask();
+ break;
+ }
}
@@ -98,47 +98,47 @@
// my code
QueueSession qsession[] = new QueueSession[10];
Queue queue[] = new Queue[10];
-
+
try{
for (int i =0; i < 10; i++) {
// Get initial context
ctx.log("Get initial context");
InitialContext initialContext = new InitialContext();
-
+
// look up the connection factory from the object store
ctx.log("Looking up the queue connection factory from JNDI");
QueueConnectionFactory factory = (QueueConnectionFactory) initialContext.lookup("jms/QCFactory");
-
+
// look up queue from the object store
ctx.log("Create queue connection");
QueueConnection qconn = factory.createQueueConnection();
-
+
ctx.log("Create queue session");
qsession[i] = qconn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
ctx.log("Looking up the queue from JNDI");
queue[i] = (Queue) initialContext.lookup("jms/SampleQueue");
}
updateDB();
-
+
}
catch( Exception e ){
ctx.log( "Exception caught in test code" );
e.printStackTrace();
}
-
-
- // end my code
-
+
+
+ // end my code
+
// my code
//createAccount();
- // end my code
+ // end my code
}
/**
- * Tasks to be carried out in the READY_EVENT.
+ * Tasks to be carried out in the READY_EVENT.
* Logs a message.
*/
private void onReadyTask() {
@@ -146,7 +146,7 @@
}
/**
- * Tasks to be carried out in the SHUTDOWN_EVENT.
+ * Tasks to be carried out in the SHUTDOWN_EVENT.
* Logs a message
*/
private void onShutdownTask() {
@@ -170,7 +170,7 @@
/**
- * Tasks to be carried out in the TERMINATION_EVENT.
+ * Tasks to be carried out in the TERMINATION_EVENT.
* Log a message.
*/
private void onTerminationTask() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.properties
index 61ce3c3..f996b22 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector-mq"/>
-<property name="appname" value="${module}-simplestress"/>
+<property name="appname" value="${module}-simplestress"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.connector.mq.simplestress.client.SimpleMessageClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.connector.mq.simplestress.client.SimpleMessageClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.xml
index 82378b1..874369c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,13 +47,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common">
<param name="jms.factory.name"
@@ -76,14 +76,14 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="delete-jms-resource-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/client/SimpleMessageClient.java b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/client/SimpleMessageClient.java
index 057c998..510d1f1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/client/SimpleMessageClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/client/SimpleMessageClient.java
@@ -22,7 +22,7 @@
public class SimpleMessageClient implements Runnable{
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
int id =0;
@@ -84,7 +84,7 @@
stat.printSummary("simple stress program");
System.exit(0);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/descriptor/ejb-jar.xml
index a47bc90..7b90699 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/descriptor/ejb-jar.xml
@@ -37,7 +37,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>jms/clientQueue</resource-env-ref-name>
- <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
</resource-env-ref>
</message-driven>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
index 9d2845b..0bd1993 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
@@ -42,11 +42,11 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In "
+ "SimpleMessageBean.setMessageDrivenContext()");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbCreate() {
- System.out.println("In SimpleMessageBean.ejbCreate()");
+ System.out.println("In SimpleMessageBean.ejbCreate()");
try {
jndiContext = new InitialContext();
connectionFactory = (ConnectionFactory)
@@ -67,18 +67,18 @@
msg = (TextMessage) inMessage;
System.out.println("MESSAGE BEAN: Message received: "
+ msg.getText());
- connection =
- connectionFactory.createConnection();
- session =
- connection.createSession(false,
- Session.AUTO_ACKNOWLEDGE);
- MessageProducer msgProducer= session.createProducer(queue);
- TextMessage message = session.createTextMessage();
+ connection =
+ connectionFactory.createConnection();
+ session =
+ connection.createSession(false,
+ Session.AUTO_ACKNOWLEDGE);
+ MessageProducer msgProducer= session.createProducer(queue);
+ TextMessage message = session.createTextMessage();
- message.setText("Reply for : " + msg.getText());
- System.out.println("Sending message: " +
- message.getText());
- msgProducer.send(message);
+ message.setText("Reply for : " + msg.getText());
+ System.out.println("Sending message: " +
+ message.getText());
+ msgProducer.send(message);
} else {
System.out.println("Message of wrong type: "
+ inMessage.getClass().getName());
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.properties
index 61ce3c3..f996b22 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector-mq"/>
-<property name="appname" value="${module}-simplestress"/>
+<property name="appname" value="${module}-simplestress"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.connector.mq.simplestress.client.SimpleMessageClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.connector.mq.simplestress.client.SimpleMessageClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.xml
index fa76f10..2a38170 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,13 +47,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common"/>
<antcall target="create-jms-resource-common">
@@ -71,14 +71,14 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="undeploy-jms-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/client/SimpleMessageClient.java b/appserver/tests/appserv-tests/devtests/connector/mq/stress/client/SimpleMessageClient.java
index 942a0e9..0d830d5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/client/SimpleMessageClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/client/SimpleMessageClient.java
@@ -29,7 +29,7 @@
static long MDB_SLEEP_TIME = 2000;
static boolean debug = false;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
int id =0;
@@ -40,13 +40,13 @@
public static void main(String[] args) {
/**
- * Start the threads that will send messages to MDB
- */
+ * Start the threads that will send messages to MDB
+ */
ArrayList al = new ArrayList();
try {
for (int i =0; i < NUM_CLIENTS; i++) {
Thread client = new Thread(new SimpleMessageClient(i));
- al.add(client);
+ al.add(client);
client.start();
}
} catch (Throwable t) {
@@ -76,66 +76,66 @@
queueConnection.start();
queueReceiver = queueSession.createReceiver(queue);
- HashMap map = new HashMap();
+ HashMap map = new HashMap();
long startTime = System.currentTimeMillis();
boolean pass = true;
- //
- // Receives all the messages and keep in the data structure
- //
+ //
+ // Receives all the messages and keep in the data structure
+ //
for (int i =0; i < NUM_CLIENTS * NUM_CYCLES; i++) {
TextMessage msg = (TextMessage) queueReceiver.receive(TIME_OUT);
- Integer id = new Integer(msg.getIntProperty("replyid"));
- if (map.containsKey(id)) {
- pass = false;
- debug("Duplicate :" + id);
- }
- map.put(id, msg.getText());
+ Integer id = new Integer(msg.getIntProperty("replyid"));
+ if (map.containsKey(id)) {
+ pass = false;
+ debug("Duplicate :" + id);
+ }
+ map.put(id, msg.getText());
}
long totalTime = System.currentTimeMillis() - startTime;
- System.out.println("Received all messages in :" + totalTime + " milliseconds");
- System.out.println("------------------------------------------------------");
+ System.out.println("Received all messages in :" + totalTime + " milliseconds");
+ System.out.println("------------------------------------------------------");
- //
- // Now examine the received data
- //
+ //
+ // Now examine the received data
+ //
for (int i =0; i < NUM_CLIENTS * NUM_CYCLES; i++) {
- String reply = (String) map.get(new Integer(i));
- if (!reply.equals("REPLIED:CLIENT")) {
- pass = false;
- }
- System.out.println("Receeived :" + i + ":" + reply);
- }
-
- // Try to receive one more message than expected.
+ String reply = (String) map.get(new Integer(i));
+ if (!reply.equals("REPLIED:CLIENT")) {
+ pass = false;
+ }
+ System.out.println("Receeived :" + i + ":" + reply);
+ }
+
+ // Try to receive one more message than expected.
TextMessage msg = (TextMessage) queueReceiver.receive(TIME_OUT);
- if (msg != null) {
- pass = false;
- System.out.println("Received more than expected number of messages :" + msg.getText());
- }
+ if (msg != null) {
+ pass = false;
+ System.out.println("Received more than expected number of messages :" + msg.getText());
+ }
if (pass) {
stat.addStatus("Concurrent message delivery test", stat.PASS);
} else {
stat.addStatus("Concurrent message delivery test", stat.FAIL);
- }
+ }
}catch (Throwable t) {
t.printStackTrace();
stat.addStatus("Concurrent message delivery test", stat.FAIL);
}finally {
stat.printSummary("Concurrent message delivery test");
- for (int i=0; i <al.size(); i++) {
- Thread client = (Thread) al.get(i);
- try {
- client.join();
- } catch (Exception e) {
- System.out.println(e.getMessage());
- }
- }
+ for (int i=0; i <al.size(); i++) {
+ Thread client = (Thread) al.get(i);
+ try {
+ client.join();
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
+ }
System.exit(0);
}
-
+
}
@@ -156,9 +156,9 @@
("java:comp/env/jms/QCFactory");
queue = (Queue) jndiContext.lookup("java:comp/env/jms/SampleQueue");
- int startId = id * NUM_CYCLES;
- int endId = (id * NUM_CYCLES) + NUM_CYCLES;
- for (int i= startId;i < endId; i ++) {
+ int startId = id * NUM_CYCLES;
+ int endId = (id * NUM_CYCLES) + NUM_CYCLES;
+ for (int i= startId;i < endId; i ++) {
try {
queueConnection =
queueConnectionFactory.createQueueConnection();
@@ -169,10 +169,10 @@
queueSender = queueSession.createSender(queue);
message = queueSession.createTextMessage();
message.setText("CLIENT");
- message.setIntProperty("id",i);
- message.setLongProperty("sleeptime",MDB_SLEEP_TIME);
+ message.setIntProperty("id",i);
+ message.setLongProperty("sleeptime",MDB_SLEEP_TIME);
queueSender.send(message);
- debug("Send the message :" + message.getIntProperty("id") + ":" + message.getText());
+ debug("Send the message :" + message.getIntProperty("id") + ":" + message.getText());
} catch (Exception e) {
System.out.println("Exception occurred: " + e.toString());
} finally {
@@ -190,8 +190,8 @@
static void debug(String msg) {
if (debug) {
- System.out.println(msg);
- }
+ System.out.println(msg);
+ }
}
} // class
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/mq/stress/descriptor/ejb-jar.xml
index 3811a29..dba222a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/descriptor/ejb-jar.xml
@@ -37,7 +37,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>jms/clientQueue</resource-env-ref-name>
- <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
</resource-env-ref>
</message-driven>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
index 5645b91..c33b753 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
@@ -42,11 +42,11 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In "
+ "SimpleMessageBean.setMessageDrivenContext()");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbCreate() {
- System.out.println("In SimpleMessageBean.ejbCreate()");
+ System.out.println("In SimpleMessageBean.ejbCreate()");
try {
jndiContext = new InitialContext();
queueConnectionFactory = (QueueConnectionFactory)
@@ -67,22 +67,22 @@
msg = (TextMessage) inMessage;
System.out.println("MESSAGE BEAN: Message received: "
+ msg.getText());
- long sleepTime = msg.getLongProperty("sleeptime");
- System.out.println("Sleeping for : " + sleepTime + " milli seconds ");
- Thread.sleep(sleepTime);
- queueConnection =
- queueConnectionFactory.createQueueConnection();
- queueSession =
- queueConnection.createQueueSession(false,
- Session.AUTO_ACKNOWLEDGE);
- queueSender = queueSession.createSender(queue);
- TextMessage message = queueSession.createTextMessage();
+ long sleepTime = msg.getLongProperty("sleeptime");
+ System.out.println("Sleeping for : " + sleepTime + " milli seconds ");
+ Thread.sleep(sleepTime);
+ queueConnection =
+ queueConnectionFactory.createQueueConnection();
+ queueSession =
+ queueConnection.createQueueSession(false,
+ Session.AUTO_ACKNOWLEDGE);
+ queueSender = queueSession.createSender(queue);
+ TextMessage message = queueSession.createTextMessage();
- message.setText("REPLIED:" + msg.getText());
- message.setIntProperty("replyid", msg.getIntProperty("id") );
- System.out.println("Sending message: " +
- message.getText());
- queueSender.send(message);
+ message.setText("REPLIED:" + msg.getText());
+ message.setIntProperty("replyid", msg.getIntProperty("id") );
+ System.out.println("Sending message: " +
+ message.getText());
+ queueSender.send(message);
} else {
System.out.println("Message of wrong type: "
+ inMessage.getClass().getName());
@@ -92,12 +92,12 @@
} catch (Throwable te) {
te.printStackTrace();
} finally {
- try {
- queueSession.close();
- queueConnection.close();
- } catch (Exception e) {
- }
- }
+ try {
+ queueSession.close();
+ queueConnection.close();
+ } catch (Exception e) {
+ }
+ }
} // onMessage
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.properties b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.properties
index 61ce3c3..f996b22 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector-mq"/>
-<property name="appname" value="${module}-simplestress"/>
+<property name="appname" value="${module}-simplestress"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.connector.mq.simplestress.client.SimpleMessageClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.connector.mq.simplestress.client.SimpleMessageClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.xml
index 8fd4b6f..476baa6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,13 +49,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common"/>
<antcall target="create-jms-resource-common">
@@ -73,16 +73,16 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common" >
<antcall target="test-send-receive-message"/>
<antcall target="test-send-recreate-fail"/>
<antcall target="test-send-create-newdomain"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="undeploy-jms-common"/>
@@ -103,67 +103,67 @@
<param name="userPassword" value="password1"/>
<param name="jmsServer" value=""/>
<param name="vardir" value=""/>
- </antcall>
+ </antcall>
<antcall target="runclient-common">
- <param name="appclient.application.args"
- value="TestNewUser SENDRECEIVE VERIFY user1 password1"/>
- </antcall>
+ <param name="appclient.application.args"
+ value="TestNewUser SENDRECEIVE VERIFY user1 password1"/>
+ </antcall>
</target>
<target name="test-send-recreate-fail">
<antcall target="runclient-common">
- <param name="appclient.application.args"
- value="SettingupLooseMessageOnRecreate SEND NOVERIFY user1 password1"/>
- </antcall>
- <antcall target="start-clean-server"/>
- <antcall target="setup"/>
- <antcall target="deploy-common"/>
+ <param name="appclient.application.args"
+ value="SettingupLooseMessageOnRecreate SEND NOVERIFY user1 password1"/>
+ </antcall>
+ <antcall target="start-clean-server"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-common"/>
<antcall target="create-jms-user">
<param name="userName" value="user1"/>
<param name="userPassword" value="password1"/>
<param name="jmsServer" value=""/>
<param name="vardir" value=""/>
<param name="FAILONERR" value="true"/>
- </antcall>
+ </antcall>
<antcall target="runclient-common">
- <param name="appclient.application.args"
- value="TestLooseMessageOnRecreate RECEIVE NOVERIFY user1 password1"/>
- </antcall>
+ <param name="appclient.application.args"
+ value="TestLooseMessageOnRecreate RECEIVE NOVERIFY user1 password1"/>
+ </antcall>
</target>
<target name="test-send-create-newdomain">
- <antcall target="stopDomain"/>
- <antcall target="create-domain-common">
+ <antcall target="stopDomain"/>
+ <antcall target="create-domain-common">
<param name="admin.domain" value="domain2"/>
<param name="http.port" value="48080"/>
- <param name="orb.port" value="43700"/>
- </antcall>
- <antcall target="startDomain">
+ <param name="orb.port" value="43700"/>
+ </antcall>
+ <antcall target="startDomain">
<param name="admin.domain" value="domain2"/>
- </antcall>
+ </antcall>
<antcall target="create-jms-user">
<param name="userName" value="user1"/>
<param name="userPassword" value="password1"/>
<param name="jmsServer" value=""/>
<param name="vardir" value="-varhome ${env.S1AS_HOME}/domains/domain2/imq"/>
<param name="FAILONERR" value="true"/>
- </antcall>
- <antcall target="setup"/>
+ </antcall>
+ <antcall target="setup"/>
<antcall target="runclient-common">
- <param name="appclient.application.args"
- value="SendMessageToNewDomainMQStore SEND NOVERIFY user1 password1"/>
- </antcall>
- <antcall target="deploy-common"/>
+ <param name="appclient.application.args"
+ value="SendMessageToNewDomainMQStore SEND NOVERIFY user1 password1"/>
+ </antcall>
+ <antcall target="deploy-common"/>
<antcall target="runclient-common">
- <param name="appclient.application.args"
- value="TestReceiveNewDomainMQStore RECEIVE VERIFY user1 password1"/>
- </antcall>
- <antcall target="stopDomain">
+ <param name="appclient.application.args"
+ value="TestReceiveNewDomainMQStore RECEIVE VERIFY user1 password1"/>
+ </antcall>
+ <antcall target="stopDomain">
<param name="admin.domain" value="domain2"/>
- </antcall>
- <antcall target="delete-domain-common">
+ </antcall>
+ <antcall target="delete-domain-common">
<param name="admin.domain" value="domain2"/>
- </antcall>
- <antcall target="startDomain"/>
+ </antcall>
+ <antcall target="startDomain"/>
</target>
<target name="create-jms-user" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/client/SimpleMessageClient.java b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/client/SimpleMessageClient.java
index 967c8d3..d5b2321 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/client/SimpleMessageClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/client/SimpleMessageClient.java
@@ -28,7 +28,7 @@
static String user = null;
static String password = null;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
int id =0;
@@ -40,38 +40,38 @@
public static void main(String[] args) {
System.out.println(args);
- //if (args.length >0) return;
-
- String testId = args[0];
- String testString = args[1];
- String verify = args[2];
- user = args[3];
- password = args[4];
+ //if (args.length >0) return;
+
+ String testId = args[0];
+ String testString = args[1];
+ String verify = args[2];
+ user = args[3];
+ password = args[4];
try {
boolean pass = true;
- System.out.println("Running the test : " + testId);
+ System.out.println("Running the test : " + testId);
- if (testString.startsWith("SEND")) {
- sendMessage();
- }
-
- String output = null;
- if (testString.endsWith("RECEIVE")) {
- output = receiveMessage();
- }
+ if (testString.startsWith("SEND")) {
+ sendMessage();
+ }
- if (verify.equals("VERIFY")) {
- pass = output.equals("REPLIED:CLIENT");
- } else {
- pass = (output == null);
- }
+ String output = null;
+ if (testString.endsWith("RECEIVE")) {
+ output = receiveMessage();
+ }
+
+ if (verify.equals("VERIFY")) {
+ pass = output.equals("REPLIED:CLIENT");
+ } else {
+ pass = (output == null);
+ }
if (pass) {
stat.addStatus(testId, stat.PASS);
} else {
stat.addStatus(testId, stat.FAIL);
- }
+ }
}catch (Throwable t) {
t.printStackTrace();
stat.addStatus(testId, stat.FAIL);
@@ -79,7 +79,7 @@
stat.printSummary(testId);
System.exit(0);
}
-
+
}
public static String receiveMessage() {
@@ -106,16 +106,16 @@
queueConnection.start();
queueReceiver = queueSession.createReceiver(queue);
- HashMap map = new HashMap();
+ HashMap map = new HashMap();
long startTime = System.currentTimeMillis();
boolean pass = true;
TextMessage msg = (TextMessage) queueReceiver.receive(TIME_OUT);
- if (msg == null) {
- return null;
- }
- Integer id = new Integer(msg.getIntProperty("replyid"));
- return msg.getText();
+ if (msg == null) {
+ return null;
+ }
+ Integer id = new Integer(msg.getIntProperty("replyid"));
+ return msg.getText();
}catch (Throwable t) {
t.printStackTrace();
}finally {
@@ -153,9 +153,9 @@
queueSender = queueSession.createSender(queue);
message = queueSession.createTextMessage();
message.setText("CLIENT");
- message.setIntProperty("id",1);
+ message.setIntProperty("id",1);
queueSender.send(message);
- debug("Send the message :" + message.getIntProperty("id") + ":" + message.getText());
+ debug("Send the message :" + message.getIntProperty("id") + ":" + message.getText());
} catch (Throwable e) {
System.out.println("Exception occurred: " + e.toString());
} finally {
@@ -169,8 +169,8 @@
static void debug(String msg) {
if (debug) {
- System.out.println(msg);
- }
+ System.out.println(msg);
+ }
}
} // class
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/descriptor/ejb-jar.xml
index 3811a29..dba222a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/descriptor/ejb-jar.xml
@@ -37,7 +37,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>jms/clientQueue</resource-env-ref-name>
- <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
+ <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
</resource-env-ref>
</message-driven>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
index 07b3184..a83ec56 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
@@ -42,11 +42,11 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In "
+ "SimpleMessageBean.setMessageDrivenContext()");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbCreate() {
- System.out.println("In SimpleMessageBean.ejbCreate()");
+ System.out.println("In SimpleMessageBean.ejbCreate()");
try {
jndiContext = new InitialContext();
queueConnectionFactory = (QueueConnectionFactory)
@@ -67,19 +67,19 @@
msg = (TextMessage) inMessage;
System.out.println("MESSAGE BEAN: Message received: "
+ msg.getText());
- queueConnection =
- queueConnectionFactory.createQueueConnection();
- queueSession =
- queueConnection.createQueueSession(false,
- Session.AUTO_ACKNOWLEDGE);
- queueSender = queueSession.createSender(queue);
- TextMessage message = queueSession.createTextMessage();
+ queueConnection =
+ queueConnectionFactory.createQueueConnection();
+ queueSession =
+ queueConnection.createQueueSession(false,
+ Session.AUTO_ACKNOWLEDGE);
+ queueSender = queueSession.createSender(queue);
+ TextMessage message = queueSession.createTextMessage();
- message.setText("REPLIED:" + msg.getText());
- message.setIntProperty("replyid", msg.getIntProperty("id") );
- System.out.println("Sending message: " +
- message.getText());
- queueSender.send(message);
+ message.setText("REPLIED:" + msg.getText());
+ message.setIntProperty("replyid", msg.getIntProperty("id") );
+ System.out.println("Sending message: " +
+ message.getText());
+ queueSender.send(message);
} else {
System.out.println("Message of wrong type: "
+ inMessage.getClass().getName());
@@ -89,12 +89,12 @@
} catch (Throwable te) {
te.printStackTrace();
} finally {
- try {
- queueSession.close();
- queueConnection.close();
- } catch (Exception e) {
- }
- }
+ try {
+ queueSession.close();
+ queueConnection.close();
+ } catch (Exception e) {
+ }
+ }
} // onMessage
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/build.properties b/appserver/tests/appserv-tests/devtests/connector/nonacc/build.properties
index ce9e1bf..7a964dc 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonacc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/nonacc/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="nonacc"/>
-<property name="appname" value="${module}-simple"/>
+<property name="appname" value="${module}-simple"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.nonacc.simple.client.SimpleMessageClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.nonacc.simple.client.SimpleMessageClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="jmsra.jar" value="${env.S1AS_HOME}/lib/install/applications/jmsra/imqjmsra.jar"/>
<property name="app.type" value="application"/>
<property name="orb.host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonacc/build.xml
index 02f1d4e..f88f823 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonacc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonacc/build.xml
@@ -21,7 +21,7 @@
<!ENTITY testproperties SYSTEM "./build.properties">
<!ENTITY common SYSTEM "../../../config/common.xml">
<!ENTITY testcommon SYSTEM "../../../config/properties.xml">
-
+
]>
<project name="simpleApp" default="usage" basedir=".">
@@ -40,7 +40,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"/>
@@ -52,17 +52,17 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- </antcall>
- <echo message="Preparing Jar file to execute in the client ${build.classes.dir}" />
- <jar jarfile="${assemble.dir}/${appname}-client.jar" basedir="${build.classes.dir}"
- update="true" includes ="**/*Client*.class"
+ </antcall>
+ <echo message="Preparing Jar file to execute in the client ${build.classes.dir}" />
+ <jar jarfile="${assemble.dir}/${appname}-client.jar" basedir="${build.classes.dir}"
+ update="true" includes ="**/*Client*.class"
manifest="./client/MANIFEST.MF" />
<antcall target="ear-common">
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common"/>
</target>
@@ -70,25 +70,25 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="${test.client}" fork="true">
- <classpath>
- <pathelement location="${assemble.dir}/${appname}-client.jar"/>
-<!-- <pathelement location="${jmsra.jar}"/>-->
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="${java.home}/lib/jsse.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/gf-client.jar"/>
-<!-- <pathelement path="${s1astest.classpath}"/>-->
- </classpath>
- <sysproperty key="org.omg.CORBA.ORBInitialHost" value="${orb.host}"/>
- <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
- </java>
+ <classpath>
+ <pathelement location="${assemble.dir}/${appname}-client.jar"/>
+<!-- <pathelement location="${jmsra.jar}"/>-->
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+ <pathelement location="${java.home}/lib/jsse.jar"/>
+ <pathelement location="${env.S1AS_HOME}/lib/gf-client.jar"/>
+<!-- <pathelement path="${s1astest.classpath}"/>-->
+ </classpath>
+ <sysproperty key="org.omg.CORBA.ORBInitialHost" value="${orb.host}"/>
+ <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
+ </java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="undeploy-jms-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/client/SimpleMessageClient.java b/appserver/tests/appserv-tests/devtests/connector/nonacc/client/SimpleMessageClient.java
index a6f7695..9355415 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonacc/client/SimpleMessageClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonacc/client/SimpleMessageClient.java
@@ -22,7 +22,7 @@
public class SimpleMessageClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
index abe85d8..6d33e64 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
@@ -34,11 +34,11 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In "
+ "SimpleMessageBean.setMessageDrivenContext()");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbCreate() {
- System.out.println("In SimpleMessageBean.ejbCreate()");
+ System.out.println("In SimpleMessageBean.ejbCreate()");
}
public void onMessage(Message inMessage) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.properties b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.xml
index 7fcecae..46e9b70 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<!--
<target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -40,15 +40,15 @@
<target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
@@ -56,7 +56,7 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
@@ -64,7 +64,7 @@
<antcall target="create-pool"/>
<antcall target="create-resource"/>
<antcall target="create-admin-object"/>
-
+
</target>
<target name="create-pool">
<antcall target="create-connector-connpool-common">
@@ -89,17 +89,17 @@
<property file="../config/oracle.properties"/>
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- </target>
-
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ </target>
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -107,15 +107,15 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
</target>
<target name="unsetup">
@@ -127,7 +127,7 @@
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -137,7 +137,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -153,9 +153,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -164,34 +164,34 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="create-ra-config"/>
<antcall target="deploy-common"/>
@@ -200,27 +200,27 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/nonstringmcfproperties/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/descriptor/sun-ejb-jar.xml
index 1d1200d..df4bb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
index 5922f31..3615e16 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
@@ -46,4 +46,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerChecking.java
index ff15e7e..89dc323 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerChecking.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
index 0520b60..07220db 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavings.java
index 2740692..c45a1c5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavings.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.properties
index ee2eca0..fd21c3d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.xml
index cb66a45..3aceef2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
failonerror="true">
<classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
</classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index 4632ae1..b4fd124 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,404 +53,404 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
-
+
/**
* Retrieves the the first warning reported by calls on the underlying
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
@Override
@@ -536,141 +536,141 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
-
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 79fb933..a7d35be 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -122,86 +122,86 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>9092</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBUSER</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBPASSWORD</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DatabaseName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DataSourceName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>NetworkProtocol</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Delimiter</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
</config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
<!-- properties to test setting of a non-String value with overridden setters -->
<config-property>
<config-property-name>NonStringWithNoOverriddenSetter</config-property-name>
@@ -215,54 +215,54 @@
</config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 4bf9fed..3234032 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,14 +31,14 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -49,19 +49,19 @@
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -69,55 +69,55 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
setIsolation(mc);
isValid(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -128,409 +128,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -538,19 +538,19 @@
public Double getNonStringWithNoOverriddenSetter(){
System.out.println("DSManagedConnectionFactory : getNonStringWithNoOverriddenSetter() called");
- return this.nonStringWithNoOverriddenSetter;
+ return this.nonStringWithNoOverriddenSetter;
}
public void setNonStringWithNoOverriddenSetter(Double dbl) {
System.out.println("DSManagedConnectionFactory : setNonStringWithNoOverriddenSetter() called");
- this.nonStringWithNoOverriddenSetter = dbl;
+ this.nonStringWithNoOverriddenSetter = dbl;
}
public Double getNonStringWithOverriddenSetter(){
System.out.println("DSManagedConnectionFactory : getNonStringWithOverriddenSetter() called");
return this.nonStringWithOverriddenSetter;
}
-
+
public void setNonStringWithOverriddenSetter(Double dbl) {
System.out.println("DSManagedConnectionFactory : setNonStringWithOverriddenSetter(Double) called");
this.nonStringWithOverriddenSetter = dbl;
@@ -567,35 +567,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java
index 219a365..4bf8b7b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,22 +114,22 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
@Override
@@ -140,67 +140,67 @@
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
@Override
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
index ff76f00..882ada4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
@@ -17,17 +17,17 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import jakarta.ejb.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -43,14 +43,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -66,14 +66,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -90,7 +90,7 @@
customerSavings = customerSavingsHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -103,7 +103,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -115,7 +115,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -127,12 +127,12 @@
customerSavingsHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -142,7 +142,7 @@
customerSavings = (CustomerSavings)customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -151,7 +151,7 @@
customerChecking = (CustomerChecking)customerCheckingHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -211,9 +211,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/simpleBank.sql b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/simpleBank.sql
index 6ef75c3..e17aef4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/simpleBank.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/sql/simpleBank.sql
@@ -1,14 +1,14 @@
drop table customer2;
create table customer2 (
- SSN varchar2(9),
- lastNAme varchar2(20),
- firstname varchar2(20),
- address1 varchar2 (20),
- address2 varchar2(20),
- city varchar2(10),
- state varchar2(10),
- zipcode varchar2(5),
+ SSN varchar2(9),
+ lastNAme varchar2(20),
+ firstname varchar2(20),
+ address1 varchar2 (20),
+ address2 varchar2(20),
+ city varchar2(10),
+ state varchar2(10),
+ zipcode varchar2(5),
savingsbalance number(10) ,
checkingbalance number(10) );
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml
index 866ebbc..ed74085 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml
@@ -83,7 +83,7 @@
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -94,7 +94,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/build.xml
index 2b77489..783991d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/MyAdminObject.java
index 862f9ff..d199d01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/SimpleActivationSpec.java
index 946d987..bb7918e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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;
@@ -42,7 +42,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -51,7 +51,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -60,7 +60,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -76,7 +76,7 @@
this.resourceadapter = ra;
}
- public void validate() {}
+ public void validate() {}
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/SimpleResourceAdapterImpl.java
index 4cd599c..cef6a56 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -40,15 +40,15 @@
/**
* 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;
private WorkManager wm;
private String testName;
-
+
private Double nonStringPropWithoutOverridedSetter = null;
private Double nonStringPropWithOverridedSetter = null;
private String stringPropWithOverridedSetter = null;
@@ -62,7 +62,7 @@
public void
start(BootstrapContext ctx) throws ResourceAdapterInternalException{
-
+
debug("001. Simple RA start...");
this.ctx = ctx;
@@ -72,21 +72,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
@@ -96,14 +96,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
@@ -120,7 +120,7 @@
ex.printStackTrace();
}
-
+
for (int i = 0 ; i < 3; i++) {
TestWMWork w = new TestWMWork(i, false);
try {
@@ -128,7 +128,7 @@
} catch (Exception ex) {
System.out.println("FAIL: CAUGHT exception : i = " + i);
ex.printStackTrace();
- }
+ }
}
for (int i = 3 ; i < 6; i++) {
@@ -176,7 +176,7 @@
ex.printStackTrace();
}
}
-
+
debug("005. Simple RA start...");
}
@@ -208,12 +208,12 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -227,34 +227,34 @@
debug ("getNonStringPropWithoutOverridedSetter called...");
return this.nonStringPropWithoutOverridedSetter;
}
-
+
public void setNonStringPropWithoutOverridedSetter(Double d) {
debug ("setNonStringPropWithoutOverridedSetter(Double) called...");
this.nonStringPropWithoutOverridedSetter = d;
}
-//
+//
public Double getNonStringPropWithOverridedSetter(){
debug ("getNonStringPropWithOverridedSetter called...");
return this.nonStringPropWithOverridedSetter;
}
-
+
public void setNonStringPropWithOverridedSetter(Double d) {
debug ("setNonStringPropWithOverridedSetter(Double) called...");
this.nonStringPropWithOverridedSetter = d;
}
-
+
public void setNonStringPropWithOverridedSetter(String s) {
debug ("setNonStringPropWithOverridedSetter(String) called..." +
"throwing unsupportedexception");
throw new UnsupportedOperationException();
}
-//
+//
public String getStringPropWithOverridedSetter(){
debug ("getStringPropWithOverridedSetter called...");
return this.stringPropWithOverridedSetter;
}
-
+
public void setStringPropWithOverridedSetter(String s){
debug ("setStringPropWithOverridedSetter(String) called...");
this.stringPropWithOverridedSetter = s;
@@ -265,14 +265,14 @@
"throwing unsupportedOperationException");
throw new UnsupportedOperationException();
}
-
-
+
+
public void debug (String message) {
if (debug)
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/connector/nonstringraproperties/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/TestWMWork.java
index 7e585a3..9cd0663 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/WorkDispatcher.java
index 34a604f..cd98c45 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/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/connector/nonstringraproperties/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/XID.java
index 6a6f84f..f5b977c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/src/connector/XID.java
@@ -31,8 +31,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++;
@@ -50,10 +50,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;
@@ -93,7 +93,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/build.xml
index 6c58efb..edecbae 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/build.xml
@@ -34,8 +34,8 @@
<target name="all" depends="init-common, clean-common">
<ant dir="src" inheritAll="false" target="all"/>
<antcall target="ear-common">
- <param name="appname" value="worktest"/>
- <param name="application.xml" value="META-INF/application.xml"/>
+ <param name="appname" value="worktest"/>
+ <param name="application.xml" value="META-INF/application.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/ejb-jar.xml
index 8c12144..0c619e8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/ejb-jar.xml
@@ -33,8 +33,8 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
<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/connector/threadpool/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/sun-ejb-jar.xml
index 9fc2b60..80a1dc3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/META-INF/sun-ejb-jar.xml
@@ -43,7 +43,7 @@
</ior-security-config>
<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/connector/threadpool/app/src/beans/WorkTestEJB.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
index 1987ead..e591cb4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
@@ -32,13 +32,13 @@
public WorkTestEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean removed");
}
public void executeTest() {
- try {
+ try {
Controls.setup();
Controls.submit();
Controls.triggerWork();
@@ -46,13 +46,13 @@
} catch (Exception e) {
e.printStackTrace(System.out);
throw new EJBException(e);
- }
+ }
}
public void setSessionContext(SessionContext context) {
try {
Context ic = new InitialContext();
- Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/build.properties
index dad207b..0b38c19 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/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/connector/threadpool/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/client/Client.java
index b81bcee..efa7750 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/client/Client.java
@@ -28,22 +28,22 @@
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 ThreadPool "+
- "contracts.");
-
+ "contracts.");
+
String res = "NOT RUN";
- debug("Starting the thread pool test=> Please wait...");
+ debug("Starting the thread pool test=> Please wait...");
boolean pass = false;
try {
res = " TEST PASSED";
@@ -58,14 +58,14 @@
stat.printSummary("Connector-ThreadPool");
-
+
debug("EXITING... STATUS = " + res);
return res;
}
-
+
private void test() throws Exception {
Object o = (new InitialContext()).lookup("WorkTest");
- WorkTestHome home = (WorkTestHome)
+ WorkTestHome home = (WorkTestHome)
PortableRemoteObject.narrow(o, WorkTestHome.class);
WorkTest wt = home.create();
wt.executeTest();
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/build.xml b/appserver/tests/appserv-tests/devtests/connector/threadpool/build.xml
index 7407039..504cd41 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/build.xml
@@ -61,7 +61,7 @@
<target name="run" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="worktest" />
+ <param name="appname" value="worktest" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/build.xml
index 30bfb81..0959d84 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/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="../threadpooltest-ra.jar" basedir="classes"
includes="connector/*.class" />
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/Controls.java
index 2ae3c32..74fee06 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/Controls.java
@@ -42,7 +42,7 @@
public boolean error = false;
private Work[] sWorks = new Work[setupWorks];
-
+
private Controls(WorkManager wm) {
this.wm = wm;
}
@@ -52,7 +52,7 @@
}
public static Controls getControls() {
- return control;
+ return control;
}
public void setupInitialWorks() {
@@ -80,7 +80,7 @@
public void trigger() {
if (completedCount > 0 || rejectedCount > 0 || error) {
- releaseAll();
+ releaseAll();
debug("Completed count => " + completedCount + " Rejected count:"+ rejectedCount + "error: " + error);
throw new RuntimeException("Error while triggering the actual tests");
}
@@ -161,7 +161,7 @@
event.getException().printStackTrace();
} else {
error = true;
- }
+ }
}
}
@@ -211,7 +211,7 @@
}
public void run() {
synchronized (this) {
- try {
+ try {
wait(TIME_OUT+BUFFER);
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/MyAdminObject.java
index e64d053..1760bba 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/MyAdminObject.java
@@ -39,15 +39,15 @@
public void setNumberOfSetupWorks(int count) {
control.setNumberOfSetupWorks(count);
}
-
+
public int getNumberOfSetupWorks() {
return control.getNumberOfSetupWorks();
}
-
+
public void setNumberOfActualWorks(int num) {
control.setNumberOfActualWorks(num);
}
-
+
public int getNumberOfActualWorks() {
return control.getNumberOfActualWorks();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/ThreadPoolTestRA.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/ThreadPoolTestRA.java
index 6bf7f2a..b4b9c32 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/ThreadPoolTestRA.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/src/connector/ThreadPoolTestRA.java
@@ -70,18 +70,18 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
throw new UnsupportedOperationException();
}
-
+
void debug (String message) {
if (debug)
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/connector/txlevelswitch/build.properties b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.properties
index 4686618..db1d575 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector-txlevelswitch-test1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="rarfile" value="jdbc-ra-xa.rar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.xml
index b476022..c4882be 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/build.xml
@@ -38,9 +38,9 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <ant dir="ra" target="clean"/>
+ <ant dir="ra" target="clean"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,25 +54,25 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
<antcall target="build-ra"/>
- <ant dir="ra" target="assemble"/>
- </target>
-
+ <ant dir="ra" target="assemble"/>
+ </target>
+
<target name="deploy" depends="init-common">
- <antcall target="create-ra-config"/>
+ <antcall target="create-ra-config"/>
<antcall target="deploy-rar-common">
- <param name="rarfile" value="ra/publish/lib/jdbc-ra-xa.rar"/>
+ <param name="rarfile" value="ra/publish/lib/jdbc-ra-xa.rar"/>
</antcall>
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="jdbc-ra-xa"/>
- <param name="connection.defname" value="javax.sql.XADataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connector.conpool.name" value="txlevelswitch-pool-1"/>
+ <param name="connection.defname" value="javax.sql.XADataSource"/>
+ <param name="extra-params" value="--matchconnections=false"/>
+ <param name="connector.conpool.name" value="txlevelswitch-pool-1"/>
</antcall>
<antcall target="set-oracle-props">
<param name="pool.type" value="connector"/>
@@ -81,9 +81,9 @@
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="jdbc-ra-xa"/>
- <param name="connection.defname" value="javax.sql.XADataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connector.conpool.name" value="txlevelswitch-pool-2"/>
+ <param name="connection.defname" value="javax.sql.XADataSource"/>
+ <param name="extra-params" value="--matchconnections=false"/>
+ <param name="connector.conpool.name" value="txlevelswitch-pool-2"/>
</antcall>
<antcall target="set-oracle-props">
<param name="pool.type" value="connector"/>
@@ -92,28 +92,28 @@
<antcall target="create-connector-resource-common">
<param name="connector.conpool.name" value="txlevelswitch-pool-1"/>
- <param name="connector.jndi.name" value="test-res-1"/>
+ <param name="connector.jndi.name" value="test-res-1"/>
</antcall>
<antcall target="create-connector-resource-common">
<param name="connector.conpool.name" value="txlevelswitch-pool-2"/>
- <param name="connector.jndi.name" value="test-res-2"/>
+ <param name="connector.jndi.name" value="test-res-2"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="jdbc-ra-xa"/>
+ <param name="operand.props" value="jdbc-ra-xa"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="jdbc-ra-xa"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="jdbc-ra-xa"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
<target name="run" depends="init-common">
@@ -124,7 +124,7 @@
<antcall target="run-test-3"/>
<antcall target="run-test-2"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -144,8 +144,8 @@
</antcall>
<antcall target="undeploy-common"/>
<antcall target="undeploy-rar-common"/>
- <antcall target="delete-ra-config"/>
- </target>
+ <antcall target="delete-ra-config"/>
+ </target>
<target name="build-ra">
<ant dir="ra" target="build"/>
</target>
@@ -153,15 +153,15 @@
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
<target name="run-test-1" depends="init-common">
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="XATransaction"/>
- <param name="poolName" value="txlevelswitch-pool-1"/>
+ <param name="tx-support" value="XATransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-1"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="XATransaction"/>
- <param name="poolName" value="txlevelswitch-pool-2"/>
+ <param name="tx-support" value="XATransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-2"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="1"/>
@@ -170,16 +170,16 @@
<target name="run-test-2" depends="init-common">
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="txlevelswitch-pool-1"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-1"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="txlevelswitch-pool-2"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-2"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="txlevelswitch-pool-1"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-1"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
@@ -188,12 +188,12 @@
<target name="run-test-3" depends="init-common">
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="txlevelswitch-pool-1"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-1"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="XATransaction"/>
- <param name="poolName" value="txlevelswitch-pool-2"/>
+ <param name="tx-support" value="XATransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-2"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="1"/>
@@ -214,13 +214,13 @@
<antcall target="deploy-rar-common"/>
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="jdbc-ra-xa"/>
- <param name="connection.defname" value="javax.sql.XADataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connector.conpool.name" value="txlevelswitch-pool-3"/>
+ <param name="connection.defname" value="javax.sql.XADataSource"/>
+ <param name="extra-params" value="--matchconnections=false"/>
+ <param name="connector.conpool.name" value="txlevelswitch-pool-3"/>
</antcall>
<antcall target="create-connector-resource-common">
<param name="connector.conpool.name" value="txlevelswitch-pool-3"/>
- <param name="connector.jndi.name" value="test-res-3"/>
+ <param name="connector.jndi.name" value="test-res-3"/>
</antcall>
<!--
<antcall target="deploy-jms-common">
@@ -229,20 +229,20 @@
-->
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="jmsra"/>
- <param name="connection.defname" value="jakarta.jms.QueueConnectionFactory"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connector.conpool.name" value="jms-jdbc-res-1"/>
- <param name="operand.props" value="--transactionsupport LocalTransaction"/>
+ <param name="connection.defname" value="jakarta.jms.QueueConnectionFactory"/>
+ <param name="extra-params" value="--matchconnections=false"/>
+ <param name="connector.conpool.name" value="jms-jdbc-res-1"/>
+ <param name="operand.props" value="--transactionsupport LocalTransaction"/>
</antcall>
<antcall target="create-connector-resource-common">
<param name="connector.conpool.name" value="jms-jdbc-res-1"/>
- <param name="connector.jndi.name" value="jms/jms-jdbc-res-1"/>
+ <param name="connector.jndi.name" value="jms/jms-jdbc-res-1"/>
</antcall>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="create-admin-object"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="--restype jakarta.jms.Queue"/>
- <arg line="--raname jmsra"/>
+ <arg line="--raname jmsra"/>
<arg line="${as.props}"/>
<arg line="--property maxNumActiveConsumers=${activeconsumer.maxnum}"/>
<arg line="jms/SampleQueue"/>
@@ -250,7 +250,7 @@
<antcall target="deploy-common"/>
</target>
-
+
<target name="run-for-jms" depends="init-common">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -264,7 +264,7 @@
<!-- negative test : JMS=JDBC=non-xa -->
<antcall target="run-test-3-for-jms"/>
</target>
-
+
<target name="undeploy-for-jms" depends="init-common">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -285,25 +285,25 @@
</antcall>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="delete-admin-object"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${as.props}"/>
<arg line="jms/SampleQueue"/>
</exec>
-
+
<antcall target="undeploy-common"/>
<antcall target="undeploy-rar-common"/>
- </target>
+ </target>
<target name="run-test-1-for-jms" depends="init-common">
<!--
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="txlevelswitch-pool-3"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-3"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="XATransaction"/>
- <param name="poolName" value="jms-jdbc-res-1"/>
+ <param name="tx-support" value="XATransaction"/>
+ <param name="poolName" value="jms-jdbc-res-1"/>
</antcall>
-->
<antcall target="runclient-common">
@@ -313,12 +313,12 @@
<target name="run-test-2-for-jms" depends="init-common">
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="XATransaction"/>
- <param name="poolName" value="txlevelswitch-pool-3"/>
+ <param name="tx-support" value="XATransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-3"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="jms-jdbc-res-1"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="jms-jdbc-res-1"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="jms-jdbc-2"/>
@@ -327,12 +327,12 @@
<target name="run-test-3-for-jms" depends="init-common">
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="txlevelswitch-pool-3"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="txlevelswitch-pool-3"/>
</antcall>
<antcall target="set-pool-tx-support">
- <param name="tx-support" value="LocalTransaction"/>
- <param name="poolName" value="jms-jdbc-res-1"/>
+ <param name="tx-support" value="LocalTransaction"/>
+ <param name="poolName" value="jms-jdbc-res-1"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="jms-jdbc-3"/>
@@ -344,8 +344,8 @@
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
-
+
<target name="drop-sql">
-
+
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/client/Client.java
index f577f57..2b4ea60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/client/Client.java
@@ -26,132 +26,132 @@
import jakarta.jms.*;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "txlevelswitch-test1 ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "txlevelswitch-test1 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running txlevelswitch testSuite1 ");
+
+ stat.addDescription("Running txlevelswitch testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
- if ( "2".equals(args[0]) ) {
- //Here we are using 2 non-XA datasources
- try {
+ if ( "2".equals(args[0]) ) {
+ //Here we are using 2 non-XA datasources
+ try {
if (simpleSession.test2() ) {
- stat.addStatus( testSuite + " test2 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test2 : " , stat.FAIL );
- }
- } catch( Exception e) {
- System.out.println("app threw exception********");
- stat.addStatus(testSuite + " test2 : ", stat.PASS);
- }
- } else if ( "1".equals(args[0]) || "3".equals(args[0])) {
- //Here we are using 2 XA datasources
+ stat.addStatus( testSuite + " test2 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test2 : " , stat.FAIL );
+ }
+ } catch( Exception e) {
+ System.out.println("app threw exception********");
+ stat.addStatus(testSuite + " test2 : ", stat.PASS);
+ }
+ } else if ( "1".equals(args[0]) || "3".equals(args[0])) {
+ //Here we are using 2 XA datasources
if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
-
- } else if ("jms-jdbc-1".equals(args[0]) ) {
- if (simpleSession.jmsJdbcTest1() ) {
-
- System.out.println(" Now waiting for message in client ");
- System.out.println(" Before Lookup of QCF");
- QueueConnectionFactory qcf = (QueueConnectionFactory)
- //ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
- ic.lookup("jms/jms-jdbc-res-1");
- System.out.println(" After Lookup of QCF");
-
- System.out.println(" Before lookup of Q");
- jakarta.jms.Queue queue = (jakarta.jms.Queue) ic.lookup("jms/SampleQueue");
- System.out.println(" After lookup of Q");
- System.out.println(" Before createQueueConnection");
- QueueConnection qConn = qcf.createQueueConnection("guest", "guest");
- qConn.start();
- System.out.println(" After createQueueConnection");
-
- System.out.println(" Before createQueueSession");
- QueueSession qSess = qConn.createQueueSession(false,
- Session.AUTO_ACKNOWLEDGE);
- System.out.println(" After createQueueSession");
- QueueReceiver qRecv = qSess.createReceiver(queue);
- TextMessage textMsg = (TextMessage) qRecv.receive( 20000 );
- //if ( textMsg != null && "Hello World".equals( textMsg.getText() ) ) {
- if ( textMsg != null ) {
- System.out.println(" Text message is : " + textMsg.getText() );
-
- stat.addStatus( testSuite + " jms-jdbc-test1 : " , stat.PASS );
- } else {
- System.out.println(" TextMEssage is null");
- stat.addStatus( testSuite + " jms-jdbc-test1 : ", stat.FAIL );
- }
- qSess.close();
- qConn.close();
-
- stat.addStatus( testSuite + " jms-jdbc-test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " jms-jdbc-test1 : " , stat.FAIL );
- }
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
- } else if ("jms-jdbc-2".equals(args[0]) ) {
- if ( simpleSession.jmsJdbcTest2() ) {
- stat.addStatus( testSuite + " jms-jdbc-test2 : " , stat.PASS );
-
- System.out.println(" Now waiting for message in client ");
- System.out.println(" Before Lookup of QCF");
- QueueConnectionFactory qcf = (QueueConnectionFactory)
- //ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
- ic.lookup("jms/jms-jdbc-res-1");
- System.out.println(" After Lookup of QCF");
-
- System.out.println(" Before lookup of Q");
- jakarta.jms.Queue queue = (jakarta.jms.Queue) ic.lookup("jms/SampleQueue");
- System.out.println(" After lookup of Q");
- System.out.println(" Before createQueueConnection");
- QueueConnection qConn = qcf.createQueueConnection("guest", "guest");
- qConn.start();
- System.out.println(" After createQueueConnection");
-
- System.out.println(" Before createQueueSession");
- QueueSession qSess = qConn.createQueueSession(false,
- Session.AUTO_ACKNOWLEDGE);
- System.out.println(" After createQueueSession");
- QueueReceiver qRecv = qSess.createReceiver(queue);
- TextMessage textMsg = (TextMessage) qRecv.receive( 20000 );
- //if ( textMsg != null && "Hello World".equals( textMsg.getText() ) ) {
- if ( textMsg != null ) {
- System.out.println(" Text message is : " + textMsg.getText() );
-
- stat.addStatus( testSuite + " jms-jdbc-test2 : " , stat.PASS );
- } else {
- System.out.println(" TextMessage is null");
- stat.addStatus( testSuite + " jms-jdbc-test2 : ", stat.FAIL );
- }
- qSess.close();
- qConn.close();
+ } else if ("jms-jdbc-1".equals(args[0]) ) {
+ if (simpleSession.jmsJdbcTest1() ) {
+
+ System.out.println(" Now waiting for message in client ");
+ System.out.println(" Before Lookup of QCF");
+ QueueConnectionFactory qcf = (QueueConnectionFactory)
+ //ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
+ ic.lookup("jms/jms-jdbc-res-1");
+ System.out.println(" After Lookup of QCF");
+
+ System.out.println(" Before lookup of Q");
+ jakarta.jms.Queue queue = (jakarta.jms.Queue) ic.lookup("jms/SampleQueue");
+ System.out.println(" After lookup of Q");
+ System.out.println(" Before createQueueConnection");
+ QueueConnection qConn = qcf.createQueueConnection("guest", "guest");
+ qConn.start();
+ System.out.println(" After createQueueConnection");
+
+ System.out.println(" Before createQueueSession");
+ QueueSession qSess = qConn.createQueueSession(false,
+ Session.AUTO_ACKNOWLEDGE);
+ System.out.println(" After createQueueSession");
+ QueueReceiver qRecv = qSess.createReceiver(queue);
+ TextMessage textMsg = (TextMessage) qRecv.receive( 20000 );
+ //if ( textMsg != null && "Hello World".equals( textMsg.getText() ) ) {
+ if ( textMsg != null ) {
+ System.out.println(" Text message is : " + textMsg.getText() );
+
+ stat.addStatus( testSuite + " jms-jdbc-test1 : " , stat.PASS );
+ } else {
+ System.out.println(" TextMEssage is null");
+ stat.addStatus( testSuite + " jms-jdbc-test1 : ", stat.FAIL );
+ }
+ qSess.close();
+ qConn.close();
+
+ stat.addStatus( testSuite + " jms-jdbc-test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " jms-jdbc-test1 : " , stat.FAIL );
+ }
+
+ } else if ("jms-jdbc-2".equals(args[0]) ) {
+ if ( simpleSession.jmsJdbcTest2() ) {
+ stat.addStatus( testSuite + " jms-jdbc-test2 : " , stat.PASS );
+
+ System.out.println(" Now waiting for message in client ");
+ System.out.println(" Before Lookup of QCF");
+ QueueConnectionFactory qcf = (QueueConnectionFactory)
+ //ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
+ ic.lookup("jms/jms-jdbc-res-1");
+ System.out.println(" After Lookup of QCF");
+
+ System.out.println(" Before lookup of Q");
+ jakarta.jms.Queue queue = (jakarta.jms.Queue) ic.lookup("jms/SampleQueue");
+ System.out.println(" After lookup of Q");
+ System.out.println(" Before createQueueConnection");
+ QueueConnection qConn = qcf.createQueueConnection("guest", "guest");
+ qConn.start();
+ System.out.println(" After createQueueConnection");
+
+ System.out.println(" Before createQueueSession");
+ QueueSession qSess = qConn.createQueueSession(false,
+ Session.AUTO_ACKNOWLEDGE);
+ System.out.println(" After createQueueSession");
+ QueueReceiver qRecv = qSess.createReceiver(queue);
+ TextMessage textMsg = (TextMessage) qRecv.receive( 20000 );
+ //if ( textMsg != null && "Hello World".equals( textMsg.getText() ) ) {
+ if ( textMsg != null ) {
+ System.out.println(" Text message is : " + textMsg.getText() );
+
+ stat.addStatus( testSuite + " jms-jdbc-test2 : " , stat.PASS );
+ } else {
+ System.out.println(" TextMessage is null");
+ stat.addStatus( testSuite + " jms-jdbc-test2 : ", stat.FAIL );
+ }
+ qSess.close();
+ qConn.close();
- } else {
- stat.addStatus( testSuite + " jms-jdbc-test2 : " , stat.FAIL );
- }
+ } else {
+ stat.addStatus( testSuite + " jms-jdbc-test2 : " , stat.FAIL );
+ }
- } else if ( "jms-jdbc-3".equals(args[0]) ) {
+ } else if ( "jms-jdbc-3".equals(args[0]) ) {
if ( simpleSession.jmsJdbcTest3()) {
- stat.addStatus( testSuite + " jms-jdbc-test3 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " jms-jdbc-test3 : " , stat.FAIL );
- }
- }
+ stat.addStatus( testSuite + " jms-jdbc-test3 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " jms-jdbc-test3 : " , stat.FAIL );
+ }
+ }
-
- stat.printSummary();
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/ejb-jar.xml
index f915011..01ebefc 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/ejb-jar.xml
@@ -75,6 +75,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/sun-ejb-jar.xml
index 0240689..3e77640 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/descriptor/sun-ejb-jar.xml
@@ -34,15 +34,15 @@
</resource-ref>
<resource-ref>
<res-ref-name>jms/SampleQueue</res-ref-name>
- <jndi-name>jms/SampleQueue</jndi-name>
+ <jndi-name>jms/SampleQueue</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>jms/jms-jdbc-res-1</res-ref-name>
- <jndi-name>jms/jms-jdbc-res-1</jndi-name>
+ <jndi-name>jms/jms-jdbc-res-1</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>test-res-3</res-ref-name>
- <jndi-name>test-res-3</jndi-name>
+ <jndi-name>test-res-3</jndi-name>
</resource-ref>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
index 76fc38c..8ad8a8f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
@@ -49,69 +49,69 @@
* This should work since for this test both our pools are XA
*/
public boolean test1() throws Exception {
- System.out.println("************IN TEST 1*************");
- InitialContext ic = new InitialContext();
- DataSource ds1 = (DataSource)ic.lookup("java:comp/env/DataSource1");
- DataSource ds2 = (DataSource)ic.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Connection conn2 = null;
- Statement stmt1 = null;
- Statement stmt2 = null;
- ResultSet rs1 = null;
- ResultSet rs2 = null;
- boolean passed = true;
- try {
- System.out.println("Before getConnection 1");
- conn1 = ds1.getConnection();
- System.out.println("After getConnection 1");
- System.out.println("Before getConnection 2");
- conn2 = ds2.getConnection();
- System.out.println("After getConnection 2");
-
- System.out.println("Before createStatement 1");
- stmt1 = conn1.createStatement();
- System.out.println("After createStatement 1");
- System.out.println("Before createStatement 2");
- stmt2 = conn2.createStatement();
- System.out.println("After createStatement 2");
+ System.out.println("************IN TEST 1*************");
+ InitialContext ic = new InitialContext();
+ DataSource ds1 = (DataSource)ic.lookup("java:comp/env/DataSource1");
+ DataSource ds2 = (DataSource)ic.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Connection conn2 = null;
+ Statement stmt1 = null;
+ Statement stmt2 = null;
+ ResultSet rs1 = null;
+ ResultSet rs2 = null;
+ boolean passed = true;
+ try {
+ System.out.println("Before getConnection 1");
+ conn1 = ds1.getConnection();
+ System.out.println("After getConnection 1");
+ System.out.println("Before getConnection 2");
+ conn2 = ds2.getConnection();
+ System.out.println("After getConnection 2");
- System.out.println("executing statement 1");
- rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+ System.out.println("Before createStatement 1");
+ stmt1 = conn1.createStatement();
+ System.out.println("After createStatement 1");
+ System.out.println("Before createStatement 2");
+ stmt2 = conn2.createStatement();
+ System.out.println("After createStatement 2");
- System.out.println("executing statement 2");
+ System.out.println("executing statement 1");
+ rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+
+ System.out.println("executing statement 2");
rs2 = stmt2.executeQuery("SELECT * FROM TXLEVELSWITCH2");
- System.out.println("finished executing statements");
- passed = rs1.next() & rs2.next();
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
+ System.out.println("finished executing statements");
+ passed = rs1.next() & rs2.next();
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
- if (rs2 != null ) {
- try { rs2.close(); } catch( Exception e1 ) {}
- }
+ if (rs2 != null ) {
+ try { rs2.close(); } catch( Exception e1 ) {}
+ }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( stmt2 != null ) {
- try { stmt2.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- if ( conn2 != null ) {
- try { conn2.close(); } catch( Exception e1) {}
- }
- }
-
- return passed;
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( stmt2 != null ) {
+ try { stmt2.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ if ( conn2 != null ) {
+ try { conn2.close(); } catch( Exception e1) {}
+ }
}
-
+
+ return passed;
+ }
+
/**
* Get connection with two non-xa datasources.
* Do some work using both. Should throw an
@@ -122,150 +122,150 @@
* changeover is indeed successful
*/
public boolean test2() throws Exception {
- System.out.println("************IN TEST 2*************");
- InitialContext ic = new InitialContext();
- DataSource ds1 = (DataSource)ic.lookup("java:comp/env/DataSource1");
- DataSource ds2 = (DataSource)ic.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Connection conn2 = null;
- Statement stmt1 = null;
- Statement stmt2 = null;
- ResultSet rs1 = null;
- ResultSet rs2 = null;
- boolean passed = true;
- try {
- System.out.println("Before getConnection 1");
- conn1 = ds1.getConnection();
- System.out.println("After getConnection 1");
- System.out.println("Before getConnection 2");
- conn2 = ds2.getConnection();
- System.out.println("After getConnection 2");
-
- System.out.println("Before createStatement 1");
- stmt1 = conn1.createStatement();
- System.out.println("After createStatement 1");
- System.out.println("Before createStatement 2");
- stmt2 = conn2.createStatement();
- System.out.println("After createStatement 2");
-
- System.out.println("executing statement 1");
+ System.out.println("************IN TEST 2*************");
+ InitialContext ic = new InitialContext();
+ DataSource ds1 = (DataSource)ic.lookup("java:comp/env/DataSource1");
+ DataSource ds2 = (DataSource)ic.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Connection conn2 = null;
+ Statement stmt1 = null;
+ Statement stmt2 = null;
+ ResultSet rs1 = null;
+ ResultSet rs2 = null;
+ boolean passed = true;
+ try {
+ System.out.println("Before getConnection 1");
+ conn1 = ds1.getConnection();
+ System.out.println("After getConnection 1");
+ System.out.println("Before getConnection 2");
+ conn2 = ds2.getConnection();
+ System.out.println("After getConnection 2");
- try {
- rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+ System.out.println("Before createStatement 1");
+ stmt1 = conn1.createStatement();
+ System.out.println("After createStatement 1");
+ System.out.println("Before createStatement 2");
+ stmt2 = conn2.createStatement();
+ System.out.println("After createStatement 2");
+
+ System.out.println("executing statement 1");
+
+ try {
+ rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
} catch( Exception e2 ) {
- System.out.println("Exception for first query :" + e2.getMessage() );
- } finally {
- passed = false;
+ System.out.println("Exception for first query :" + e2.getMessage() );
+ } finally {
+ passed = false;
}
-
- System.out.println("executing statement 2");
- try {
- rs2 = stmt2.executeQuery("SELECT * FROM TXLEVELSWITCH2");
- } catch( Exception e2) {
- System.out.println("Exception for second query :" + e2.getMessage() );
- } finally {
- passed = false;
- }
- System.out.println("finished executing statements");
- passed = !(rs1.next() & rs2.next());
- } catch (Exception e) {
- passed = true;
- System.out.println("final exception : " + e.getMessage() );
- throw new EJBException(e);
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
+ System.out.println("executing statement 2");
+ try {
+ rs2 = stmt2.executeQuery("SELECT * FROM TXLEVELSWITCH2");
+ } catch( Exception e2) {
+ System.out.println("Exception for second query :" + e2.getMessage() );
+ } finally {
+ passed = false;
+ }
- if (rs2 != null ) {
- try { rs2.close(); } catch( Exception e1 ) {}
- }
+ System.out.println("finished executing statements");
+ passed = !(rs1.next() & rs2.next());
+ } catch (Exception e) {
+ passed = true;
+ System.out.println("final exception : " + e.getMessage() );
+ throw new EJBException(e);
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( stmt2 != null ) {
- try { stmt2.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- if ( conn2 != null ) {
- try { conn2.close(); } catch( Exception e1) {}
- }
- }
- return passed;
+ if (rs2 != null ) {
+ try { rs2.close(); } catch( Exception e1 ) {}
+ }
+
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( stmt2 != null ) {
+ try { stmt2.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ if ( conn2 != null ) {
+ try { conn2.close(); } catch( Exception e1) {}
+ }
+ }
+ return passed;
}
/**
* Get connection with one non-XA datasource and then getConnection
- * with a JMS resource
+ * with a JMS resource
*/
public boolean jmsJdbcTest1() throws Exception {
- System.out.println("************IN jmsJdbcTest 1*************");
- InitialContext ic = new InitialContext();
- DataSource ds1 = (DataSource)ic.lookup("java:comp/env/test-res-3");
- QueueConnectionFactory qcf = (QueueConnectionFactory)
- ic.lookup("jms/jms-jdbc-res-1");
- Queue q = (Queue) ic.lookup("java:comp/env/jms/SampleQueue");
+ System.out.println("************IN jmsJdbcTest 1*************");
+ InitialContext ic = new InitialContext();
+ DataSource ds1 = (DataSource)ic.lookup("java:comp/env/test-res-3");
+ QueueConnectionFactory qcf = (QueueConnectionFactory)
+ ic.lookup("jms/jms-jdbc-res-1");
+ Queue q = (Queue) ic.lookup("java:comp/env/jms/SampleQueue");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
- QueueSession qSess = null;
- QueueConnection qConn = null;
- QueueSender qSender = null;
- TextMessage message = null;
-
- boolean passed = false;
- try {
- System.out.println("Before getConnection 1");
- conn1 = ds1.getConnection();
- System.out.println("After getConnection 1");
+ QueueSession qSess = null;
+ QueueConnection qConn = null;
+ QueueSender qSender = null;
+ TextMessage message = null;
+
+ boolean passed = false;
+ try {
+ System.out.println("Before getConnection 1");
+ conn1 = ds1.getConnection();
+ System.out.println("After getConnection 1");
System.out.println(" Before createStatent");
- stmt1 = conn1.createStatement();
+ stmt1 = conn1.createStatement();
System.out.println(" After createStatent");
- System.out.println(" Before executeQuery");
- rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
- System.out.println(" After executeQuery");
- System.out.println("Before createQueueConnection");
- qConn = qcf.createQueueConnection();
- System.out.println("After createQueueConnection");
- System.out.println("Before createQueueSession");
- qSess = qConn.createQueueSession( false, Session.AUTO_ACKNOWLEDGE );
- System.out.println("After createQueueSession");
- qSender = qSess.createSender( q );
- message = qSess.createTextMessage();
- message.setText( "Hello World");
- qSender.send( message );
- System.out.println(" Sent Message");
- passed = true;
-
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if ( rs1 != null ) {
- try { rs1.close();} catch( Exception e1) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close();} catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- if ( qSess != null ) {
- try { qSess.close();} catch(Exception e1) {}
- }
-
- if ( qConn != null ) {
- try { qConn.close(); } catch( Exception e1) {}
- }
- }
-
- return passed;
+ System.out.println(" Before executeQuery");
+ rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+ System.out.println(" After executeQuery");
+ System.out.println("Before createQueueConnection");
+ qConn = qcf.createQueueConnection();
+ System.out.println("After createQueueConnection");
+ System.out.println("Before createQueueSession");
+ qSess = qConn.createQueueSession( false, Session.AUTO_ACKNOWLEDGE );
+ System.out.println("After createQueueSession");
+ qSender = qSess.createSender( q );
+ message = qSess.createTextMessage();
+ message.setText( "Hello World");
+ qSender.send( message );
+ System.out.println(" Sent Message");
+ passed = true;
+
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if ( rs1 != null ) {
+ try { rs1.close();} catch( Exception e1) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close();} catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ if ( qSess != null ) {
+ try { qSess.close();} catch(Exception e1) {}
+ }
+
+ if ( qConn != null ) {
+ try { qConn.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
/**
@@ -273,69 +273,69 @@
* with a JMS resource as non-xa
*/
public boolean jmsJdbcTest2() throws Exception {
- System.out.println("************IN jmsJdbcTest 2*************");
- InitialContext ic = new InitialContext();
- DataSource ds1 = (DataSource)ic.lookup("java:comp/env/test-res-3");
- QueueConnectionFactory qcf = (QueueConnectionFactory)
- ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
- Queue q = (Queue) ic.lookup("java:comp/env/jms/SampleQueue");
+ System.out.println("************IN jmsJdbcTest 2*************");
+ InitialContext ic = new InitialContext();
+ DataSource ds1 = (DataSource)ic.lookup("java:comp/env/test-res-3");
+ QueueConnectionFactory qcf = (QueueConnectionFactory)
+ ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
+ Queue q = (Queue) ic.lookup("java:comp/env/jms/SampleQueue");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
- QueueSession qSess = null;
- QueueConnection qConn = null;
- QueueSender qSender = null;
- TextMessage message = null;
-
- boolean passed = true;
- try {
- System.out.println("Before getConnection 1");
- conn1 = ds1.getConnection();
- System.out.println("After getConnection 1");
+ QueueSession qSess = null;
+ QueueConnection qConn = null;
+ QueueSender qSender = null;
+ TextMessage message = null;
+
+ boolean passed = true;
+ try {
+ System.out.println("Before getConnection 1");
+ conn1 = ds1.getConnection();
+ System.out.println("After getConnection 1");
System.out.println(" Before createStatent");
- stmt1 = conn1.createStatement();
+ stmt1 = conn1.createStatement();
System.out.println(" After createStatent");
- System.out.println(" Before executeQuery");
- rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
- System.out.println(" After executeQuery");
+ System.out.println(" Before executeQuery");
+ rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+ System.out.println(" After executeQuery");
- System.out.println("Before createQueueConnection");
- qConn = qcf.createQueueConnection();
- System.out.println("After createQueueConnection");
- System.out.println("Before createQueueSession");
- qSess = qConn.createQueueSession( false, Session.AUTO_ACKNOWLEDGE );
- System.out.println("After createQueueSession");
- qSender = qSess.createSender( q );
- message = qSess.createTextMessage();
- message.setText( "Hello World");
- qSender.send( message );
- System.out.println(" Sent message");
-
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if ( rs1 != null ) {
- try { rs1.close();} catch( Exception e1) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close();} catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- if ( qSess != null ) {
- try { qSess.close();} catch(Exception e1) {}
- }
-
- if ( qConn != null ) {
- try { qConn.close(); } catch( Exception e1) {}
- }
- }
+ System.out.println("Before createQueueConnection");
+ qConn = qcf.createQueueConnection();
+ System.out.println("After createQueueConnection");
+ System.out.println("Before createQueueSession");
+ qSess = qConn.createQueueSession( false, Session.AUTO_ACKNOWLEDGE );
+ System.out.println("After createQueueSession");
+ qSender = qSess.createSender( q );
+ message = qSess.createTextMessage();
+ message.setText( "Hello World");
+ qSender.send( message );
+ System.out.println(" Sent message");
- return passed;
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if ( rs1 != null ) {
+ try { rs1.close();} catch( Exception e1) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close();} catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ if ( qSess != null ) {
+ try { qSess.close();} catch(Exception e1) {}
+ }
+
+ if ( qConn != null ) {
+ try { qConn.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
/**
@@ -343,69 +343,69 @@
* with a JMS resource as non-xa
*/
public boolean jmsJdbcTest3() throws Exception {
- System.out.println("************IN jmsJdbcTest 3*************");
- InitialContext ic = new InitialContext();
- DataSource ds1 = (DataSource)ic.lookup("java:comp/env/test-res-3");
- QueueConnectionFactory qcf = (QueueConnectionFactory)
- ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
- Queue q = (Queue) ic.lookup("java:comp/env/jms/SampleQueue");
+ System.out.println("************IN jmsJdbcTest 3*************");
+ InitialContext ic = new InitialContext();
+ DataSource ds1 = (DataSource)ic.lookup("java:comp/env/test-res-3");
+ QueueConnectionFactory qcf = (QueueConnectionFactory)
+ ic.lookup("java:comp/env/jms/jms-jdbc-res-1");
+ Queue q = (Queue) ic.lookup("java:comp/env/jms/SampleQueue");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
- QueueSession qSess = null;
- QueueConnection qConn = null;
- QueueSender qSender = null;
- TextMessage message = null;
-
- boolean passed = false;
- try {
- System.out.println("Before getConnection 1");
- conn1 = ds1.getConnection();
- System.out.println("After getConnection 1");
+ QueueSession qSess = null;
+ QueueConnection qConn = null;
+ QueueSender qSender = null;
+ TextMessage message = null;
+
+ boolean passed = false;
+ try {
+ System.out.println("Before getConnection 1");
+ conn1 = ds1.getConnection();
+ System.out.println("After getConnection 1");
System.out.println(" Before createStatent");
- stmt1 = conn1.createStatement();
+ stmt1 = conn1.createStatement();
System.out.println(" After createStatent");
- System.out.println(" Before executeQuery");
- rs1 = stmt1.executeQuery("SELECT * FROM DBUSER.TXLEVELSWITCH");
- System.out.println(" After executeQuery");
+ System.out.println(" Before executeQuery");
+ rs1 = stmt1.executeQuery("SELECT * FROM DBUSER.TXLEVELSWITCH");
+ System.out.println(" After executeQuery");
- System.out.println("Before createQueueConnection");
- qConn = qcf.createQueueConnection();
- System.out.println("After createQueueConnection");
- System.out.println("Before createQueueSession");
- qSess = qConn.createQueueSession( false, Session.AUTO_ACKNOWLEDGE );
- System.out.println("After createQueueSession");
- qSender = qSess.createSender( q );
- message = qSess.createTextMessage();
- message.setText( "Hello World");
- qSender.send( message );
- System.out.println(" Sent message");
-
- } catch (Exception e) {
- passed = true;
- e.printStackTrace();
- } finally {
- if ( rs1 != null ) {
- try { rs1.close();} catch( Exception e1) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close();} catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- if ( qSess != null ) {
- try { qSess.close();} catch(Exception e1) {}
- }
-
- if ( qConn != null ) {
- try { qConn.close(); } catch( Exception e1) {}
- }
- }
+ System.out.println("Before createQueueConnection");
+ qConn = qcf.createQueueConnection();
+ System.out.println("After createQueueConnection");
+ System.out.println("Before createQueueSession");
+ qSess = qConn.createQueueSession( false, Session.AUTO_ACKNOWLEDGE );
+ System.out.println("After createQueueSession");
+ qSender = qSess.createSender( q );
+ message = qSess.createTextMessage();
+ message.setText( "Hello World");
+ qSender.send( message );
+ System.out.println(" Sent message");
- return passed;
+ } catch (Exception e) {
+ passed = true;
+ e.printStackTrace();
+ } finally {
+ if ( rs1 != null ) {
+ try { rs1.close();} catch( Exception e1) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close();} catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ if ( qSess != null ) {
+ try { qSess.close();} catch(Exception e1) {}
+ }
+
+ if ( qConn != null ) {
+ try { qConn.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.xml
index 2513dad..11082e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/build.xml
@@ -23,29 +23,29 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
failonerror="true">
<classpath>
@@ -57,28 +57,28 @@
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-xa.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-xa.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbc-ra-xa.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbc-ra-xa.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index a854d24..998f3f6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
@@ -277,184 +277,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -504,151 +504,151 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 6590a84..6c5076b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml
index a1a70f6..ae9f8fe 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.XAManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -128,7 +128,7 @@
<config-property-value>testdb</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbuser</config-property-value>
@@ -139,12 +139,12 @@
<config-property-value>dbuser</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbpassword</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -154,7 +154,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>-->
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
@@ -165,17 +165,17 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
@@ -186,7 +186,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientXADataSource40</config-property-value>
@@ -198,82 +198,82 @@
</config-property>
<!--
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
-->
<connectionfactory-interface>javax.sql.XADataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>XATransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/DataSource.java
index 30da1fe..295c3fb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re);
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re);
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re);
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re);
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,91 +114,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
@@ -206,6 +206,6 @@
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false;
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAManagedConnectionFactory.java
index 422658d..4c26009 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAManagedConnectionFactory.java
@@ -32,36 +32,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class XAManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.XADataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -69,20 +69,20 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.XADataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
javax.sql.XAConnection xaConn = null;
try {
@@ -104,7 +104,7 @@
_logger.log(Level.FINE, "jdbc.exc_create_xa_conn", sqle);
throw new ResourceAllocationException("cannot allocate connection", sqle);
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(xaConn, null, pc, this);
mc.initializeConnectionType(ManagedConnection.ISXACONNECTION);
@@ -112,15 +112,15 @@
// validateAndSetIsolation(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -131,409 +131,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.XAManagedConnectionFactory) {
- com.sun.jdbcra.spi.XAManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.XAManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.XAManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -543,35 +543,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/create_pointbase.sql
index 4234115..ed6dbab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
-INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
-
-Drop table TXLEVELSWITCH2;
-
-CREATE TABLE TXLEVELSWITCH2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
-INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
-
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
+INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
+
+Drop table TXLEVELSWITCH2;
+
+CREATE TABLE TXLEVELSWITCH2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
+INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
index 5ad0b12..05df128 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
-<property name="appname" value="${module}-embedded-cci"/>
+<property name="appname" value="${module}-embedded-cci"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="db.type" value="pointbase"/>
@@ -29,7 +29,7 @@
<property name="sun-cmp-dbschema" value="descriptor/sec_bankadmin_schema.dbschema"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="rarname" value="cciblackbox-tx"/>
+<property name="rarname" value="cciblackbox-tx"/> \u0020
<property name="jdbc.drivers" value="com.pointbase.jdbc.jdbcUniversalDriver"/>
<property name="contextroot" value="/cci-embedded/servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
index 29cac50..17bb5af 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
@@ -93,7 +93,7 @@
</target>
<!--
- Custom target for compilation with local libraries for connector
+ Custom target for compilation with local libraries for connector
-->
<target name="compile-cci" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/CoffeeClient.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/CoffeeClient.java
index 05ca038..7714870 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/CoffeeClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/client/CoffeeClient.java
@@ -73,4 +73,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
index 563ee3a..0709b15 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -128,4 +128,4 @@
public void ejbPassivate() {
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
index a2e3f64..d06b977 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
-<property name="appname" value="connector-cci"/>
+<property name="appname" value="connector-cci"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="db.type" value="pointbase"/>
@@ -29,7 +29,7 @@
<property name="sun-cmp-dbschema" value="descriptor/sec_bankadmin_schema.dbschema"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="rarname" value="cciblackbox-tx"/>
+<property name="rarname" value="cciblackbox-tx"/> \u0020
<property name="jdbc.drivers" value="com.pointbase.jdbc.jdbcUniversalDriver"/>
<property name="contextroot" value="/connector-cci/servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/CoffeeClient.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/CoffeeClient.java
index 69d3bc5..e056cb0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/CoffeeClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/client/CoffeeClient.java
@@ -73,4 +73,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
index 37882c4..c45dd70 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
@@ -128,4 +128,4 @@
public void ejbPassivate() {
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/sql/cci-pb.sql b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/sql/cci-pb.sql
index 6cd6d4a..dfaf952 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/sql/cci-pb.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/sql/cci-pb.sql
@@ -16,5 +16,5 @@
LANGUAGE JAVA
MODIFIES SQL DATA
EXTERNAL NAME 'SampleExternalMethods.insertCoffee';
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.properties
index 6290a41..c23a95d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/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="administered-object-definition-embedra"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.xml
index a9a1091..2ca3289 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/build.xml
@@ -37,10 +37,10 @@
</target>
<target name="info" depends="init-common">
- <echo message="build.classes.dir is ${build.classes.dir}"/>
- <echo message="s1astest.classpath is ${s1astest.classpath}"/>
+ <echo message="build.classes.dir is ${build.classes.dir}"/>
+ <echo message="s1astest.classpath is ${s1astest.classpath}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,7 +48,7 @@
</target>
<target name="build" depends="compile">
- <echo message="assemble.dir = ${assemble.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}"/>
<!--build and package .war first so it doesn't contain ejb bean !-->
<!--classes that have @Stateless/@Stateul !-->
<antcall target="webclient-war-common">
@@ -71,23 +71,23 @@
<param name="ejbjar.classes"
value="**/Hello**.class"/>
</antcall>
-
+
<ant dir="ra" target="all"/>
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/">
<include name="*.rar"/>
</fileset>
</ear>
-
+
</target>
<target name="setup" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/client/Client.java
index a684837..1287fcd 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/client/Client.java
@@ -58,7 +58,7 @@
} else {
stat.addStatus(tcName, stat.PASS);
}
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -79,7 +79,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null)
System.out.println(line);
if (code != 200) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/application.xml
index aebd3a1..3d71621 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/application.xml
@@ -36,7 +36,7 @@
<module>
<connector>aod-ra.rar</connector>
</module>
-
+
<administered-object>
<description>global-scope resource defined in application DD</description>
<name>java:global/env/EAR_AdminObject</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/connector-resource.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/connector-resource.xml
index fa6df72..131ac02 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/connector-resource.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/connector-resource.xml
@@ -20,12 +20,12 @@
<connector-resource xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd>
- <description>global-scope resource defined in application DD</description>
- <name>java:global/env/Application_Level_ConnectionFactory</name>
- <class-name>jakarta.resource.cci.ConnectionFactory</class-name>
- <resource-adapter>#crd-ra</resource-adapter>
- <property>
- <name>transactionSupport</name>
- <value>LocalTransaction</value>
- </property>
+ <description>global-scope resource defined in application DD</description>
+ <name>java:global/env/Application_Level_ConnectionFactory</name>
+ <class-name>jakarta.resource.cci.ConnectionFactory</class-name>
+ <resource-adapter>#crd-ra</resource-adapter>
+ <property>
+ <name>transactionSupport</name>
+ <value>LocalTransaction</value>
+ </property>
</connector-resource>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/ejb-jar.xml
index e574cd1..30e5000 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/ejb-jar.xml
@@ -18,9 +18,9 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false"
- version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false"
+ version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>administered-object-definition-ejb</module-name>
<enterprise-beans>
@@ -29,7 +29,7 @@
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStateful</business-local>
<ejb-class>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStatefulEJB</ejb-class>
-
+
<administered-object>
<description>global-scope resource to be modified by DD</description>
<name>java:global/env/HelloStatefulEJB_ModByDD_AdminObject</name>
@@ -53,7 +53,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/HelloStatefulEJB_DD_AdminObject</name>
@@ -65,7 +65,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloStatefulEJB_DD_AdminObject</name>
@@ -77,7 +77,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/HelloStatefulEJB_DD_AdminObject</name>
@@ -89,7 +89,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</session>
<session>
<display-name>HelloEJB</display-name>
@@ -120,7 +120,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloEJB_DD_AdminObject</name>
@@ -156,8 +156,8 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</session>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/web.xml
index 4d4c93a..036e47f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/descriptor/web.xml
@@ -18,8 +18,8 @@
-->
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
version="3.1"
metadata-complete="false">
@@ -70,7 +70,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in Web DD</description>
<name>java:module/env/Web_DD_AdminObject</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
index bda5961..3bb1833 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
@@ -33,35 +33,35 @@
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
@AdministeredObjectDefinition(
- description = "global-scope resource defined by @AdministeredObjectDefinition",
- name = "java:global/env/HelloEJB_Annotation_AdminObject",
+ description = "global-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:global/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="#aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
- description = "application-scope resource defined by @AdministeredObjectDefinition",
- name = "java:app/env/HelloEJB_Annotation_AdminObject",
+ description = "application-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:app/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="#aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
- description = "module-scope resource defined by @AdministeredObjectDefinition",
- name = "java:module/env/HelloEJB_Annotation_AdminObject",
+ description = "module-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:module/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="#aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
- description = "component-scope resource defined by @AdministeredObjectDefinition",
- name = "java:comp/env/HelloEJB_Annotation_AdminObject",
+ description = "component-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:comp/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="#aod-ra",
@@ -109,7 +109,7 @@
lookupAdminObject("java:app/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:module/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:comp/env/HelloEJB_DD_AdminObject", true);
-
+
System.out.println("In HelloEJB::hello()");
}
@@ -127,6 +127,6 @@
}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
index 45888fa..c9c410c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
@@ -115,7 +115,7 @@
lookupAdminObject("java:app/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:module/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:comp/env/HelloEJB_DD_AdminObject", false);
-
+
System.out.println("StatefulEJB datasource-definitions Success");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/AbstractResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/AbstractResourceAdapter.java
index 07b9d78..0efcc5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/AbstractResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/AbstractResourceAdapter.java
@@ -23,7 +23,7 @@
private String testName;
protected boolean debug = true;
-
+
public String getTestName() {
return testName;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/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/connector/v3/administered-object-definition-embedra/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/DeliveryWork.java
index 7e3635f..2be65f9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/DeliveryWork.java
@@ -22,7 +22,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
@@ -31,7 +31,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;
@@ -39,7 +39,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;
@@ -50,7 +50,7 @@
public void run() {
debug("ENTER...");
-
+
try {
//Method onMessage = getOnMessageMethod();
//ep.beforeDelivery(onMessage);
@@ -73,11 +73,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -88,14 +88,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/connector/v3/administered-object-definition-embedra/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/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/connector/v3/administered-object-definition-embedra/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/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/connector/v3/administered-object-definition-embedra/ra/src/connector/MyConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyConnectionFactory.java
index 9f24648..922e71d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyConnectionFactory.java
@@ -32,7 +32,7 @@
private ConnectionManager cm;
private MyManagedConnectionFactory mcf;
private Reference ref;
-
+
public MyConnectionFactory(MyManagedConnectionFactory mcf, ConnectionManager cm) {
super();
this.mcf = mcf;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java
index 05b3118..a561763 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java
@@ -44,7 +44,7 @@
private ConnectionManager cm;
private PrintWriter writer;
private TransactionSupportLevel transactionSupport = TransactionSupportLevel.LocalTransaction;;
-
+
public String getTestName() {
return testName;
}
@@ -69,7 +69,7 @@
}
@Override
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
@@ -80,7 +80,7 @@
}
@Override
- public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
+ public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyWork.java
index 614381e..44899a0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/MyWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class MyWork implements Work {
@@ -31,7 +31,7 @@
private boolean stop = false;
private MessageEndpointFactory factory;
private WorkManager wm;
-
+
public MyWork(
String name, MessageEndpointFactory factory, WorkManager wm) {
this.factory = factory;
@@ -49,7 +49,7 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
/*
@@ -66,7 +66,7 @@
ex.printStackTrace();
}
}
-
+
debug("LEAVE...");
}
@@ -81,14 +81,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/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleActivationSpec.java
index 512e5c6..4b5e5f1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleActivationSpec.java
@@ -25,12 +25,12 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Activation(
messageListeners = {connector.MyMessageListener.class}
)
-public class SimpleActivationSpec
+public class SimpleActivationSpec
implements ActivationSpec, java.io.Serializable {
private String destinationName;
@@ -47,7 +47,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -56,7 +56,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -65,7 +65,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -98,7 +98,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java
index 28d9e29..d1c26bb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -29,14 +29,14 @@
/**
* This is a sample resource adapter
- *
+ *
* @author Qingqing Ouyang
*/
@Connector(
/* moduleName="My Simple RAR", */
- displayName = "Simple Resource Adapter",
- vendorName = "Java Software",
- eisType = "Generic Type",
+ displayName = "Simple Resource Adapter",
+ vendorName = "Java Software",
+ eisType = "Generic Type",
version = "1.0Alpha",
transactionSupport=TransactionSupportLevel.XATransaction)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/TestWMWork.java
index ee0fae9..e248506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/TestWMWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class TestWMWork implements Work {
@@ -37,8 +37,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;
@@ -72,10 +72,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());
}
}
@@ -87,7 +87,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/connector/v3/administered-object-definition-embedra/ra/src/connector/V3WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/V3WorkDispatcher.java
index 8adf3cc..4b43783 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/V3WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/V3WorkDispatcher.java
@@ -43,7 +43,7 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
try {
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 1;
@@ -72,7 +72,7 @@
debug("V3WorkDispatcher calling DONE()");
done();
debug("V3WorkDispatcher finished calling DONE()");
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/WorkDispatcher.java
index 42249dc..a14443a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/WorkDispatcher.java
@@ -32,7 +32,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -43,11 +43,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected XATerminator xa;
-
+
public WorkDispatcher(
String id,
BootstrapContext ctx,
- MessageEndpointFactory factory,
+ MessageEndpointFactory factory,
ActivationSpec spec) {
this.id = id;
this.ctx = ctx;
@@ -60,7 +60,7 @@
public void run() {
debug("ENTER...");
-
+
try {
synchronized (Controls.readyLock) {
debug("WAIT...");
@@ -82,26 +82,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);
@@ -109,7 +109,7 @@
debug("DONE WRITE TO DB");
Controls.expectedResults = numOfMessages;
notifyAndWait();
-
+
//delete/rollback
ec = startTx();
debug("Start TX - " + ec.getXid());
@@ -125,7 +125,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);
@@ -149,7 +149,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);
@@ -194,7 +194,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 ");
@@ -206,19 +206,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();
}
@@ -245,7 +245,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -260,14 +260,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();
}
@@ -290,13 +290,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/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/connector/v3/administered-object-definition-embedra/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
index f365c7f..ea3510b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
@@ -64,7 +64,7 @@
resourceAdapter="#aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
description="module-scope resource defined by @AdministeredObjectDefinition",
name = "java:module/env/Servlet_AdminObject",
@@ -73,7 +73,7 @@
resourceAdapter="#aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
description="component-scope resource defined by @AdministeredObjectDefinition",
name = "java:comp/env/Servlet_AdminObject",
@@ -91,7 +91,7 @@
@EJB
private Hello helloStateless;
-
+
@EJB(beanName = "HelloStatefulEJB")
private HelloStateful helloStateful;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.properties
index 739d4f5..dcf02d8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/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="administered-object-definition"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.xml
index 5b3becd..c5b7798 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/build.xml
@@ -37,25 +37,25 @@
</target>
<target name="info" depends="init-common">
- <echo message="build.classes.dir is ${build.classes.dir}"/>
- <echo message="s1astest.classpath is ${s1astest.classpath}"/>
+ <echo message="build.classes.dir is ${build.classes.dir}"/>
+ <echo message="s1astest.classpath is ${s1astest.classpath}"/>
</target>
-
+
<target name="compile-ut" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="ut" destdir="${build.classes.dir}"
- classpath="${env.APS_HOME}/lib/junit.jar:${s1astest.classpath}"
- debug="on"
+ classpath="${env.APS_HOME}/lib/junit.jar:${s1astest.classpath}"
+ debug="on"
includeantruntime="false"
- failonerror="true"/>
+ failonerror="true"/>
</target>
<target name="build-ut" depends="init-common">
<!-- build a special ear which only includes deployment descriptors-->
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${assemble.dir}/temp"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${basedir}/descriptor/ut-application.xml" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App-UT.ear">
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${basedir}/descriptor/ut-application.xml" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App-UT.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
</fileset>
@@ -71,7 +71,7 @@
<unjar src="${assemble.dir}/${appname}App-UT.ear" dest="${assemble.dir}/temp/${appname}App-UT"/>
</target>
-
+
<target name="run-ut" depends="compile-ut">
<junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="true">
<formatter type="plain" usefile="false"/>
@@ -95,7 +95,7 @@
</target>
<target name="build" depends="compile">
- <echo message="assemble.dir = ${assemble.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}"/>
<!--build and package .war first so it doesn't contain ejb bean !-->
<!--classes that have @Stateless/@Stateul !-->
<antcall target="webclient-war-common">
@@ -118,11 +118,11 @@
<param name="ejbjar.classes"
value="**/Hello**.class"/>
</antcall>
-
+
<antcall target="ear-common"/>
<antcall target="build-ut"/>
-
+
<ant dir="ra" target="all"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/client/Client.java
index d7e3009..92f60eb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/client/Client.java
@@ -58,7 +58,7 @@
} else {
stat.addStatus(tcName, stat.PASS);
}
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -79,7 +79,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null)
System.out.println(line);
if (code != 200) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/connector-resource.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/connector-resource.xml
index 5c544c1..a3b9457 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/connector-resource.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/connector-resource.xml
@@ -20,12 +20,12 @@
<connector-resource xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd>
- <description>global-scope resource defined in application DD</description>
- <name>java:global/env/Application_Level_ConnectionFactory</name>
- <class-name>jakarta.resource.cci.ConnectionFactory</class-name>
- <resource-adapter>crd-ra</resource-adapter>
- <property>
- <name>transactionSupport</name>
- <value>LocalTransaction</value>
- </property>
+ <description>global-scope resource defined in application DD</description>
+ <name>java:global/env/Application_Level_ConnectionFactory</name>
+ <class-name>jakarta.resource.cci.ConnectionFactory</class-name>
+ <resource-adapter>crd-ra</resource-adapter>
+ <property>
+ <name>transactionSupport</name>
+ <value>LocalTransaction</value>
+ </property>
</connector-resource>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ejb-jar.xml
index 8b2b5cf..ad9cf2f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ejb-jar.xml
@@ -18,9 +18,9 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false"
- version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false"
+ version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>administered-object-definition-ejb</module-name>
<enterprise-beans>
@@ -29,7 +29,7 @@
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStateful</business-local>
<ejb-class>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStatefulEJB</ejb-class>
-
+
<administered-object>
<description>global-scope resource to be modified by DD</description>
<name>java:global/env/HelloStatefulEJB_ModByDD_AdminObject</name>
@@ -53,7 +53,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/HelloStatefulEJB_DD_AdminObject</name>
@@ -65,7 +65,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloStatefulEJB_DD_AdminObject</name>
@@ -77,7 +77,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/HelloStatefulEJB_DD_AdminObject</name>
@@ -89,7 +89,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</session>
<session>
<display-name>HelloEJB</display-name>
@@ -120,7 +120,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloEJB_DD_AdminObject</name>
@@ -156,8 +156,8 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</session>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-application.xml
index dd3fbec..63a9a8b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-application.xml
@@ -20,7 +20,7 @@
<application xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="7"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd">
<display-name>administered-object-definitionApp</display-name>
-
+
<module>
<java>administered-object-definition-client.jar</java>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-entity-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-entity-ejb-jar.xml
index 66aa7ba..7ab2a93 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-entity-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-entity-ejb-jar.xml
@@ -18,11 +18,11 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>administered-object-definition-ejb</module-name>
-
+
<enterprise-beans>
<entity>
<ejb-name>HelloEntity</ejb-name>
@@ -41,7 +41,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/Entity_AdminObject</name>
@@ -53,7 +53,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/Entity_AdminObject</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-interceptor-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-interceptor-ejb-jar.xml
index 248b861..c8e9c91 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-interceptor-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-interceptor-ejb-jar.xml
@@ -18,8 +18,8 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>administered-object-definition-ejb</module-name>
<interceptors>
@@ -37,7 +37,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/Interceptor_AdminObject</name>
@@ -49,7 +49,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/Interceptor_AdminObject</name>
@@ -63,5 +63,5 @@
</administered-object>
</interceptor>
</interceptors>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-mdb-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-mdb-ejb-jar.xml
index efd89f4..74ecad8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-mdb-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-mdb-ejb-jar.xml
@@ -18,8 +18,8 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>administered-object-definition-ejb</module-name>
<enterprise-beans>
@@ -40,7 +40,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/MDB_AdminObject</name>
@@ -52,7 +52,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/MDB_AdminObject</name>
@@ -64,8 +64,8 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</message-driven>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-session-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-session-ejb-jar.xml
index c722295..37e003a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-session-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-session-ejb-jar.xml
@@ -18,8 +18,8 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>administered-object-definition-ejb</module-name>
<enterprise-beans>
@@ -28,7 +28,7 @@
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStateful</business-local>
<ejb-class>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStatefulEJB</ejb-class>
-
+
<administered-object>
<description>global-scope resource defined in EJB DD</description>
<name>java:global/env/StatefulEJB_AdminObject</name>
@@ -40,7 +40,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/StatefulEJB_AdminObject</name>
@@ -52,7 +52,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/StatefulEJB_AdminObject</name>
@@ -64,7 +64,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</session>
<session>
<display-name>HelloEJB</display-name>
@@ -83,7 +83,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/HelloEJB_AdminObject</name>
@@ -95,7 +95,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/HelloEJB_AdminObject</name>
@@ -107,8 +107,8 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</session>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-web.xml
index 7fe317e..6643601 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/ut-web.xml
@@ -18,8 +18,8 @@
-->
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
version="3.1">
<display-name>administered-object-definition</display-name>
@@ -56,7 +56,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in Web DD</description>
<name>java:module/env/AdminObject</name>
@@ -68,6 +68,6 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/web.xml
index 9476e34..e02edb7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/descriptor/web.xml
@@ -18,8 +18,8 @@
-->
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
version="3.1"
metadata-complete="false">
@@ -70,7 +70,7 @@
<value>connector.MyAdminObject</value>
</property>
</administered-object>
-
+
<administered-object>
<description>module-scope resource defined in Web DD</description>
<name>java:module/env/Web_DD_AdminObject</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
index f243c54..fccf90c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
@@ -33,35 +33,35 @@
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
@AdministeredObjectDefinition(
- description = "global-scope resource defined by @AdministeredObjectDefinition",
- name = "java:global/env/HelloEJB_Annotation_AdminObject",
+ description = "global-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:global/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
- description = "application-scope resource defined by @AdministeredObjectDefinition",
- name = "java:app/env/HelloEJB_Annotation_AdminObject",
+ description = "application-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:app/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
- description = "module-scope resource defined by @AdministeredObjectDefinition",
- name = "java:module/env/HelloEJB_Annotation_AdminObject",
+ description = "module-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:module/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
- description = "component-scope resource defined by @AdministeredObjectDefinition",
- name = "java:comp/env/HelloEJB_Annotation_AdminObject",
+ description = "component-scope resource defined by @AdministeredObjectDefinition",
+ name = "java:comp/env/HelloEJB_Annotation_AdminObject",
interfaceName = "jakarta.jms.Destination",
className = "connector.MyAdminObject",
resourceAdapter="aod-ra",
@@ -109,7 +109,7 @@
lookupAdminObject("java:app/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:module/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:comp/env/HelloEJB_DD_AdminObject", true);
-
+
System.out.println("In HelloEJB::hello()");
}
@@ -127,6 +127,6 @@
}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
index f310b45..1cbcee2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
@@ -115,7 +115,7 @@
lookupAdminObject("java:app/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:module/env/HelloEJB_DD_AdminObject", true);
lookupAdminObject("java:comp/env/HelloEJB_DD_AdminObject", false);
-
+
System.out.println("StatefulEJB datasource-definitions Success");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/AbstractResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/AbstractResourceAdapter.java
index 07b9d78..0efcc5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/AbstractResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/AbstractResourceAdapter.java
@@ -23,7 +23,7 @@
private String testName;
protected boolean debug = true;
-
+
public String getTestName() {
return testName;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/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/connector/v3/administered-object-definition/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/DeliveryWork.java
index 7e3635f..2be65f9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/DeliveryWork.java
@@ -22,7 +22,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
@@ -31,7 +31,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;
@@ -39,7 +39,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;
@@ -50,7 +50,7 @@
public void run() {
debug("ENTER...");
-
+
try {
//Method onMessage = getOnMessageMethod();
//ep.beforeDelivery(onMessage);
@@ -73,11 +73,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -88,14 +88,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/connector/v3/administered-object-definition/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/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/connector/v3/administered-object-definition/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/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/connector/v3/administered-object-definition/ra/src/connector/MyConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyConnectionFactory.java
index 9f24648..922e71d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyConnectionFactory.java
@@ -32,7 +32,7 @@
private ConnectionManager cm;
private MyManagedConnectionFactory mcf;
private Reference ref;
-
+
public MyConnectionFactory(MyManagedConnectionFactory mcf, ConnectionManager cm) {
super();
this.mcf = mcf;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyManagedConnectionFactory.java
index 05b3118..a561763 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyManagedConnectionFactory.java
@@ -44,7 +44,7 @@
private ConnectionManager cm;
private PrintWriter writer;
private TransactionSupportLevel transactionSupport = TransactionSupportLevel.LocalTransaction;;
-
+
public String getTestName() {
return testName;
}
@@ -69,7 +69,7 @@
}
@Override
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
@@ -80,7 +80,7 @@
}
@Override
- public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
+ public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyWork.java
index 614381e..44899a0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/MyWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class MyWork implements Work {
@@ -31,7 +31,7 @@
private boolean stop = false;
private MessageEndpointFactory factory;
private WorkManager wm;
-
+
public MyWork(
String name, MessageEndpointFactory factory, WorkManager wm) {
this.factory = factory;
@@ -49,7 +49,7 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
/*
@@ -66,7 +66,7 @@
ex.printStackTrace();
}
}
-
+
debug("LEAVE...");
}
@@ -81,14 +81,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/connector/v3/administered-object-definition/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleActivationSpec.java
index 512e5c6..4b5e5f1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleActivationSpec.java
@@ -25,12 +25,12 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Activation(
messageListeners = {connector.MyMessageListener.class}
)
-public class SimpleActivationSpec
+public class SimpleActivationSpec
implements ActivationSpec, java.io.Serializable {
private String destinationName;
@@ -47,7 +47,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -56,7 +56,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -65,7 +65,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -98,7 +98,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleResourceAdapterImpl.java
index 28d9e29..d1c26bb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -29,14 +29,14 @@
/**
* This is a sample resource adapter
- *
+ *
* @author Qingqing Ouyang
*/
@Connector(
/* moduleName="My Simple RAR", */
- displayName = "Simple Resource Adapter",
- vendorName = "Java Software",
- eisType = "Generic Type",
+ displayName = "Simple Resource Adapter",
+ vendorName = "Java Software",
+ eisType = "Generic Type",
version = "1.0Alpha",
transactionSupport=TransactionSupportLevel.XATransaction)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/TestWMWork.java
index ee0fae9..e248506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/TestWMWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class TestWMWork implements Work {
@@ -37,8 +37,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;
@@ -72,10 +72,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());
}
}
@@ -87,7 +87,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/connector/v3/administered-object-definition/ra/src/connector/V3WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/V3WorkDispatcher.java
index 8adf3cc..4b43783 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/V3WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/V3WorkDispatcher.java
@@ -43,7 +43,7 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
try {
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 1;
@@ -72,7 +72,7 @@
debug("V3WorkDispatcher calling DONE()");
done();
debug("V3WorkDispatcher finished calling DONE()");
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/WorkDispatcher.java
index 42249dc..a14443a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/WorkDispatcher.java
@@ -32,7 +32,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -43,11 +43,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected XATerminator xa;
-
+
public WorkDispatcher(
String id,
BootstrapContext ctx,
- MessageEndpointFactory factory,
+ MessageEndpointFactory factory,
ActivationSpec spec) {
this.id = id;
this.ctx = ctx;
@@ -60,7 +60,7 @@
public void run() {
debug("ENTER...");
-
+
try {
synchronized (Controls.readyLock) {
debug("WAIT...");
@@ -82,26 +82,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);
@@ -109,7 +109,7 @@
debug("DONE WRITE TO DB");
Controls.expectedResults = numOfMessages;
notifyAndWait();
-
+
//delete/rollback
ec = startTx();
debug("Start TX - " + ec.getXid());
@@ -125,7 +125,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);
@@ -149,7 +149,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);
@@ -194,7 +194,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 ");
@@ -206,19 +206,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();
}
@@ -245,7 +245,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -260,14 +260,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();
}
@@ -290,13 +290,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/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/connector/v3/administered-object-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
index 1b1efa1..5d353cd 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
@@ -64,7 +64,7 @@
resourceAdapter="aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
description="module-scope resource defined by @AdministeredObjectDefinition",
name = "java:module/env/Servlet_AdminObject",
@@ -73,7 +73,7 @@
resourceAdapter="aod-ra",
properties = {"org.glassfish.admin-object.resType=connector.MyAdminObject"}
),
-
+
@AdministeredObjectDefinition(
description="component-scope resource defined by @AdministeredObjectDefinition",
name = "java:comp/env/Servlet_AdminObject",
@@ -91,7 +91,7 @@
@EJB
private Hello helloStateless;
-
+
@EJB(beanName = "HelloStatefulEJB")
private HelloStateful helloStateful;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java
index 7105b2f..a2138a8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java
@@ -70,7 +70,7 @@
ASURLClassLoader classLoader = new ASURLClassLoader(this.getClass().getClassLoader());
classLoader.addURL(archive.toURL());
reader.setClassLoader(classLoader);
-
+
Application applicationDesc = reader.open(archive);
// System.out.println("--------Administered object in application.xml----------");
// for( AdministeredObjectDefinitionDescriptor aodd: applicationDesc.getAdministeredObjectDefinitionDescriptors()){
@@ -78,8 +78,8 @@
// System.out.println(aodd.getName());
// System.out.println("");
// }
-
- Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
+
+ Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
new HashMap<String,AdministeredObjectDefinitionDescriptor>();
AdministeredObjectDefinitionDescriptor desc;
@@ -129,7 +129,7 @@
reader.setAnnotationProcessingRequested(true);
reader.setClassLoader(classLoader);
assertTrue("Archivist should handle annotations.", reader.isAnnotationProcessingRequested());
-
+
WebBundleDescriptor webDesc = reader.open(archive);
// for(AdministeredObjectDefinitionDescriptor aodd : webDesc.getAdministeredObjectDefinitionDescriptors()){
// System.out.println("Description = "+aodd.getDescription());
@@ -138,7 +138,7 @@
// System.out.println();
// }
- Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
+ Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
new HashMap<String,AdministeredObjectDefinitionDescriptor>();
AdministeredObjectDefinitionDescriptor desc;
@@ -159,7 +159,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("application-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:app/env/Servlet_AdminObject");
@@ -168,7 +168,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:module/env/Servlet_AdminObject");
@@ -177,7 +177,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("component-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:comp/env/Servlet_AdminObject");
@@ -186,7 +186,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("global-scope resource defined in Web DD");
desc.setName("java:global/env/Web_DD_AdminObject");
@@ -195,7 +195,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("application-scope resource defined in Web DD");
desc.setName("java:app/env/Web_DD_AdminObject");
@@ -204,7 +204,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined in Web DD");
desc.setName("java:module/env/Web_DD_AdminObject");
@@ -235,7 +235,7 @@
ASURLClassLoader classLoader = new ASURLClassLoader(this.getClass().getClassLoader());
classLoader.addURL(archive.toURL());
-
+
EjbArchivist reader = (EjbArchivist) TestUtil.getByType(EjbArchivist.class);
reader.setClassLoader(classLoader);
reader.setAnnotationProcessingRequested(true);
@@ -251,8 +251,8 @@
// System.out.println("------------------");
// }
}
-
- Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
+
+ Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
new HashMap<String,AdministeredObjectDefinitionDescriptor>();
AdministeredObjectDefinitionDescriptor desc;
@@ -349,7 +349,7 @@
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
}
-
+
// administered-object in annotation for stateful EJB
{
desc = new AdministeredObjectDefinitionDescriptor();
@@ -360,7 +360,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("application-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:app/env/HelloStatefulEJB_Annotation_AdminObject");
@@ -399,7 +399,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("application-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:app/env/HelloEJB_Annotation_AdminObject");
@@ -408,7 +408,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:module/env/HelloEJB_Annotation_AdminObject");
@@ -417,7 +417,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("component-scope resource defined by @AdministeredObjectDefinition");
desc.setName("java:comp/env/HelloEJB_Annotation_AdminObject");
@@ -427,8 +427,8 @@
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
}
-
+
TestUtil.compareAODD(expectedAODDs, acturalAODDs);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java
index f411c9e..8290391 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java
@@ -46,23 +46,23 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
public void testApplicationDD() throws Exception{
-
+
String tcName = "administered-object-definition-application-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-application.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The application.xml not found: "+ddFile,ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
ApplicationDeploymentDescriptorFile ddReader = new ApplicationDeploymentDescriptorFile();
Application application = (Application) ddReader.read( ddIS);
-
+
Set<ResourceDescriptor> actualAODDs = application.getResourceDescriptors(JavaEEResourceType.AODD);
- Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
+ Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs =
new HashMap<String,AdministeredObjectDefinitionDescriptor>();
AdministeredObjectDefinitionDescriptor desc;
@@ -74,7 +74,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setName("java:app/env/AdminObject");
desc.setInterfaceName("jakarta.jms.Destination");
@@ -86,7 +86,7 @@
TestUtil.compareAODD(expectedAODDs, actualAODDs);
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -100,18 +100,18 @@
}
public void testSessionEJBDD() throws Exception{
-
+
String tcName = "administered-object-definition-Session-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-session-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-session-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
-
+
for(EjbDescriptor ejbDescriptor : ejbBundle.getEjbs()){
ejbDescriptor.getResourceDescriptors(JavaEEResourceType.AODD);
if(ejbDescriptor.getName().equals("HelloStatefulEJB")){
@@ -122,9 +122,9 @@
fail("Unknown EJB descriptor: "+ejbDescriptor.getName());
}
}
-
+
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -136,7 +136,7 @@
return;
}
-
+
private void testStatefulSessionEJBDD(EjbDescriptor ejb) throws Exception{
AdministeredObjectDefinitionDescriptor desc;
Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs = new HashMap<String,AdministeredObjectDefinitionDescriptor>();
@@ -149,7 +149,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/StatefulEJB_AdminObject");
@@ -169,9 +169,9 @@
expectedAODDs.put(desc.getName(), desc);
TestUtil.compareAODD(expectedAODDs, ejb.getResourceDescriptors(JavaEEResourceType.AODD));
-
+
}
-
+
private void testStatelessSessionEJBDD(EjbDescriptor ejb) throws Exception{
AdministeredObjectDefinitionDescriptor desc;
Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs = new HashMap<String,AdministeredObjectDefinitionDescriptor>();
@@ -184,7 +184,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/HelloEJB_AdminObject");
@@ -204,18 +204,18 @@
expectedAODDs.put(desc.getName(), desc);
TestUtil.compareAODD(expectedAODDs, ejb.getResourceDescriptors(JavaEEResourceType.AODD));
-
+
}
-
+
public void testEntityEJBDD() throws Exception{
-
+
String tcName = "administered-object-definition-Entity-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-entity-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-entity-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
@@ -232,7 +232,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/Entity_AdminObject");
@@ -255,7 +255,7 @@
}
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -269,14 +269,14 @@
}
public void testMDBEJBDD() throws Exception{
-
+
String tcName = "administered-object-definition-MDB-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-mdb-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-mdb-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
@@ -293,7 +293,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/MDB_AdminObject");
@@ -316,7 +316,7 @@
}
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -330,14 +330,14 @@
}
public void testInterceptorEJBDD() throws Exception{
-
+
String tcName = "administered-object-definition-Interceptor-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-interceptor-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-interceptor-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
@@ -354,7 +354,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/Interceptor_AdminObject");
@@ -377,7 +377,7 @@
}
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -391,18 +391,18 @@
}
public void testWebDD() throws Exception{
-
+
String tcName = "administered-object-definition-Web-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-web.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-web.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
WebDeploymentDescriptorFile ddReader = new WebDeploymentDescriptorFile();
WebBundleDescriptor webBundle = ddReader.read( ddIS);
-
+
AdministeredObjectDefinitionDescriptor desc;
Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs = new HashMap<String,AdministeredObjectDefinitionDescriptor>();
@@ -414,7 +414,7 @@
desc.setResourceAdapter("aod-ra");
desc.addProperty("org.glassfish.admin-object.resType", "connector.MyAdminObject");
expectedAODDs.put(desc.getName(), desc);
-
+
desc = new AdministeredObjectDefinitionDescriptor();
desc.setDescription("application-scope resource defined in Web DD");
desc.setName("java:app/env/AdminObject");
@@ -436,7 +436,7 @@
TestUtil.compareAODD(expectedAODDs, webBundle.getResourceDescriptors(JavaEEResourceType.AODD));
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java
index 5b20f58..1f5ace4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java
@@ -28,39 +28,39 @@
public class TestUtil {
- public static void compareAODD(Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs,
+ public static void compareAODD(Map<String,AdministeredObjectDefinitionDescriptor> expectedAODDs,
Set<ResourceDescriptor> actualAODDs) throws Exception{
-
+
for(ResourceDescriptor descriptor : actualAODDs){
AdministeredObjectDefinitionDescriptor actualDesc = (AdministeredObjectDefinitionDescriptor)descriptor;
assertNotNull("the name of administered object cannot be null.", actualDesc.getName());
-
+
AdministeredObjectDefinitionDescriptor expectedDesc = expectedAODDs.get(actualDesc.getName());
assertNotNull("The AOD of the name ["+actualDesc.getName()+"] is not expected.", expectedDesc);
-
+
assertEquals("Fail to verify interface-type of the AODD:"+actualDesc.getName(),
expectedDesc.getInterfaceName(), actualDesc.getInterfaceName());
assertEquals("Fail to verify class-name of the AODD:"+actualDesc.getName(),
expectedDesc.getClassName(), actualDesc.getClassName());
-
+
assertEquals("Fail to verify description of the AODD:"+actualDesc.getName(),
expectedDesc.getDescription(), actualDesc.getDescription());
-
+
assertEquals("Fail to verify resourceAdapter of the AODD:"+actualDesc.getName(),
expectedDesc.getResourceAdapter(), actualDesc.getResourceAdapter());
-
+
Properties expectedProps = expectedDesc.getProperties();
Properties actualProps = actualDesc.getProperties();
-
+
for(Object name : actualProps.keySet()){
assertEquals("Fail to verify property ("+name+") of the AODD:"+actualDesc.getName(),
expectedProps.get(name), actualProps.get(name));
}
-
+
assertEquals("Fail to verify size of properties of the AODD:"+actualDesc.getName(),
expectedProps.size(), actualProps.size());
-
+
expectedAODDs.remove(actualDesc.getName());
}
if(expectedAODDs.size()>0){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/META-INF/ejb-jar.xml
index 38af18c..2905932 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/META-INF/sun-ejb-jar.xml
index 1146a5a..0a7e0da 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,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/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
index 75ebde0..a03450d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -58,11 +58,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();
@@ -70,7 +70,7 @@
}
public int getMessageCount() {
- try {
+ try {
Connection con = getFreshConnection();
int count1 = getCount(con);
con.close();
@@ -79,7 +79,7 @@
} catch (Exception e) {
e.printStackTrace(System.out);
throw new EJBException(e);
- }
+ }
}
private int getCount(Connection con) throws SQLException {
@@ -105,7 +105,7 @@
Context ic = new InitialContext();
user = (String) ic.lookup("java:comp/env/user");
password = (String) ic.lookup("java:comp/env/password");
- {
+ {
//test whether the appropriate admin-object-resources are created
ic.lookup("eis/aor_1");
ic.lookup("eis/aor_1_2");
@@ -114,10 +114,10 @@
ic.lookup("eis/aor_2_4");
ic.lookup("eis/aor_3_5");
}
- Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
- System.out.println("CALLING INITILIZE ");
- Controls.initialize();
- System.out.println("CALLED INITILIZE " + Controls);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE " + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -152,7 +152,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -162,7 +162,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/Client.java
index 880664f..389d594 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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("annotation-connector16-mixed-modeID");
-
+
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/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
index e4a5735..3facbfe 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,62 +103,62 @@
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");
@@ -171,7 +171,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -180,9 +180,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
@@ -198,9 +198,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();
@@ -213,9 +213,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/connector/v3/annotation-connector-mixedmode/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/servlet/SimpleServlet.java
index 243baf4..ee71629 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/servlet/SimpleServlet.java
@@ -44,17 +44,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.5 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
while (!done(out)) {
@@ -70,18 +70,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.5 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.5 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.properties
index fe77353..5a5f0a3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/annotation-connector16-mixed-mode/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.xml
index 3080d9c..ebed811 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.xml
@@ -81,15 +81,15 @@
<!--
<target name="runtest" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="connector1.5 (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="connector1.5 (ear based)"/>
+ </antcall>
</target>
-->
<!--
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="annotation-connector16-mixed-mode" />
+ <param name="appname" value="annotation-connector16-mixed-mode" />
</antcall>
</target>
-->
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/META-INF/ra.xml
index 11a0e04..f8969b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/build.xml
index ff9b736..a0c3f91 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyActivationSpec_1.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyActivationSpec_1.java
index 0a5d655..c9e5f27 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyActivationSpec_1.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyActivationSpec_1.java
@@ -25,7 +25,7 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Activation(
messageListeners = {connector.MyMessageListener_1.class, connector.MyMessageListener.class}
@@ -38,7 +38,7 @@
private String testProp;
private Integer testIntegerProp;
private ResourceAdapter resourceadapter;
-
+
public String getDestinationName () {
return this.destinationName;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject.java
index 8cf39a5..7423569 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject.java
@@ -52,13 +52,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_2.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_2.java
index 79e293b..439e619 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_2.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_2.java
@@ -17,7 +17,7 @@
package connector;
public interface MyAdminObject_Interface_2 {
-
+
public void setExpectedResults (Integer value);
public Integer getExpectedResults ();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_3.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_3.java
index 496d6dd..0d7c56f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_3.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/MyAdminObject_Interface_3.java
@@ -17,7 +17,7 @@
package connector;
public interface MyAdminObject_Interface_3 {
-
+
public void setExpectedResults (Integer value);
public Integer getExpectedResults ();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleActivationSpec.java
index 4a963dc..189269b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleActivationSpec.java
@@ -26,9 +26,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;
@@ -66,7 +66,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -75,7 +75,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -99,7 +99,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleRA.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleRA.java
index 0fbd4e2..c20b739 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleRA.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleRA.java
@@ -39,7 +39,7 @@
/**
* This is a sample resource adapter
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Connector(
displayName = "Simple RA",
@@ -77,12 +77,12 @@
//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...");
debug("005. Simple RA start...");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl.java
index 4792432..fffff94 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -35,7 +35,7 @@
/**
* This is a sample resource adapter
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Connector(
/*moduleName="test ra",*/
@@ -74,12 +74,12 @@
//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...");
debug("005. Simple RA start...");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_1.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_1.java
index d4b85b8..dcc5b09 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_1.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_1.java
@@ -40,7 +40,7 @@
/**
* This is a sample resource adapter
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Connector(
displayName = "Simple Resource Adapter",
@@ -48,7 +48,7 @@
eisType = "Generic Type",
version = "1.0Alpha"
)
-public class SimpleResourceAdapterImpl_1
+public class SimpleResourceAdapterImpl_1
implements ResourceAdapter, java.io.Serializable {
private BootstrapContext ctx;
@@ -84,11 +84,11 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
- throw new IllegalStateException("This resource-adapter should not have been initialized");
+ throw new IllegalStateException("This resource-adapter should not have been initialized");
}
-
+
public String getTestName() {
return testName;
}
@@ -120,7 +120,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/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_2.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_2.java
index da5ae19..a44f1c5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_2.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/SimpleResourceAdapterImpl_2.java
@@ -40,7 +40,7 @@
/**
* This is a sample resource adapter
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Connector(
displayName = "Simple Resource Adapter",
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/WorkDispatcher.java
index 64b71c4..762e03e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/WorkDispatcher.java
@@ -33,7 +33,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -44,11 +44,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected 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();
}
@@ -246,7 +246,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -261,14 +261,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();
}
@@ -291,13 +291,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/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/connector/v3/annotation-connector1.5/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/META-INF/ejb-jar.xml
index 38af18c..2905932 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/META-INF/sun-ejb-jar.xml
index 1146a5a..0a7e0da 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,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/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
index e22fa10..4076e49 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -70,11 +70,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();
@@ -93,22 +93,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 {
@@ -134,10 +134,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -172,7 +172,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -183,7 +183,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/Client.java
index b85efda..7443032 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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("annotation-connector15ID");
-
+
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/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
index 47d776f..c7b99e8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
@@ -31,41 +31,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -76,7 +76,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -92,10 +92,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() {}
@@ -105,62 +105,62 @@
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");
@@ -171,7 +171,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -180,9 +180,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
@@ -198,9 +198,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();
@@ -213,9 +213,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/connector/v3/annotation-connector1.5/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/servlet/SimpleServlet.java
index 9e0d61e..aa2c54a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/servlet/SimpleServlet.java
@@ -44,17 +44,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.5 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
while (!done(out)) {
@@ -70,18 +70,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.5 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.5 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.properties
index 1fe136a..022491a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/annotation-connector15/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.xml
index c82c1b4..2c7a7c6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.xml
@@ -80,15 +80,15 @@
<!--
<target name="runtest" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="connector1.5 (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="connector1.5 (ear based)"/>
+ </antcall>
</target>
-->
<!--
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="annotation-connector15" />
+ <param name="appname" value="annotation-connector15" />
</antcall>
</target>
-->
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/build.xml
index ff8bcc2..8496f60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/AbstractResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/AbstractResourceAdapter.java
index c4892b1..1d1f6e7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/AbstractResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/AbstractResourceAdapter.java
@@ -23,7 +23,7 @@
private String testName;
protected boolean debug = true;
-
+
public String getTestName() {
return testName;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/MyAdminObject.java
index 2e4cfa8..20863a9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/MyAdminObject.java
@@ -39,13 +39,13 @@
}
public void initialize() {
- System.out.println("[MyAdminObject] Initializing the Controls to false:"+getResetControl());
+ System.out.println("[MyAdminObject] Initializing the Controls to false:"+getResetControl());
if (getResetControl().equals("BEGINNING")) {
synchronized (Controls.readyLock){
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/connector/v3/annotation-connector1.5/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleActivationSpec.java
index 512e5c6..4b5e5f1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleActivationSpec.java
@@ -25,12 +25,12 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Activation(
messageListeners = {connector.MyMessageListener.class}
)
-public class SimpleActivationSpec
+public class SimpleActivationSpec
implements ActivationSpec, java.io.Serializable {
private String destinationName;
@@ -47,7 +47,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -56,7 +56,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -65,7 +65,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -98,7 +98,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
index 19a5e4d..1334b7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -35,7 +35,7 @@
/**
* This is a sample resource adapter
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Connector(
/*moduleName="My Simple RAR",*/
@@ -44,7 +44,7 @@
eisType = "Generic Type",
version = "1.0Alpha"
)
-public class SimpleResourceAdapterImpl extends AbstractResourceAdapter
+public class SimpleResourceAdapterImpl extends AbstractResourceAdapter
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,12 +68,12 @@
//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...");
debug("005. Simple RA start...");
}
@@ -108,15 +108,15 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
-
+
((WorkDispatcher) work).stop();
}
-
- public XAResource[] getXAResources(ActivationSpec[] specs)
+
+ public XAResource[] getXAResources(ActivationSpec[] specs)
throws ResourceException {
throw new UnsupportedOperationException();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/TestWMWork.java
index bb05534..de93bc1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-connector1.5/ra/src/connector/V3WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/V3WorkDispatcher.java
index 8adf3cc..4b43783 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/V3WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/V3WorkDispatcher.java
@@ -43,7 +43,7 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
try {
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 1;
@@ -72,7 +72,7 @@
debug("V3WorkDispatcher calling DONE()");
done();
debug("V3WorkDispatcher finished calling DONE()");
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/WorkDispatcher.java
index 64b71c4..762e03e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/WorkDispatcher.java
@@ -33,7 +33,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -44,11 +44,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected 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();
}
@@ -246,7 +246,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -261,14 +261,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();
}
@@ -291,13 +291,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/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/connector/v3/annotation-embeddedweb/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.properties
index a404319..2486a2d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-annotation-subclassing"/>
@@ -24,7 +24,7 @@
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="annotation-subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
index 9d3ee37..fa4cafe 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
@@ -32,7 +32,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<!--
<target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -41,15 +41,15 @@
<target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
@@ -57,7 +57,7 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
@@ -65,36 +65,36 @@
<antcall target="create-pool"/>
<antcall target="create-resource"/>
<antcall target="create-admin-object"/>
-
+
</target>
<target name="create-pool">
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="${appname}App#jdbcra"/>
<param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
+ <param name="extra-params" value="--matchconnections=false"/>
<param name="connector.conpool.name" value="embedded-ra-pool"/>
</antcall>
<antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
</target>
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="create-resource">
+ <target name="create-resource">
<antcall target="create-connector-resource-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
<param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>
@@ -105,18 +105,18 @@
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-annotation-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -124,16 +124,16 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
<target name="unsetup">
@@ -145,7 +145,7 @@
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -155,7 +155,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -171,9 +171,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -182,37 +182,37 @@
</target>
<target name="build" depends="compile, build-ra">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
- <antcall target="create-password-alias">
+ <antcall target="create-password-alias">
<param name="password.alias.name" value="ALIAS_TEST_PROPERTY"/>
<param name="password.alias.file" value="aliaspassword.txt"/>
</antcall>
@@ -223,30 +223,30 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="annotation-embeddedweb (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="annotation-embeddedweb (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="annotation-embeddedweb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="annotation-embeddedweb (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common"/>
<antcall target="delete-password-alias">
<param name="password.alias.name" value="ALIAS_TEST_PROPERTY"/>
</antcall>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/v3/annotation-embeddedweb/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/sun-ejb-jar.xml
index 88f1c02..4e0104e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-annotation-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-annotation-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
index 8a9b105..160eab9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
@@ -44,4 +44,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerChecking.java
index 61de291..b341c34 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerChecking.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
index f0dbad2..929d15c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -147,7 +147,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -214,12 +214,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavings.java
index 338c921..883e04a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavings.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml
index 5c65fd5..e950002 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index 70029f1..e966f98 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,169 +50,169 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
System.out.println("V3-TEST : " + dataSourceObject);
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
System.out.println("V3-TEST : " + dataSourceObject);
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index a956d97..11ad746 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/*
@@ -279,184 +279,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -506,162 +506,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 01dcff0..bb12b48 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -24,8 +24,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
@Connector(
description = "Resource adapter wrapping Datasource implementation of driver",
@@ -49,52 +49,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 39a5325..d126fab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -28,7 +28,7 @@
<outbound-resourceadapter>
<connection-definition>
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>User</config-property-name>
@@ -45,7 +45,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbpassword</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -55,7 +55,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
@@ -72,7 +72,7 @@
<connection-interface>java.sql.Connection</connection-interface>
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
<transaction-support>LocalTransaction</transaction-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index b4a6316..c8aaf77 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,8 +31,8 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
@ConnectionDefinition(
@@ -42,31 +42,31 @@
connectionFactoryImpl = com.sun.jdbcra.spi.DataSource.class
)
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -74,7 +74,7 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
@@ -84,36 +84,36 @@
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
} catch(Exception e){
System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
+ e.printStackTrace();
}
System.out.println("V3-TEST : got connection");
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
/*
@@ -123,15 +123,15 @@
System.out.println("V3-TEST : returning connection");
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -142,28 +142,28 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
@@ -178,12 +178,12 @@
}
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
@ConfigProperty(
defaultValue = "localhost",
@@ -192,12 +192,12 @@
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
@@ -219,32 +219,32 @@
public String getAliasTest () {
return aliasTest;
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
@ConfigProperty(
defaultValue = "1527",
@@ -253,42 +253,42 @@
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
@ConfigProperty(
defaultValue="testdb",
@@ -297,42 +297,42 @@
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
@ConfigProperty(
type=java.lang.String.class
@@ -340,203 +340,203 @@
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
@ConfigProperty(
defaultValue = "#",
@@ -545,52 +545,52 @@
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -600,35 +600,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
index d90085d..51f1773 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,58 +51,58 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -115,91 +115,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index f89be57..fc3a957 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -84,11 +84,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -97,10 +97,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -109,93 +109,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
index bc7b55d..9892ff6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
@@ -17,16 +17,16 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
-import jakarta.ejb.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -42,14 +42,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -65,14 +65,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -89,7 +89,7 @@
customerSavings = customerSavingsLocalHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -102,7 +102,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -114,7 +114,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -126,12 +126,12 @@
customerSavingsLocalHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -141,7 +141,7 @@
customerSavings = (CustomerSavings)customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -150,7 +150,7 @@
customerChecking = (CustomerChecking)customerCheckingLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -210,9 +210,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/META-INF/glassfish-resources.xml
index 21be062..b741fed 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/META-INF/glassfish-resources.xml
@@ -72,4 +72,4 @@
<property name="ResetControl" value="BEGINNING"/>
</admin-object-resource>-->
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-gf-resources.xml
index 045bf15..79549bb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-gf-resources.xml
@@ -72,4 +72,4 @@
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/monitoring-ds" object-type="user" pool-name="java:module/jdbc/monitoring-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-jar.xml
index 582b781..12fb6d3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/ejb-jar.xml
@@ -114,8 +114,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/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/sun-ejb-jar.xml
index b88a868..69b0149 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/sun-ejb-jar.xml
@@ -32,7 +32,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -84,7 +84,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:module/eis/testAdmin</jndi-name>
+ <jndi-name>java:module/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/web-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/web-gf-resources.xml
index 8105a15..62df165 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/web-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/META-INF/web-gf-resources.xml
@@ -67,4 +67,4 @@
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/monitoring-ds" object-type="user" pool-name="java:module/jdbc/monitoring-pool"/>
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/web-level-ds" object-type="user" pool-name="java:module/jdbc/web-level-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
index 99bf25d..cb3788a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -126,11 +126,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();
@@ -149,22 +149,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 {
@@ -190,10 +190,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -228,7 +228,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -239,7 +239,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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/connector/v3/app-scoped-resources-ms4-demo/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/Client.java
index 7e030b6..8ef5cd5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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 app-scoped-resources "+
- "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 app-scoped-resources test - " + testCount, stat.FAIL);
} else {
stat.addStatus("ID app-scoped-resources test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("app-scoped-resourcesID");
-
+
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/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
index b7427aa..62c42ad 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
//log("onMessage:: getCallerPrincipal : " + mdc.getCallerPrincipal());
//System.out.println("onMessage : ThreadID : " + Thread.currentThread().getName());
if(mdc.getCallerPrincipal() != null){
- log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
+ log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
}
log("onMessage : isCallerInRole('jagadish') : " + mdc.isCallerInRole("jagadish"));
@@ -83,7 +83,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -97,10 +97,10 @@
ex.printStackTrace();
}
}
-
+
/**
- * 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() {}
@@ -110,62 +110,62 @@
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");
@@ -176,7 +176,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -185,9 +185,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
@@ -203,9 +203,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();
@@ -218,9 +218,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/connector/v3/app-scoped-resources-ms4-demo/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/servlet/SimpleServlet.java
index 1ee0d14..93aa9ae 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/servlet/SimpleServlet.java
@@ -45,7 +45,7 @@
}
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException {
- System.out.println("This is to test application-scoped-resources");
+ System.out.println("This is to test application-scoped-resources");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.properties
index c1dbbe8..343d7a7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/app-scoped-resources/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.xml
index 75c3a0a..932725d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.xml
@@ -45,7 +45,7 @@
<antcall target="unset"/>
<antcall target="disable-monitoring"/>
</target>
-
+
<target name="build" depends="init-common">
<ant dir="ra" target="all"/>
<ant dir="app" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/glassfish-resources.xml
index a9349fc..0fcabdd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/glassfish-resources.xml
@@ -48,4 +48,4 @@
<principal-map eis-principal="eis-prasath" mapped-principal="prasath" />
<principal-map eis-principal="eis-jagadish" mapped-principal="jagadish" />
</work-security-map>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/ra.xml
index 9781e16..3ccf296 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/META-INF/ra.xml
@@ -51,7 +51,7 @@
</config-property-confidential>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -62,7 +62,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/build.xml
index 4ffd698..679bbdb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/JSR322Work.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/JSR322Work.java
index 5107ac1..0203f4a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/JSR322Work.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/JSR322Work.java
@@ -48,6 +48,6 @@
public void run(){
super.run();
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MyAdminObject.java
index a68a5b7..9c28812 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MyAdminObject.java
@@ -51,11 +51,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/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MySecurityContext.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MySecurityContext.java
index 3178c1c..e19051e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MySecurityContext.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/MySecurityContext.java
@@ -62,7 +62,7 @@
CallerPrincipalCallback cpc = new CallerPrincipalCallback(execSubject, new PrincipalImpl(principalName));
debug("setting caller principal callback with principal : " + principalName);
callbacks.add(cpc);
-
+
/*
GroupPrincipalCallback gpc = new GroupPrincipalCallback(execSubject, null);
callbacks.add(gpc);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/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/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/WorkDispatcher.java
index d800f61..7da0d73 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/WorkDispatcher.java
@@ -86,7 +86,7 @@
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 {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/XID.java
index 18a970d..b2a906c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/META-INF/glassfish-resources.xml
index 9554b37..2068855 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/META-INF/glassfish-resources.xml
@@ -85,11 +85,11 @@
<property name="intValue1" value="40"/>
</admin-object-resource>
-<custom-resource res-type="java.lang.String" jndi-name="java:app/custom/primitive-resource"
+<custom-resource res-type="java.lang.String" jndi-name="java:app/custom/primitive-resource"
factory-class="org.glassfish.resources.custom.factory.PrimitivesAndStringFactory">
<property name="value" value="TEST" />
</custom-resource>
<jdbc-resource pool-name="java:app/sr" jndi-name="java:app/jdbc/sr" />
<jdbc-resource pool-name="java:app/connector-bean-validation-pool" jndi-name="java:app/jdbc/connector-bean-validation-resource" />
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/ejb-jar.xml
index c94a365..f4608bf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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>
<resource-env-ref>
<resource-env-ref-name>java:comp/env/Validator</resource-env-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/sun-ejb-jar.xml
index 0f56324..ebe9649 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/META-INF/sun-ejb-jar.xml
@@ -88,13 +88,13 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:app/eis/testAdmin</jndi-name>
+ <jndi-name>java:app/eis/testAdmin</jndi-name>
</resource-env-ref>
<resource-env-ref>
<resource-env-ref-name>java:comp/env/Validator</resource-env-ref-name>
<resource-env-ref-type>jakarta.validation.Validator</resource-env-ref-type>
</resource-env-ref>
-
+
<resource-env-ref>
<resource-env-ref-name>java:comp/env/ValidatorFactory</resource-env-ref-name>
<resource-env-ref-type>jakarta.validation.ValidatorFactory</resource-env-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
index 4a46e3c..25b3ae8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
@@ -86,7 +86,7 @@
}
}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -129,11 +129,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();
@@ -141,22 +141,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 {
@@ -182,8 +182,8 @@
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");
- Controls.initialize();
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ Controls.initialize();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -193,12 +193,12 @@
private boolean isConstraintViolationException(Throwable t, String jndiName){
boolean result = false;
if(t != null){
- if(t instanceof jakarta.validation.ConstraintViolationException){
+ if(t instanceof jakarta.validation.ConstraintViolationException){
System.out.println("Found Constraint Violation for resource ["+jndiName+"]" + t.getMessage());
- result = true;
- }else{
- result = isConstraintViolationException(t.getCause(), jndiName);
- }
+ result = true;
+ }else{
+ result = isConstraintViolationException(t.getCause(), jndiName);
+ }
}
return result;
}
@@ -232,7 +232,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -243,7 +243,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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/connector/v3/beanvalidation-simple-resources-xml/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/client/Client.java
index 95a1338..bf32810 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/client/Client.java
@@ -71,7 +71,7 @@
// System.out.println("test count : " + testCount);
testCount++;
}
-
+
System.out.println("test count : " + testCount);
runAdminObjectTest(res, testCount++, "java:app/eis/testAdmin", true);
System.out.println("test count : " + testCount);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
index a48aab1..b373050 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,62 +103,62 @@
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");
@@ -169,7 +169,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -178,9 +178,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
@@ -196,9 +196,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();
@@ -211,9 +211,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/connector/v3/beanvalidation-simple-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.properties
index 5aa38b3..12de46b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/simple-connector-bean-validation/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.xml
index a47432e..4539ea1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.xml
@@ -93,14 +93,14 @@
<!--
<target name="runtest" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="connector1.5 (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="connector1.5 (ear based)"/>
+ </antcall>
</target>
-->
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="simple-connector-bean-validation" />
+ <param name="appname" value="simple-connector-bean-validation" />
<param name="appclient.application.args" value="Standalone-"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/META-INF/ra.xml
index 82636d5..5c74630 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/META-INF/ra.xml
@@ -42,7 +42,7 @@
</config-property-value>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -53,7 +53,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
@@ -70,7 +70,7 @@
</config-property>
</adminobject>
- <adminobject>
+ <adminobject>
<adminobject-interface>connector.MyAdminObject1</adminobject-interface>
<adminobject-class>connector.MyAdminObject1</adminobject-class>
<config-property>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/build.xml
index a1bbe97..c0530d1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/build.xml
@@ -34,7 +34,7 @@
<ant dir="src" inheritAll="false" target="all"/>
<jar jarfile="generic-ra.rar" basedir="."
- includes="generic-ra.jar, META-INF/*.xml, META-INF/services/*" />
+ includes="generic-ra.jar, META-INF/*.xml, META-INF/services/*" />
</target>
<target name="deploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/build.xml
index ff8bcc2..8496f60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject.java
index b785d22..bacc68d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject.java
@@ -47,7 +47,7 @@
public int getIntValue(){
return intValue;
}
-
+
@ConfigProperty(defaultValue="1", type=java.lang.Integer.class)
public void setIntValue(int intValue){
this.intValue = intValue;
@@ -71,13 +71,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject1.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject1.java
index 92cae81..a32f7f9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject1.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/MyAdminObject1.java
@@ -47,7 +47,7 @@
public int getIntValue(){
return intValue;
}
-
+
@ConfigProperty(type=java.lang.Integer.class)
public void setIntValue(int intValue){
this.intValue = intValue;
@@ -88,13 +88,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleActivationSpec.java
index 8f2df2f..4604717 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleActivationSpec.java
@@ -25,9 +25,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;
@@ -44,7 +44,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -53,17 +53,17 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
}
- @NotNull
+ @NotNull
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -100,7 +100,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleResourceAdapterImpl.java
index 03f5828..26a2dad 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -45,14 +45,14 @@
/**
* 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;
private WorkManager wm;
-
+
private String testName;
private boolean debug = true;
@@ -64,7 +64,7 @@
public void
start(BootstrapContext ctx) throws ResourceAdapterInternalException{
-
+
debug("001. Simple RA start...");
this.ctx = ctx;
@@ -75,12 +75,12 @@
//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...");
debug("005. Simple RA start...");
@@ -120,13 +120,13 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
-
+
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -136,8 +136,8 @@
public Integer getIntValue(){
return intValue;
}
-
- @ConfigProperty(type=Integer.class, defaultValue="10")
+
+ @ConfigProperty(type=Integer.class, defaultValue="10")
public void setIntValue(Integer intValue){
this.intValue = intValue;
}
@@ -153,7 +153,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/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/WorkDispatcher.java
index 6e05b53..e776eaa 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/WorkDispatcher.java
@@ -33,7 +33,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -44,11 +44,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected 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...");
@@ -111,15 +111,15 @@
//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();
}
@@ -157,14 +157,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();
}
@@ -187,13 +187,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/XID.java
index 77837f7..1d5024b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/ejb-jar.xml
index c94a365..f4608bf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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>
<resource-env-ref>
<resource-env-ref-name>java:comp/env/Validator</resource-env-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/sun-ejb-jar.xml
index a26c9db..c3a901a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/META-INF/sun-ejb-jar.xml
@@ -88,13 +88,13 @@
</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>
<resource-env-ref>
<resource-env-ref-name>java:comp/env/Validator</resource-env-ref-name>
<resource-env-ref-type>jakarta.validation.Validator</resource-env-ref-type>
</resource-env-ref>
-
+
<resource-env-ref>
<resource-env-ref-name>java:comp/env/ValidatorFactory</resource-env-ref-name>
<resource-env-ref-type>jakarta.validation.ValidatorFactory</resource-env-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
index 5231d9b..c806f02 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
@@ -71,7 +71,7 @@
}
}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -113,11 +113,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();
@@ -125,22 +125,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 {
@@ -166,8 +166,8 @@
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");
- Controls.initialize();
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ Controls.initialize();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -177,12 +177,12 @@
private boolean isConstraintViolationException(Throwable t, String jndiName){
boolean result = false;
if(t != null){
- if(t instanceof jakarta.validation.ConstraintViolationException){
+ if(t instanceof jakarta.validation.ConstraintViolationException){
System.out.println("Found Constraint Violation for resource ["+jndiName+"]" + t.getMessage());
- result = true;
- }else{
- result = isConstraintViolationException(t.getCause(), jndiName);
- }
+ result = true;
+ }else{
+ result = isConstraintViolationException(t.getCause(), jndiName);
+ }
}
return result;
}
@@ -216,7 +216,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -227,7 +227,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
index a48aab1..b373050 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,62 +103,62 @@
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");
@@ -169,7 +169,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -178,9 +178,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
@@ -196,9 +196,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();
@@ -211,9 +211,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/connector/v3/beanvalidation-simple/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.properties
index 5aa38b3..12de46b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/simple-connector-bean-validation/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.xml
index bc7bdfd..e11f494 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.xml
@@ -93,14 +93,14 @@
<!--
<target name="runtest" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="connector1.5 (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="connector1.5 (ear based)"/>
+ </antcall>
</target>
-->
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="simple-connector-bean-validation" />
+ <param name="appname" value="simple-connector-bean-validation" />
<param name="appclient.application.args" value="Standalone-"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/META-INF/ra.xml
index 82636d5..5c74630 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/META-INF/ra.xml
@@ -42,7 +42,7 @@
</config-property-value>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -53,7 +53,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
@@ -70,7 +70,7 @@
</config-property>
</adminobject>
- <adminobject>
+ <adminobject>
<adminobject-interface>connector.MyAdminObject1</adminobject-interface>
<adminobject-class>connector.MyAdminObject1</adminobject-class>
<config-property>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/build.xml
index a1bbe97..c0530d1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/build.xml
@@ -34,7 +34,7 @@
<ant dir="src" inheritAll="false" target="all"/>
<jar jarfile="generic-ra.rar" basedir="."
- includes="generic-ra.jar, META-INF/*.xml, META-INF/services/*" />
+ includes="generic-ra.jar, META-INF/*.xml, META-INF/services/*" />
</target>
<target name="deploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/build.xml
index ff8bcc2..8496f60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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/connector/v3/beanvalidation-simple/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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/connector/v3/beanvalidation-simple/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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/connector/v3/beanvalidation-simple/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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/connector/v3/beanvalidation-simple/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/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/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject.java
index b785d22..bacc68d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject.java
@@ -47,7 +47,7 @@
public int getIntValue(){
return intValue;
}
-
+
@ConfigProperty(defaultValue="1", type=java.lang.Integer.class)
public void setIntValue(int intValue){
this.intValue = intValue;
@@ -71,13 +71,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject1.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject1.java
index 92cae81..a32f7f9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject1.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/MyAdminObject1.java
@@ -47,7 +47,7 @@
public int getIntValue(){
return intValue;
}
-
+
@ConfigProperty(type=java.lang.Integer.class)
public void setIntValue(int intValue){
this.intValue = intValue;
@@ -88,13 +88,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/v3/beanvalidation-simple/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleActivationSpec.java
index 8f2df2f..4604717 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleActivationSpec.java
@@ -25,9 +25,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;
@@ -44,7 +44,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -53,17 +53,17 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
}
- @NotNull
+ @NotNull
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -100,7 +100,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleResourceAdapterImpl.java
index 03f5828..26a2dad 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -45,14 +45,14 @@
/**
* 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;
private WorkManager wm;
-
+
private String testName;
private boolean debug = true;
@@ -64,7 +64,7 @@
public void
start(BootstrapContext ctx) throws ResourceAdapterInternalException{
-
+
debug("001. Simple RA start...");
this.ctx = ctx;
@@ -75,12 +75,12 @@
//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...");
debug("005. Simple RA start...");
@@ -120,13 +120,13 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
-
+
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -136,8 +136,8 @@
public Integer getIntValue(){
return intValue;
}
-
- @ConfigProperty(type=Integer.class, defaultValue="10")
+
+ @ConfigProperty(type=Integer.class, defaultValue="10")
public void setIntValue(Integer intValue){
this.intValue = intValue;
}
@@ -153,7 +153,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/connector/v3/beanvalidation-simple/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/WorkDispatcher.java
index 6e05b53..e776eaa 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/WorkDispatcher.java
@@ -33,7 +33,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -44,11 +44,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected 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...");
@@ -111,15 +111,15 @@
//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();
}
@@ -157,14 +157,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();
}
@@ -187,13 +187,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/XID.java
index 77837f7..1d5024b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/build.xml
index 76ddf3f..b209e91 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/build.xml
@@ -133,7 +133,7 @@
<param name="connector-target" value="all"/>
</antcall>
</target>
-
+
<target name="all-with-security-manager">
<delete>
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
@@ -213,32 +213,32 @@
</target>
<target name="connector_group_1">
- <echo message="************ Starting connector_group_1 ************"/>
+ <echo message="************ Starting connector_group_1 ************"/>
<echo message="@@## connector1.5 ##@@"/>
<ant dir="connector1.5" target="${connector-target}"/>
<echo message="@@## embeddedConnector1.5 ##@@"/>
<ant dir="../embeddedConnector1.5" target="${connector-target}"/>
- <echo message="@@## embeddedweb ##@@"/>
+ <echo message="@@## embeddedweb ##@@"/>
<ant dir="embeddedweb" target="${connector-target}"/>
- <echo message="@@## mq ##@@"/>
- <ant dir="../mq" target="${connector-target}"/>
+ <echo message="@@## mq ##@@"/>
+ <ant dir="../mq" target="${connector-target}"/>
- <echo message="@@## nonacc ##@@"/>
+ <echo message="@@## nonacc ##@@"/>
<ant dir="../nonacc" target="${connector-target}"/>
- <echo message="@@## web2connector ##@@"/>
- <ant dir="../web2connector" target="${connector-target}" />
+ <echo message="@@## web2connector ##@@"/>
+ <ant dir="../web2connector" target="${connector-target}" />
- <echo message="@@## web2connector (second time) ##@@"/>
- <ant dir="../web2connector" target="${connector-target}" />
+ <echo message="@@## web2connector (second time) ##@@"/>
+ <ant dir="../web2connector" target="${connector-target}" />
- <echo message="@@## nonstringmcfproperties ##@@"/>
- <ant dir="nonstringmcfproperties" target="${connector-target}"/>
+ <echo message="@@## nonstringmcfproperties ##@@"/>
+ <ant dir="nonstringmcfproperties" target="${connector-target}"/>
- <echo message="@@## nonstringraproperties ##@@"/>
+ <echo message="@@## nonstringraproperties ##@@"/>
<ant dir="../nonstringraproperties" target="${connector-target}" />
<echo message="@@## txlevelswitch ##@@"/>
@@ -250,8 +250,8 @@
<echo message="@@## ejb 3.2 connector 1.7 mdb test##@@"/>
<ant dir="ejb32-mdb" target="${connector-target}"/>
- <echo message="@@## SunRaXml ##@@"/>
- <ant dir="SunRaXml" target="${connector-target}"/>
+ <echo message="@@## SunRaXml ##@@"/>
+ <ant dir="SunRaXml" target="${connector-target}"/>
<echo message="@@## serializabletest ##@@"/>
<ant dir="serializabletest" target="${connector-target}"/>
@@ -265,22 +265,22 @@
<echo message="@@## redeployRar ##@@"/>
<ant dir="redeployRar" target="${connector-target}"/>
- <echo message="@@## annotation-embeddedweb ##@@"/>
+ <echo message="@@## annotation-embeddedweb ##@@"/>
<ant dir="annotation-embeddedweb" target="${connector-target}"/>
- <echo message="@@## installed libraries embedded rar EXTENSION_LIST ##@@"/>
- <ant dir="installed-libraries-embedded" target="all-ext"/>
+ <echo message="@@## installed libraries embedded rar EXTENSION_LIST ##@@"/>
+ <ant dir="installed-libraries-embedded" target="all-ext"/>
- <echo message="@@## defaultConnectorResource ##@@"/>
+ <echo message="@@## defaultConnectorResource ##@@"/>
<ant dir="defaultConnectorResource" target="${connector-target}"/>
- </target>
+ </target>
<target name="connector_group_2">
- <echo message="************ Starting connector_group_2 ************"/>
+ <echo message="************ Starting connector_group_2 ************"/>
<echo message="@@## force-deploy-rar ##@@"/>
<ant dir="force-deploy-rar" target="${connector-target}"/>
- <echo message="@@## built-in-custom-resources ##@@"/>
+ <echo message="@@## built-in-custom-resources ##@@"/>
<ant dir="built-in-custom-resources" target="${connector-target}"/>
<echo message="@@## datasource-definition##@@"/>
@@ -292,32 +292,32 @@
</target>
<target name="connector_group_3">
- <echo message="************ Starting connector_group_3 ************"/>
- <echo message="@@## connection-factory-definition-embedra##@@"/>
- <ant dir="connection-factory-definition-embedra" target="${connector-target}"/>
+ <echo message="************ Starting connector_group_3 ************"/>
+ <echo message="@@## connection-factory-definition-embedra##@@"/>
+ <ant dir="connection-factory-definition-embedra" target="${connector-target}"/>
- <echo message="@@## administered-object-definition-embedra##@@"/>
- <ant dir="administered-object-definition-embedra" target="${connector-target}"/>
+ <echo message="@@## administered-object-definition-embedra##@@"/>
+ <ant dir="administered-object-definition-embedra" target="${connector-target}"/>
- <echo message="@@## administered-object-definition##@@"/>
- <ant dir="administered-object-definition" target="${connector-target}"/>
+ <echo message="@@## administered-object-definition##@@"/>
+ <ant dir="administered-object-definition" target="${connector-target}"/>
- <echo message="@@## jms-connection-factory-definition##@@"/>
- <ant dir="jms-connection-factory-definition" target="${connector-target}"/>
+ <echo message="@@## jms-connection-factory-definition##@@"/>
+ <ant dir="jms-connection-factory-definition" target="${connector-target}"/>
</target>
- <target name="connector_group_4">
- <echo message="************ Starting connector_group_4 ************"/>
- <echo message="@@## jms-destination-definition##@@"/>
- <ant dir="jms-destination-definition" target="${connector-target}"/>
+ <target name="connector_group_4">
+ <echo message="************ Starting connector_group_4 ************"/>
+ <echo message="@@## jms-destination-definition##@@"/>
+ <ant dir="jms-destination-definition" target="${connector-target}"/>
- <echo message="@@## installed libraries EXTENSION_LIST ##@@"/>
- <ant dir="installed-libraries" target="all-ext"/>
+ <echo message="@@## installed libraries EXTENSION_LIST ##@@"/>
+ <ant dir="installed-libraries" target="all-ext"/>
- <echo message="@@## installed libraries (--libraries) ##@@"/>
- <ant dir="installed-libraries" target="all--libraries"/>
+ <echo message="@@## installed libraries (--libraries) ##@@"/>
+ <ant dir="installed-libraries" target="all--libraries"/>
- <echo message="@@## security-map-web#@@"/>
+ <echo message="@@## security-map-web#@@"/>
<ant dir="securitymapweb" target="all"/>
<echo message="@@## rar-accessibility ##@@"/>
@@ -329,31 +329,31 @@
<echo message="@@## osgi-resources-test ##@@"/>
<ant dir="osgi-resources-test" target="all"/>
- <echo message="@@## beanvalidation-simple ##@@"/>
+ <echo message="@@## beanvalidation-simple ##@@"/>
<ant dir="beanvalidation-simple" target="all"/>
<echo message="@@## beanvalidation-simple ##@@"/>
<ant dir="beanvalidation-simple" target="embedded-all"/>
- <!--echo message="@@## defaultConnectorResource-standalone-rar ##@@"/>
+ <!--echo message="@@## defaultConnectorResource-standalone-rar ##@@"/>
<ant dir="defaultConnectorResource-standalone-rar" target="${connector-target}"/-->
- <!--echo message="@@## connector1.6 ##@@"/>
+ <!--echo message="@@## connector1.6 ##@@"/>
<ant dir="connector1.6" target="${connector-target}"/-->
- <!--echo message="@@## Annotated Connector1.5 ##@@"/>
+ <!--echo message="@@## Annotated Connector1.5 ##@@"/>
<ant dir="annotation-connector1.5" target="${connector-target}"/-->
</target>
- <target name="start-record">
- <record name="connector.output" action="start"/>
- </target>
+ <target name="start-record">
+ <record name="connector.output" action="start"/>
+ </target>
- <target name="stop-record">
- <record name="connector.output" action="stop"/>
- </target>
+ <target name="stop-record">
+ <record name="connector.output" action="stop"/>
+ </target>
- <target name="connector">
+ <target name="connector">
<antcall target="connector_group_1"/>
<antcall target="connector_group_2"/>
<antcall target="connector_group_3"/>
@@ -501,7 +501,7 @@
<echo message="@@## connector1.5-resourcesxml ##@@"/>
<ant dir="../connector1.5-resourcesxml" target="all"/>
-
+
<echo message="@@## embeddedConnector1.5-resourcesxml ##@@"/>
<ant dir="../embeddedConnector1.5-resourcesxml" target="all"/>
@@ -519,7 +519,7 @@
<echo message="@@## installed-libraries-resources-xml ##@@"/>
<ant dir="installed-libraries-resources" target="all--libraries"/>
-
+
<echo message="@@## connector1.6-resources-xml ##@@"/>
<ant dir="connector1.6-resources-xml" target="all-with-mappings"/>
@@ -537,7 +537,7 @@
<echo message="@@## connector1.5-resourcesxml-module-scope ##@@"/>
<ant dir="../connector1.5-resourcesxml-module-scope" target="all"/>
-
+
<echo message="jpa-tx_propagation-resources-xml##@@"/>
<ant dir="jpa-tx-propagation-gf-resources-xml" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/build.properties
index 76ed22e..5ad2476 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-CustomResourceFactories"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/client/SimpleBMPClient.java
index d4a2cff..ae7e5e7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/client/SimpleBMPClient.java
@@ -30,19 +30,19 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
- stat.addDescription(testSuite);
+ stat.addDescription(testSuite);
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
try{
// InitialContext ic = new InitialContext();
System.out.println("Appclient lookup : " + ic.lookup("java:app/custom/my-properties-xml-file"));
- }catch(Exception e){
+ }catch(Exception e){
e.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/ejb-jar.xml
index 4a96330..93f8762 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/ejb-jar.xml
@@ -70,6 +70,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/glassfish-resources.xml
index 4d330dd..3fa2450 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/descriptor/glassfish-resources.xml
@@ -55,4 +55,4 @@
<property name="host" value="java.sun.com" />
<property name="protocol" value="http" />
</custom-resource>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/build.properties
index 76ed22e..5ad2476 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-CustomResourceFactories"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/client/SimpleBMPClient.java
index 234c1a4..d971ef7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/client/SimpleBMPClient.java
@@ -30,13 +30,13 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
- stat.addDescription(testSuite);
+ stat.addDescription(testSuite);
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/descriptor/ejb-jar.xml
index deb07ab..8925248 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/descriptor/ejb-jar.xml
@@ -62,6 +62,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/build.properties
index 89ea0d5..7fc5405 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="config-property-accessor-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="rarfile" value="rar/blackbox-tx.rar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/JdbcConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/JdbcConnection.java
index fa64959..bb3656a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/JdbcConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/JdbcConnection.java
@@ -183,7 +183,7 @@
}
/////////////////////////////////////////////
- // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
+ // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
/////////////////////////////////////////////
///////////// BEGIN JDK 1.4 //////////////
@@ -329,27 +329,27 @@
}
///////////// END JDK 1.4 //////////////
-
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
void associateConnection(JdbcManagedConnection newMc)
throws ResourceException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
index 0e47ddc..a968601 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
@@ -109,7 +109,7 @@
if (!getBooleanWithGetBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Get Boolean Accessor is false");
}
-
+
if (!isBooleanWithIsBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Is Boolean Accessor is false");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
index 8f2f354..7925098 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
@@ -44,7 +44,7 @@
}
public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
- return null;
+ return null;
}
public BootstrapContext getBootstrapContext(){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
index be37953..55c65f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
@@ -74,7 +74,7 @@
}catch(NamingException ne){
ne.printStackTrace();
} catch (CreateException e) {
- e.printStackTrace();
+ e.printStackTrace();
}finally{
out.println("END_OF_TEST");
out.flush();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/create_pointbase.sql
index 4234115..ed6dbab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
-INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
-
-Drop table TXLEVELSWITCH2;
-
-CREATE TABLE TXLEVELSWITCH2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
-INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
-
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
+INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
+
+Drop table TXLEVELSWITCH2;
+
+CREATE TABLE TXLEVELSWITCH2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
+INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.properties
index 6302d86..926e522 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/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="connection-factory-definition-embedra"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.xml
index a311eeb..bd69079 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/build.xml
@@ -37,10 +37,10 @@
</target>
<target name="info" depends="init-common">
- <echo message="build.classes.dir is ${build.classes.dir}"/>
- <echo message="s1astest.classpath is ${s1astest.classpath}"/>
+ <echo message="build.classes.dir is ${build.classes.dir}"/>
+ <echo message="s1astest.classpath is ${s1astest.classpath}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,7 +48,7 @@
</target>
<target name="build" depends="compile">
- <echo message="assemble.dir = ${assemble.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}"/>
<!--build and package .war first so it doesn't contain ejb bean !-->
<!--classes that have @Stateless/@Stateul !-->
<antcall target="webclient-war-common">
@@ -71,23 +71,23 @@
<param name="ejbjar.classes"
value="**/Hello**.class"/>
</antcall>
-
+
<ant dir="ra" target="all"/>
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/">
<include name="*.rar"/>
</fileset>
</ear>
-
+
</target>
<target name="setup" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/client/Client.java
index 17301b9..94be353 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/client/Client.java
@@ -58,7 +58,7 @@
} else {
stat.addStatus(tcName, stat.PASS);
}
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -79,7 +79,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null)
System.out.println(line);
if (code != 200) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/application.xml
index 98ffd68..9a68dc5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/application.xml
@@ -35,7 +35,7 @@
<module>
<connector>cfd-ra.rar</connector>
</module>
-
+
<connection-factory>
<description>global-scope resource defined in application DD</description>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/connector-resource.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/connector-resource.xml
index 144abd8..319d6aa 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/connector-resource.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/connector-resource.xml
@@ -20,12 +20,12 @@
<connection-factory xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd>
- <description>global-scope resource defined in application DD</description>
- <name>java:global/env/Application_Level_ConnectionFactory</name>
- <interface-name>jakarta.resource.cci.ConnectionFactory</interface-name>
- <resource-adapter>cfd-ra</resource-adapter>
- <property>
- <name>transactionSupport</name>
- <value>LocalTransaction</value>
- </property>
+ <description>global-scope resource defined in application DD</description>
+ <name>java:global/env/Application_Level_ConnectionFactory</name>
+ <interface-name>jakarta.resource.cci.ConnectionFactory</interface-name>
+ <resource-adapter>cfd-ra</resource-adapter>
+ <property>
+ <name>transactionSupport</name>
+ <value>LocalTransaction</value>
+ </property>
</connection-factory>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/ejb-jar.xml
index c9146bc..8f2161b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/ejb-jar.xml
@@ -18,9 +18,9 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false"
- version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false"
+ version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>connection-factory-definition-embedra-ejb</module-name>
<enterprise-beans>
@@ -29,7 +29,7 @@
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStateful</business-local>
<ejb-class>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStatefulEJB</ejb-class>
-
+
<connection-factory>
<description>global-scope resource to be modified by DD</description>
<name>java:global/env/HelloStatefulEJB_ModByDD_ConnectionFactory</name>
@@ -54,7 +54,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/HelloStatefulEJB_DD_ConnectionFactory</name>
@@ -65,7 +65,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloStatefulEJB_DD_ConnectionFactory</name>
@@ -79,7 +79,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/HelloStatefulEJB_DD_ConnectionFactory</name>
@@ -90,7 +90,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</session>
<session>
<display-name>HelloEJB</display-name>
@@ -122,7 +122,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloEJB_DD_ConnectionFactory</name>
@@ -158,8 +158,8 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</session>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/web.xml
index 4251cf0..fc8a65b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/descriptor/web.xml
@@ -18,8 +18,8 @@
-->
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
version="3.1"
metadata-complete="false">
@@ -73,7 +73,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in Web DD</description>
<name>java:module/env/Web_DD_ConnectionFactory</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
index da9317f..71a0f60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
@@ -36,39 +36,39 @@
properties = {"testName=foo"}
),
@ConnectionFactoryDefinition(
- description = "global-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:global/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "global-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:global/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
resourceAdapter = "#cfd-ra",
transactionSupport = TransactionSupportLevel.LocalTransaction,
maxPoolSize = 16,
minPoolSize = 4,
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
- description = "application-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:app/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "application-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:app/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
transactionSupport = TransactionSupportLevel.XATransaction,
maxPoolSize = 16,
minPoolSize = 4,
resourceAdapter = "#cfd-ra",
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
- description = "module-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:module/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "module-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:module/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
resourceAdapter = "#cfd-ra",
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
- description = "component-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:comp/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "component-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:comp/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
resourceAdapter = "#cfd-ra",
properties = {"testName=foo"}
)
@@ -80,7 +80,7 @@
@jakarta.annotation.Resource(name="java:comp/env/HelloEJB_Annotation_ConnectionFactory")
ConnectionFactory cf;
-
+
public void hello() {
try {
Connection c = cf.getConnection();
@@ -123,7 +123,7 @@
lookupConnectionFactory("java:app/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:module/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:comp/env/HelloEJB_DD_ConnectionFactory", true);
-
+
System.out.println("In HelloEJB::hello()");
}
@@ -150,6 +150,6 @@
}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
index f2e7400..39fa740 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
@@ -120,7 +120,7 @@
lookupConnectionFactory("java:app/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:module/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:comp/env/HelloEJB_DD_ConnectionFactory", false);
-
+
System.out.println("StatefulEJB datasource-definitions Success");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/AbstractResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/AbstractResourceAdapter.java
index 07b9d78..0efcc5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/AbstractResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/AbstractResourceAdapter.java
@@ -23,7 +23,7 @@
private String testName;
protected boolean debug = true;
-
+
public String getTestName() {
return testName;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/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/connector/v3/connection-factory-definition-embedra/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/DeliveryWork.java
index 0034465..dca379a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/DeliveryWork.java
@@ -21,7 +21,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
@@ -30,7 +30,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;
@@ -38,7 +38,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;
@@ -49,7 +49,7 @@
public void run() {
debug("ENTER...");
-
+
try {
//Method onMessage = getOnMessageMethod();
//ep.beforeDelivery(onMessage);
@@ -72,11 +72,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -87,14 +87,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/connector/v3/connection-factory-definition-embedra/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/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/connector/v3/connection-factory-definition-embedra/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/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/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyConnectionFactory.java
index 9f24648..922e71d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyConnectionFactory.java
@@ -32,7 +32,7 @@
private ConnectionManager cm;
private MyManagedConnectionFactory mcf;
private Reference ref;
-
+
public MyConnectionFactory(MyManagedConnectionFactory mcf, ConnectionManager cm) {
super();
this.mcf = mcf;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java
index f34e83b..24506a4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyManagedConnectionFactory.java
@@ -43,7 +43,7 @@
private ConnectionManager cm;
private PrintWriter writer;
private TransactionSupportLevel transactionSupport = TransactionSupportLevel.LocalTransaction;;
-
+
public String getTestName() {
return testName;
}
@@ -68,7 +68,7 @@
}
@Override
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
@@ -79,7 +79,7 @@
}
@Override
- public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
+ public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyWork.java
index 614381e..44899a0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/MyWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class MyWork implements Work {
@@ -31,7 +31,7 @@
private boolean stop = false;
private MessageEndpointFactory factory;
private WorkManager wm;
-
+
public MyWork(
String name, MessageEndpointFactory factory, WorkManager wm) {
this.factory = factory;
@@ -49,7 +49,7 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
/*
@@ -66,7 +66,7 @@
ex.printStackTrace();
}
}
-
+
debug("LEAVE...");
}
@@ -81,14 +81,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/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleActivationSpec.java
index 512e5c6..4b5e5f1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleActivationSpec.java
@@ -25,12 +25,12 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Activation(
messageListeners = {connector.MyMessageListener.class}
)
-public class SimpleActivationSpec
+public class SimpleActivationSpec
implements ActivationSpec, java.io.Serializable {
private String destinationName;
@@ -47,7 +47,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -56,7 +56,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -65,7 +65,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -98,7 +98,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java
index 25611ed..3fd9ded 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -29,14 +29,14 @@
/**
* This is a sample resource adapter
- *
+ *
* @author Qingqing Ouyang
*/
@Connector(
/* moduleName="My Simple RAR", */
- displayName = "Simple Resource Adapter",
- vendorName = "Java Software",
- eisType = "Generic Type",
+ displayName = "Simple Resource Adapter",
+ vendorName = "Java Software",
+ eisType = "Generic Type",
version = "1.0Alpha",
transactionSupport=TransactionSupportLevel.XATransaction)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/TestWMWork.java
index ee0fae9..e248506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/TestWMWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class TestWMWork implements Work {
@@ -37,8 +37,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;
@@ -72,10 +72,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());
}
}
@@ -87,7 +87,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/connector/v3/connection-factory-definition-embedra/ra/src/connector/V3WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/V3WorkDispatcher.java
index 8adf3cc..4b43783 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/V3WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/V3WorkDispatcher.java
@@ -43,7 +43,7 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
try {
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 1;
@@ -72,7 +72,7 @@
debug("V3WorkDispatcher calling DONE()");
done();
debug("V3WorkDispatcher finished calling DONE()");
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/WorkDispatcher.java
index 42249dc..a14443a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/WorkDispatcher.java
@@ -32,7 +32,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -43,11 +43,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected XATerminator xa;
-
+
public WorkDispatcher(
String id,
BootstrapContext ctx,
- MessageEndpointFactory factory,
+ MessageEndpointFactory factory,
ActivationSpec spec) {
this.id = id;
this.ctx = ctx;
@@ -60,7 +60,7 @@
public void run() {
debug("ENTER...");
-
+
try {
synchronized (Controls.readyLock) {
debug("WAIT...");
@@ -82,26 +82,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);
@@ -109,7 +109,7 @@
debug("DONE WRITE TO DB");
Controls.expectedResults = numOfMessages;
notifyAndWait();
-
+
//delete/rollback
ec = startTx();
debug("Start TX - " + ec.getXid());
@@ -125,7 +125,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);
@@ -149,7 +149,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);
@@ -194,7 +194,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 ");
@@ -206,19 +206,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();
}
@@ -245,7 +245,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -260,14 +260,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();
}
@@ -290,13 +290,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/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/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
index ad682c2..529d714 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
@@ -70,7 +70,7 @@
minPoolSize = 4,
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
description="module-scope resource defined by @ConnectionFactoryDefinition",
name = "java:module/env/Servlet_ConnectionFactory",
@@ -78,7 +78,7 @@
resourceAdapter = "#cfd-ra",
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
description="component-scope resource defined by @ConnectionFactoryDefinition",
name = "java:comp/env/Servlet_ConnectionFactory",
@@ -93,7 +93,7 @@
@EJB
private Hello helloStateless;
-
+
@EJB(beanName = "HelloStatefulEJB")
private HelloStateful helloStateful;
@@ -109,7 +109,7 @@
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
// Connection-Factory-Definition through Annotation
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.properties
index fffabc0..1c86a9a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/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="connection-factory-definition"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.xml
index df4d244..6897624 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/build.xml
@@ -37,25 +37,25 @@
</target>
<target name="info" depends="init-common">
- <echo message="build.classes.dir is ${build.classes.dir}"/>
- <echo message="s1astest.classpath is ${s1astest.classpath}"/>
+ <echo message="build.classes.dir is ${build.classes.dir}"/>
+ <echo message="s1astest.classpath is ${s1astest.classpath}"/>
</target>
-
+
<target name="compile-ut" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="ut" destdir="${build.classes.dir}"
- classpath="${env.APS_HOME}/lib/junit.jar:${s1astest.classpath}"
- debug="on"
+ classpath="${env.APS_HOME}/lib/junit.jar:${s1astest.classpath}"
+ debug="on"
includeantruntime="false"
- failonerror="true"/>
+ failonerror="true"/>
</target>
<target name="build-ut" depends="init-common">
<!-- build a special ear which only includes deployment descriptors-->
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${assemble.dir}/temp"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${basedir}/descriptor/ut-application.xml" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App-UT.ear">
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${basedir}/descriptor/ut-application.xml" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App-UT.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
</fileset>
@@ -71,7 +71,7 @@
<unjar src="${assemble.dir}/${appname}App-UT.ear" dest="${assemble.dir}/temp/${appname}App-UT"/>
</target>
-
+
<target name="run-ut" depends="compile-ut">
<junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="true">
<formatter type="plain" usefile="false"/>
@@ -95,7 +95,7 @@
</target>
<target name="build" depends="compile">
- <echo message="assemble.dir = ${assemble.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}"/>
<!--build and package .war first so it doesn't contain ejb bean !-->
<!--classes that have @Stateless/@Stateul !-->
<antcall target="webclient-war-common">
@@ -118,11 +118,11 @@
<param name="ejbjar.classes"
value="**/Hello**.class"/>
</antcall>
-
+
<antcall target="ear-common"/>
<antcall target="build-ut"/>
-
+
<ant dir="ra" target="all"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/client/Client.java
index a831b4c..6788ccc 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/client/Client.java
@@ -58,7 +58,7 @@
} else {
stat.addStatus(tcName, stat.PASS);
}
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -79,7 +79,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null)
System.out.println(line);
if (code != 200) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/connector-resource.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/connector-resource.xml
index 144abd8..319d6aa 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/connector-resource.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/connector-resource.xml
@@ -20,12 +20,12 @@
<connection-factory xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd>
- <description>global-scope resource defined in application DD</description>
- <name>java:global/env/Application_Level_ConnectionFactory</name>
- <interface-name>jakarta.resource.cci.ConnectionFactory</interface-name>
- <resource-adapter>cfd-ra</resource-adapter>
- <property>
- <name>transactionSupport</name>
- <value>LocalTransaction</value>
- </property>
+ <description>global-scope resource defined in application DD</description>
+ <name>java:global/env/Application_Level_ConnectionFactory</name>
+ <interface-name>jakarta.resource.cci.ConnectionFactory</interface-name>
+ <resource-adapter>cfd-ra</resource-adapter>
+ <property>
+ <name>transactionSupport</name>
+ <value>LocalTransaction</value>
+ </property>
</connection-factory>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ejb-jar.xml
index 8593de6..6c2fe26 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ejb-jar.xml
@@ -18,9 +18,9 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false"
- version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false"
+ version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>connection-factory-definition-ejb</module-name>
<enterprise-beans>
@@ -29,7 +29,7 @@
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStateful</business-local>
<ejb-class>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStatefulEJB</ejb-class>
-
+
<connection-factory>
<description>global-scope resource to be modified by DD</description>
<name>java:global/env/HelloStatefulEJB_ModByDD_ConnectionFactory</name>
@@ -54,7 +54,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/HelloStatefulEJB_DD_ConnectionFactory</name>
@@ -65,7 +65,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloStatefulEJB_DD_ConnectionFactory</name>
@@ -79,7 +79,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/HelloStatefulEJB_DD_ConnectionFactory</name>
@@ -90,7 +90,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</session>
<session>
<display-name>HelloEJB</display-name>
@@ -122,7 +122,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>application-scope resource defined in EJB DD</description>
<name>java:app/env/HelloEJB_DD_ConnectionFactory</name>
@@ -158,8 +158,8 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</session>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-application.xml
index d6e8115..e15bca5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-application.xml
@@ -20,7 +20,7 @@
<application xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="7"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd">
<display-name>connection-factory-definitionApp</display-name>
-
+
<module>
<java>connection-factory-definition-client.jar</java>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-entity-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-entity-ejb-jar.xml
index bc60ed7..6100629 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-entity-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-entity-ejb-jar.xml
@@ -18,11 +18,11 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>connection-factory-definition-ejb</module-name>
-
+
<enterprise-beans>
<entity>
<ejb-name>HelloEntity</ejb-name>
@@ -43,7 +43,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/Entity_ConnectionFactory</name>
@@ -57,7 +57,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/Entity_ConnectionFactory</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-interceptor-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-interceptor-ejb-jar.xml
index b12b3e4..a574fb6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-interceptor-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-interceptor-ejb-jar.xml
@@ -18,8 +18,8 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>connection-factory-definition-ejb</module-name>
<interceptors>
@@ -39,7 +39,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/Interceptor_ConnectionFactory</name>
@@ -53,7 +53,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/Interceptor_ConnectionFactory</name>
@@ -66,5 +66,5 @@
</connection-factory>
</interceptor>
</interceptors>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-mdb-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-mdb-ejb-jar.xml
index cc66851..5e997dd 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-mdb-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-mdb-ejb-jar.xml
@@ -18,8 +18,8 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>connection-factory-definition-ejb</module-name>
<enterprise-beans>
@@ -42,7 +42,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/MDB_ConnectionFactory</name>
@@ -56,7 +56,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/MDB_ConnectionFactory</name>
@@ -67,8 +67,8 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</message-driven>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-session-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-session-ejb-jar.xml
index 865ef3a..0c804f0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-session-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-session-ejb-jar.xml
@@ -18,8 +18,8 @@
-->
<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ metadata-complete="false" version="3.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd">
<module-name>connection-factory-definition-ejb</module-name>
<enterprise-beans>
@@ -28,7 +28,7 @@
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStateful</business-local>
<ejb-class>com.sun.s1asdev.ejb.ejb30.hello.session3.HelloStatefulEJB</ejb-class>
-
+
<connection-factory>
<description>global-scope resource defined in EJB DD</description>
<name>java:global/env/StatefulEJB_ConnectionFactory</name>
@@ -42,7 +42,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/StatefulEJB_ConnectionFactory</name>
@@ -56,7 +56,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/StatefulEJB_ConnectionFactory</name>
@@ -67,7 +67,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</session>
<session>
<display-name>HelloEJB</display-name>
@@ -88,7 +88,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in EJB DD</description>
<name>java:module/env/HelloEJB_ConnectionFactory</name>
@@ -102,7 +102,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>component-scope resource defined in EJB DD</description>
<name>java:comp/env/HelloEJB_ConnectionFactory</name>
@@ -113,8 +113,8 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</session>
</enterprise-beans>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-web.xml
index 6924517..01c1149 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/ut-web.xml
@@ -18,8 +18,8 @@
-->
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
version="3.1">
<display-name>connection-factory-definition</display-name>
@@ -61,7 +61,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in Web DD</description>
<name>java:module/env/ConnectionFactory</name>
@@ -72,6 +72,6 @@
<value>foo</value>
</property>
</connection-factory>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/web.xml
index 0982a35..d0f619e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/descriptor/web.xml
@@ -18,8 +18,8 @@
-->
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee web-app_3_1.xsd"
version="3.1"
metadata-complete="false">
@@ -73,7 +73,7 @@
<value>foo</value>
</property>
</connection-factory>
-
+
<connection-factory>
<description>module-scope resource defined in Web DD</description>
<name>java:module/env/Web_DD_ConnectionFactory</name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
index 47ed92c..e50ebef 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
@@ -36,39 +36,39 @@
properties = {"testName=foo"}
),
@ConnectionFactoryDefinition(
- description = "global-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:global/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "global-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:global/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
resourceAdapter = "cfd-ra",
transactionSupport = TransactionSupportLevel.LocalTransaction,
maxPoolSize = 16,
minPoolSize = 4,
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
- description = "application-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:app/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "application-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:app/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
transactionSupport = TransactionSupportLevel.XATransaction,
maxPoolSize = 16,
minPoolSize = 4,
resourceAdapter = "cfd-ra",
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
- description = "module-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:module/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "module-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:module/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
resourceAdapter = "cfd-ra",
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
- description = "component-scope resource defined by @ConnectionFactoryDefinition",
- name = "java:comp/env/HelloEJB_Annotation_ConnectionFactory",
- interfaceName = "jakarta.resource.cci.ConnectionFactory",
+ description = "component-scope resource defined by @ConnectionFactoryDefinition",
+ name = "java:comp/env/HelloEJB_Annotation_ConnectionFactory",
+ interfaceName = "jakarta.resource.cci.ConnectionFactory",
resourceAdapter = "cfd-ra",
properties = {"testName=foo"}
)
@@ -80,7 +80,7 @@
@jakarta.annotation.Resource(name="java:comp/env/HelloEJB_Annotation_ConnectionFactory")
ConnectionFactory cf;
-
+
public void hello() {
try {
Connection c = cf.getConnection();
@@ -123,7 +123,7 @@
lookupConnectionFactory("java:app/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:module/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:comp/env/HelloEJB_DD_ConnectionFactory", true);
-
+
System.out.println("In HelloEJB::hello()");
}
@@ -150,6 +150,6 @@
}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
index dd573b7..33450ee 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
@@ -120,7 +120,7 @@
lookupConnectionFactory("java:app/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:module/env/HelloEJB_DD_ConnectionFactory", true);
lookupConnectionFactory("java:comp/env/HelloEJB_DD_ConnectionFactory", false);
-
+
System.out.println("StatefulEJB datasource-definitions Success");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/AbstractResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/AbstractResourceAdapter.java
index 07b9d78..0efcc5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/AbstractResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/AbstractResourceAdapter.java
@@ -23,7 +23,7 @@
private String testName;
protected boolean debug = true;
-
+
public String getTestName() {
return testName;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/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/connector/v3/connection-factory-definition/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/DeliveryWork.java
index 0034465..dca379a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/DeliveryWork.java
@@ -21,7 +21,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work {
@@ -30,7 +30,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;
@@ -38,7 +38,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;
@@ -49,7 +49,7 @@
public void run() {
debug("ENTER...");
-
+
try {
//Method onMessage = getOnMessageMethod();
//ep.beforeDelivery(onMessage);
@@ -72,11 +72,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -87,14 +87,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/connector/v3/connection-factory-definition/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/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/connector/v3/connection-factory-definition/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/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/connector/v3/connection-factory-definition/ra/src/connector/MyConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyConnectionFactory.java
index 9f24648..922e71d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyConnectionFactory.java
@@ -32,7 +32,7 @@
private ConnectionManager cm;
private MyManagedConnectionFactory mcf;
private Reference ref;
-
+
public MyConnectionFactory(MyManagedConnectionFactory mcf, ConnectionManager cm) {
super();
this.mcf = mcf;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyManagedConnectionFactory.java
index f34e83b..24506a4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyManagedConnectionFactory.java
@@ -43,7 +43,7 @@
private ConnectionManager cm;
private PrintWriter writer;
private TransactionSupportLevel transactionSupport = TransactionSupportLevel.LocalTransaction;;
-
+
public String getTestName() {
return testName;
}
@@ -68,7 +68,7 @@
}
@Override
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
@@ -79,7 +79,7 @@
}
@Override
- public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
+ public ManagedConnection matchManagedConnections(Set candidates, Subject sub, ConnectionRequestInfo reqInfo)
throws ResourceException {
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyWork.java
index 614381e..44899a0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/MyWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class MyWork implements Work {
@@ -31,7 +31,7 @@
private boolean stop = false;
private MessageEndpointFactory factory;
private WorkManager wm;
-
+
public MyWork(
String name, MessageEndpointFactory factory, WorkManager wm) {
this.factory = factory;
@@ -49,7 +49,7 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
/*
@@ -66,7 +66,7 @@
ex.printStackTrace();
}
}
-
+
debug("LEAVE...");
}
@@ -81,14 +81,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/connector/v3/connection-factory-definition/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleActivationSpec.java
index 512e5c6..4b5e5f1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleActivationSpec.java
@@ -25,12 +25,12 @@
* so that the app server can instantiate and configure
* it at the runtime.
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
@Activation(
messageListeners = {connector.MyMessageListener.class}
)
-public class SimpleActivationSpec
+public class SimpleActivationSpec
implements ActivationSpec, java.io.Serializable {
private String destinationName;
@@ -47,7 +47,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -56,7 +56,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -65,7 +65,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -74,7 +74,7 @@
public Integer getTestIntegerProp() {
return this.testIntegerProp;
}
-
+
public void setTestIntegerProp (Integer testProp1) {
debug("setTestIntegerProp () called... testIntegerProp = " + testProp1);
this.testIntegerProp = testProp1;
@@ -98,7 +98,7 @@
}
- }
+ }
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleResourceAdapterImpl.java
index 25611ed..3fd9ded 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -29,14 +29,14 @@
/**
* This is a sample resource adapter
- *
+ *
* @author Qingqing Ouyang
*/
@Connector(
/* moduleName="My Simple RAR", */
- displayName = "Simple Resource Adapter",
- vendorName = "Java Software",
- eisType = "Generic Type",
+ displayName = "Simple Resource Adapter",
+ vendorName = "Java Software",
+ eisType = "Generic Type",
version = "1.0Alpha",
transactionSupport=TransactionSupportLevel.XATransaction)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/TestWMWork.java
index ee0fae9..e248506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/TestWMWork.java
@@ -23,7 +23,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class TestWMWork implements Work {
@@ -37,8 +37,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;
@@ -72,10 +72,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());
}
}
@@ -87,7 +87,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/connector/v3/connection-factory-definition/ra/src/connector/V3WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/V3WorkDispatcher.java
index 8adf3cc..4b43783 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/V3WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/V3WorkDispatcher.java
@@ -43,7 +43,7 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
try {
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 1;
@@ -72,7 +72,7 @@
debug("V3WorkDispatcher calling DONE()");
done();
debug("V3WorkDispatcher finished calling DONE()");
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/WorkDispatcher.java
index 42249dc..a14443a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/WorkDispatcher.java
@@ -32,7 +32,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -43,11 +43,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected XATerminator xa;
-
+
public WorkDispatcher(
String id,
BootstrapContext ctx,
- MessageEndpointFactory factory,
+ MessageEndpointFactory factory,
ActivationSpec spec) {
this.id = id;
this.ctx = ctx;
@@ -60,7 +60,7 @@
public void run() {
debug("ENTER...");
-
+
try {
synchronized (Controls.readyLock) {
debug("WAIT...");
@@ -82,26 +82,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);
@@ -109,7 +109,7 @@
debug("DONE WRITE TO DB");
Controls.expectedResults = numOfMessages;
notifyAndWait();
-
+
//delete/rollback
ec = startTx();
debug("Start TX - " + ec.getXid());
@@ -125,7 +125,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);
@@ -149,7 +149,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);
@@ -194,7 +194,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 ");
@@ -206,19 +206,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();
}
@@ -245,7 +245,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -260,14 +260,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();
}
@@ -290,13 +290,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/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/connector/v3/connection-factory-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
index 6a5047f..22be4b8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
@@ -70,7 +70,7 @@
minPoolSize = 4,
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
description="module-scope resource defined by @ConnectionFactoryDefinition",
name = "java:module/env/Servlet_ConnectionFactory",
@@ -78,7 +78,7 @@
resourceAdapter = "cfd-ra",
properties = {"testName=foo"}
),
-
+
@ConnectionFactoryDefinition(
description="component-scope resource defined by @ConnectionFactoryDefinition",
name = "java:comp/env/Servlet_ConnectionFactory",
@@ -93,7 +93,7 @@
@EJB
private Hello helloStateless;
-
+
@EJB(beanName = "HelloStatefulEJB")
private HelloStateful helloStateful;
@@ -109,7 +109,7 @@
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
// Connection-Factory-Definition through Annotation
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java
index bdc49be..55171d1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java
@@ -71,7 +71,7 @@
ASURLClassLoader classLoader = new ASURLClassLoader(this.getClass().getClassLoader());
classLoader.addURL(archive.toURL());
reader.setClassLoader(classLoader);
-
+
Application applicationDesc = reader.open(archive);
// System.out.println("--------Connector resoruce in application.xml----------");
// for( ConnectionFactoryDefinitionDescriptor cfdd: applicationDesc.getConnectionFactoryDefinitionDescriptors()){
@@ -82,8 +82,8 @@
// }
// System.out.println("");
// }
-
- Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
+
+ Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
ConnectionFactoryDefinitionDescriptor desc;
@@ -134,10 +134,10 @@
reader.setAnnotationProcessingRequested(true);
reader.setClassLoader(classLoader);
assertTrue("Archivist should handle annotations.", reader.isAnnotationProcessingRequested());
-
+
WebBundleDescriptor webDesc = reader.open(archive);
- Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
+ Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
ConnectionFactoryDefinitionDescriptor desc;
@@ -159,7 +159,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("application-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:app/env/Servlet_ConnectionFactory");
@@ -170,7 +170,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:module/env/Servlet_ConnectionFactory");
@@ -178,7 +178,7 @@
desc.setResourceAdapter("cfd-ra");
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("component-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:comp/env/Servlet_ConnectionFactory");
@@ -186,7 +186,7 @@
desc.setResourceAdapter("cfd-ra");
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("global-scope resource defined in Web DD");
desc.setName("java:global/env/Web_DD_ConnectionFactory");
@@ -197,7 +197,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("application-scope resource defined in Web DD");
desc.setName("java:app/env/Web_DD_ConnectionFactory");
@@ -208,7 +208,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined in Web DD");
desc.setName("java:module/env/Web_DD_ConnectionFactory");
@@ -238,7 +238,7 @@
ASURLClassLoader classLoader = new ASURLClassLoader(this.getClass().getClassLoader());
classLoader.addURL(archive.toURL());
-
+
EjbArchivist reader = (EjbArchivist) TestUtil.getByType(EjbArchivist.class);
reader.setClassLoader(classLoader);
reader.setAnnotationProcessingRequested(true);
@@ -249,8 +249,8 @@
for( EjbDescriptor ejbDesc: ejbBundleDesc.getEjbs()){
acturalCFDDs.addAll(ejbDesc.getResourceDescriptors(JavaEEResourceType.CFD));
}
-
- Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
+
+ Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
ConnectionFactoryDefinitionDescriptor desc;
@@ -350,7 +350,7 @@
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
}
-
+
// connection-factory in annotation for stateful EJB
{
desc = new ConnectionFactoryDefinitionDescriptor();
@@ -363,7 +363,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("application-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:app/env/HelloStatefulEJB_Annotation_ConnectionFactory");
@@ -404,7 +404,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("application-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:app/env/HelloEJB_Annotation_ConnectionFactory");
@@ -415,7 +415,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:module/env/HelloEJB_Annotation_ConnectionFactory");
@@ -423,7 +423,7 @@
desc.setResourceAdapter("cfd-ra");
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("component-scope resource defined by @ConnectionFactoryDefinition");
desc.setName("java:comp/env/HelloEJB_Annotation_ConnectionFactory");
@@ -432,9 +432,9 @@
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
}
-
+
TestUtil.compareCFDD(expectedCFDDs, acturalCFDDs);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java
index 9e5f8f5..690aee4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java
@@ -47,23 +47,23 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
public void testApplicationDD() throws Exception{
-
+
String tcName = "connection-factory-definition-application-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-application.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The application.xml not found: "+ddFile,ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
ApplicationDeploymentDescriptorFile ddReader = new ApplicationDeploymentDescriptorFile();
Application application = (Application) ddReader.read( ddIS);
-
+
Set<ResourceDescriptor> actualCFDDs = application.getResourceDescriptors(JavaEEResourceType.CFD);
- Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
+ Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs =
new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
ConnectionFactoryDefinitionDescriptor desc;
@@ -77,7 +77,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setName("java:app/env/ConnectionFactory");
desc.setInterfaceName("jakarta.resource.cci.ConnectionFactory");
@@ -89,7 +89,7 @@
TestUtil.compareCFDD(expectedCFDDs, actualCFDDs);
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -103,18 +103,18 @@
}
public void testSessionEJBDD() throws Exception{
-
+
String tcName = "connection-factory-definition-Session-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-session-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-session-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
-
+
for(EjbDescriptor ejbDescriptor : ejbBundle.getEjbs()){
ejbDescriptor.getResourceDescriptors(JavaEEResourceType.CFD);
if(ejbDescriptor.getName().equals("HelloStatefulEJB")){
@@ -125,9 +125,9 @@
fail("Unknown EJB descriptor: "+ejbDescriptor.getName());
}
}
-
+
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -139,7 +139,7 @@
return;
}
-
+
private void testStatefulSessionEJBDD(EjbDescriptor ejb) throws Exception{
ConnectionFactoryDefinitionDescriptor desc;
Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs = new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
@@ -154,7 +154,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/StatefulEJB_ConnectionFactory");
@@ -175,9 +175,9 @@
expectedCFDDs.put(desc.getName(), desc);
TestUtil.compareCFDD(expectedCFDDs, ejb.getResourceDescriptors(JavaEEResourceType.CFD));
-
+
}
-
+
private void testStatelessSessionEJBDD(EjbDescriptor ejb) throws Exception{
ConnectionFactoryDefinitionDescriptor desc;
Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs = new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
@@ -192,7 +192,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/HelloEJB_ConnectionFactory");
@@ -213,18 +213,18 @@
expectedCFDDs.put(desc.getName(), desc);
TestUtil.compareCFDD(expectedCFDDs, ejb.getResourceDescriptors(JavaEEResourceType.CFD));
-
+
}
-
+
public void testEntityEJBDD() throws Exception{
-
+
String tcName = "connection-factory-definition-Entity-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-entity-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-entity-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
@@ -243,7 +243,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/Entity_ConnectionFactory");
@@ -267,7 +267,7 @@
}
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -281,14 +281,14 @@
}
public void testMDBEJBDD() throws Exception{
-
+
String tcName = "connection-factory-definition-MDB-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-mdb-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-mdb-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
@@ -307,7 +307,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/MDB_ConnectionFactory");
@@ -331,7 +331,7 @@
}
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -345,14 +345,14 @@
}
public void testInterceptorEJBDD() throws Exception{
-
+
String tcName = "connection-factory-definition-Interceptor-EJB-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-interceptor-ejb-jar.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-interceptor-ejb-jar.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
EjbDeploymentDescriptorFile ddReader = new EjbDeploymentDescriptorFile();
EjbBundleDescriptor ejbBundle = (EjbBundleDescriptor) ddReader.read( ddIS);
@@ -371,7 +371,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("module-scope resource defined in EJB DD");
desc.setName("java:module/env/Interceptor_ConnectionFactory");
@@ -395,7 +395,7 @@
}
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
@@ -409,18 +409,18 @@
}
public void testWebDD() throws Exception{
-
+
String tcName = "connection-factory-definition-Web-DD-test";
InputStream ddIS=null;
try{
String ddFileName = "ut-web.xml";
File ddFile = new File(descriptorDir, ddFileName);
Assert.assertTrue("The ut-web.xml not found: "+ddFile, ddFile.exists());
-
+
ddIS = new FileInputStream(ddFile);
WebDeploymentDescriptorFile ddReader = new WebDeploymentDescriptorFile();
WebBundleDescriptor webBundle = ddReader.read( ddIS);
-
+
ConnectionFactoryDefinitionDescriptor desc;
Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs = new HashMap<String,ConnectionFactoryDefinitionDescriptor>();
@@ -434,7 +434,7 @@
desc.setMinPoolSize(4);
desc.addProperty("testName", "foo");
expectedCFDDs.put(desc.getName(), desc);
-
+
desc = new ConnectionFactoryDefinitionDescriptor();
desc.setDescription("application-scope resource defined in Web DD");
desc.setName("java:app/env/ConnectionFactory");
@@ -457,7 +457,7 @@
TestUtil.compareCFDD(expectedCFDDs, webBundle.getResourceDescriptors(JavaEEResourceType.CFD));
stat.addStatus(tcName, stat.PASS);
-
+
}catch(Exception e){
stat.addStatus(tcName, stat.FAIL);
throw e;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java
index 24178cd..7dadd7f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java
@@ -29,45 +29,45 @@
public class TestUtil {
- public static void compareCFDD(Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs,
+ public static void compareCFDD(Map<String,ConnectionFactoryDefinitionDescriptor> expectedCFDDs,
Set<ResourceDescriptor> actualCFDDs) throws Exception{
-
+
for(Descriptor descriptor : actualCFDDs){
ConnectionFactoryDefinitionDescriptor actualDesc = (ConnectionFactoryDefinitionDescriptor)descriptor;
assertNotNull("the name of connector resource cannot be null.", actualDesc.getName());
-
+
ConnectionFactoryDefinitionDescriptor expectedDesc = expectedCFDDs.get(actualDesc.getName());
assertNotNull("The CFD of the name ["+actualDesc.getName()+"] is not expected.", expectedDesc);
-
+
assertEquals("Fail to verify class-name of the CFDD:"+actualDesc.getName(),
expectedDesc.getInterfaceName(), actualDesc.getInterfaceName());
-
+
assertEquals("Fail to verify resource-adapter of the CFDD:"+actualDesc.getName(),
expectedDesc.getResourceAdapter(), actualDesc.getResourceAdapter());
-
+
assertEquals("Fail to verify transaction-support of the CFDD:"+actualDesc.getName(),
expectedDesc.getTransactionSupport(), actualDesc.getTransactionSupport());
-
+
assertEquals("Fail to verify max-pool-size of the CFDD:"+actualDesc.getName(),
expectedDesc.getMaxPoolSize(), actualDesc.getMaxPoolSize());
-
+
assertEquals("Fail to verify min-pool-size of the CFDD:"+actualDesc.getName(),
expectedDesc.getMinPoolSize(), actualDesc.getMinPoolSize());
-
+
assertEquals("Fail to verify description of the CFDD:"+actualDesc.getName(),
expectedDesc.getDescription(), actualDesc.getDescription());
-
+
Properties expectedProps = expectedDesc.getProperties();
Properties actualProps = actualDesc.getProperties();
-
+
for(Object name : actualProps.keySet()){
assertEquals("Fail to verify property ("+name+") of the CFDD:"+actualDesc.getName(),
expectedProps.get(name), actualProps.get(name));
}
-
+
assertEquals("Fail to verify size of properties of the CFDD:"+actualDesc.getName(),
expectedProps.size(), actualProps.size());
-
+
expectedCFDDs.remove(actualDesc.getName());
}
if(expectedCFDDs.size()>0){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/META-INF/ejb-jar.xml
index 38af18c..2905932 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/META-INF/sun-ejb-jar.xml
index 1146a5a..0a7e0da 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,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/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
index e22fa10..4076e49 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -70,11 +70,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();
@@ -93,22 +93,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 {
@@ -134,10 +134,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -172,7 +172,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -183,7 +183,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/Client.java
index 1aee44b..f802141 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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(" Connector 1.5 test - " + testCount, stat.FAIL);
} else {
stat.addStatus(" Connector 1.5 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("connector15");
-
+
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/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
index a48aab1..b373050 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -90,10 +90,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() {}
@@ -103,62 +103,62 @@
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");
@@ -169,7 +169,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -178,9 +178,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
@@ -196,9 +196,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();
@@ -211,9 +211,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/connector/v3/connector1.5/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/servlet/SimpleServlet.java
index 4546754..05e5268 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/servlet/SimpleServlet.java
@@ -44,17 +44,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.5 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
while (!done(out)) {
@@ -70,18 +70,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.5 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.5 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.properties
index 17b23c9..3c942c5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/connector15/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.xml
index 4ff1558..7052664 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/build.xml
@@ -81,15 +81,15 @@
<!--
<target name="runtest" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="connector1.5 (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="connector1.5 (ear based)"/>
+ </antcall>
</target>
-->
<!--
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
- <param name="appname" value="connector15" />
+ <param name="appname" value="connector15" />
</antcall>
</target>
-->
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml
index b6006ef..32b46e3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/build.xml
index ff8bcc2..8496f60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/DeliveryWork.java
index cbed349..5719f27 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/DeliveryWork.java
@@ -29,7 +29,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class DeliveryWork implements Work, ResourceAdapterAssociation {
@@ -39,7 +39,7 @@
private boolean keepCount;
private static int counter = 0;
protected ResourceAdapter raBean;
-
+
public DeliveryWork(MessageEndpoint ep, int numOfMessages, String op) {
this.ep = ep;
this.num = numOfMessages;
@@ -47,7 +47,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;
@@ -94,11 +94,11 @@
}
//ep.afterDelivery();
-
+
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
debug("LEAVE...");
}
@@ -109,14 +109,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/connector/v3/connector1.5/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/MyAdminObject.java
index 10483ed..1d02c62 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/MyAdminObject.java
@@ -38,13 +38,13 @@
}
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")) {
synchronized (Controls.readyLock){
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/connector/v3/connector1.5/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/MyWork.java
index 3bdedaf..9e0eb92 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/MyWork.java
@@ -30,7 +30,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class MyWork implements Work, ResourceAdapterAssociation {
@@ -39,7 +39,7 @@
private MessageEndpointFactory factory;
private WorkManager wm;
protected ResourceAdapter raBean;
-
+
public MyWork(
String name, MessageEndpointFactory factory, WorkManager wm) {
this.factory = factory;
@@ -66,7 +66,7 @@
try {
Method onMessage = getOnMessageMethod();
- System.out.println("isDeliveryTransacted = " +
+ System.out.println("isDeliveryTransacted = " +
factory.isDeliveryTransacted(onMessage));
/*
@@ -83,7 +83,7 @@
ex.printStackTrace();
}
}
-
+
debug("LEAVE...");
}
@@ -98,14 +98,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/connector/v3/connector1.5/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
index 7c27e96..7b0bbbb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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,12 +68,12 @@
//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...");
/*
@@ -90,16 +90,16 @@
System.out.println(" ex = " + ex.getMessage());
//xa.rollback(xid1);
}
-
+
*/
/*
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
@@ -109,14 +109,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
@@ -133,7 +133,7 @@
ex.printStackTrace();
}
-
+
for (int i = 0 ; i < 3; i++) {
TestWMWork w = new TestWMWork(i, false);
try {
@@ -141,7 +141,7 @@
} catch (Exception ex) {
System.out.println("FAIL: CAUGHT exception : i = " + i);
ex.printStackTrace();
- }
+ }
}
for (int i = 3 ; i < 6; i++) {
@@ -224,13 +224,13 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
-
+
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -246,7 +246,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/connector/v3/connector1.5/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/TestWMWork.java
index bb05534..de93bc1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.5/ra/src/connector/V3WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/V3WorkDispatcher.java
index 8adf3cc..4b43783 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/V3WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/V3WorkDispatcher.java
@@ -43,7 +43,7 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
try {
MessageEndpoint ep = factory.createEndpoint(new FakeXAResource());
int numOfMessages = 1;
@@ -72,7 +72,7 @@
debug("V3WorkDispatcher calling DONE()");
done();
debug("V3WorkDispatcher finished calling DONE()");
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/WorkDispatcher.java
index 64b71c4..762e03e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/WorkDispatcher.java
@@ -33,7 +33,7 @@
/**
*
- * @author Qingqing Ouyang
+ * @author Qingqing Ouyang
*/
public class WorkDispatcher implements Work {
@@ -44,11 +44,11 @@
protected ActivationSpec spec;
protected WorkManager wm;
protected 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();
}
@@ -246,7 +246,7 @@
done();
}
}
-
+
debug("LEAVE...");
}
@@ -261,14 +261,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();
}
@@ -291,13 +291,13 @@
try {
//Sleep for 5 seconds
//Thread.currentThread().sleep(5*1000);
-
+
synchronized(Controls.readyLock) {
//Notify the client to check the results
- Controls.readyLock.notifyAll();
+ Controls.readyLock.notifyAll();
//Wait until results are verified by the client
- Controls.readyLock.wait();
+ Controls.readyLock.wait();
if (stop) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/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/connector/v3/connector1.6-resources-xml/app/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/META-INF/glassfish-resources.xml
index 05a0687..b3b319a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/META-INF/glassfish-resources.xml
@@ -73,4 +73,4 @@
<jdbc-resource enabled="true" jndi-name="java:app/jdbc/XAPointbase" object-type="user" pool-name="java:app/jdbc-pointbase-pool1"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-gf-resources.xml
index 1b3f95e..ddce74d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-gf-resources.xml
@@ -53,4 +53,4 @@
</jdbc-connection-pool>
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/ejb-level-ds" object-type="user" pool-name="java:module/jdbc/ejb-level-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-jar.xml
index 582b781..12fb6d3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/ejb-jar.xml
@@ -114,8 +114,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/connector/v3/connector1.6-resources-xml/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/sun-ejb-jar.xml
index e46577f..cb8cd23 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:app/eis/testAdmin</jndi-name>
+ <jndi-name>java:app/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/web-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/web-gf-resources.xml
index 816d5a9..c658a07 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/web-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/META-INF/web-gf-resources.xml
@@ -53,4 +53,4 @@
</jdbc-connection-pool>
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/web-level-ds" object-type="user" pool-name="java:module/jdbc/web-level-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
index a83c924..e8eedb0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -73,7 +73,7 @@
System.out.println("mao.getRA() is null");
}
}catch(Exception e){
- e.printStackTrace();
+ e.printStackTrace();
}
return pass;
}
@@ -86,11 +86,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();
@@ -109,22 +109,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 {
@@ -150,10 +150,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -188,7 +188,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -199,7 +199,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/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/connector/v3/connector1.6-resources-xml/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/Client.java
index 21d4488..c7430d6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/client/Client.java
@@ -28,22 +28,22 @@
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 {
@@ -54,26 +54,26 @@
e.printStackTrace();
}
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.6 test - " + testCount, stat.FAIL);
} else {
stat.addStatus("ID Connector 1.6 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -83,14 +83,14 @@
}
stat.printSummary("connector1.6ID");
-
+
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();
@@ -99,7 +99,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();
@@ -107,7 +107,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();
@@ -115,7 +115,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/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
index 19bfdb4..28a574c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
@@ -31,41 +31,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -76,7 +76,7 @@
//log("onMessage:: getCallerPrincipal : " + mdc.getCallerPrincipal());
//System.out.println("onMessage : ThreadID : " + Thread.currentThread().getName());
if(mdc.getCallerPrincipal() != null){
- log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
+ log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
}
log("onMessage : isCallerInRole('jagadish') : " + mdc.isCallerInRole("jagadish"));
@@ -85,7 +85,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -99,10 +99,10 @@
ex.printStackTrace();
}
}
-
+
/**
- * 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() {}
@@ -112,62 +112,62 @@
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");
@@ -178,7 +178,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -187,9 +187,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
@@ -205,9 +205,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();
@@ -220,9 +220,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/connector/v3/connector1.6-resources-xml/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/servlet/SimpleServlet.java
index be37a4a..a1c62f7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/servlet/SimpleServlet.java
@@ -44,17 +44,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.6 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
@@ -81,18 +81,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.6 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.6 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/build.properties
index 207a486..083b262 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/connector16/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/glassfish-resources.xml
index a9349fc..0fcabdd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/glassfish-resources.xml
@@ -48,4 +48,4 @@
<principal-map eis-principal="eis-prasath" mapped-principal="prasath" />
<principal-map eis-principal="eis-jagadish" mapped-principal="jagadish" />
</work-security-map>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/ra.xml
index 9781e16..3ccf296 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/META-INF/ra.xml
@@ -51,7 +51,7 @@
</config-property-confidential>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -62,7 +62,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/build.xml
index ed29889..8528818 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/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/connector/v3/connector1.6-resources-xml/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/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/connector/v3/connector1.6-resources-xml/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/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/connector/v3/connector1.6-resources-xml/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/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/connector/v3/connector1.6-resources-xml/ra/src/connector/JSR322Work.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/JSR322Work.java
index 5107ac1..0203f4a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/JSR322Work.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/JSR322Work.java
@@ -48,6 +48,6 @@
public void run(){
super.run();
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MyAdminObject.java
index a68a5b7..9c28812 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MyAdminObject.java
@@ -51,11 +51,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/connector/v3/connector1.6-resources-xml/ra/src/connector/MySecurityContext.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MySecurityContext.java
index 3178c1c..e19051e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MySecurityContext.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/MySecurityContext.java
@@ -62,7 +62,7 @@
CallerPrincipalCallback cpc = new CallerPrincipalCallback(execSubject, new PrincipalImpl(principalName));
debug("setting caller principal callback with principal : " + principalName);
callbacks.add(cpc);
-
+
/*
GroupPrincipalCallback gpc = new GroupPrincipalCallback(execSubject, null);
callbacks.add(gpc);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/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/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java
index c01c31e..69a721b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java
@@ -86,7 +86,7 @@
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 {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/XID.java
index 18a970d..b2a906c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/ejb-jar.xml
index 582b781..12fb6d3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/ejb-jar.xml
@@ -114,8 +114,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/connector/v3/connector1.6/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/sun-ejb-jar.xml
index 49e8c07..be097b7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/META-INF/sun-ejb-jar.xml
@@ -32,7 +32,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -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/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
index a83c924..e8eedb0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -73,7 +73,7 @@
System.out.println("mao.getRA() is null");
}
}catch(Exception e){
- e.printStackTrace();
+ e.printStackTrace();
}
return pass;
}
@@ -86,11 +86,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();
@@ -109,22 +109,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 {
@@ -150,10 +150,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -188,7 +188,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -199,7 +199,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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/connector/v3/connector1.6/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/Client.java
index 9343506..3939257 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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.6 test - " + testCount, stat.FAIL);
} else {
stat.addStatus("ID Connector 1.6 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("connector1.6ID");
-
+
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/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
index 19bfdb4..28a574c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
@@ -31,41 +31,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -76,7 +76,7 @@
//log("onMessage:: getCallerPrincipal : " + mdc.getCallerPrincipal());
//System.out.println("onMessage : ThreadID : " + Thread.currentThread().getName());
if(mdc.getCallerPrincipal() != null){
- log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
+ log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
}
log("onMessage : isCallerInRole('jagadish') : " + mdc.isCallerInRole("jagadish"));
@@ -85,7 +85,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -99,10 +99,10 @@
ex.printStackTrace();
}
}
-
+
/**
- * 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() {}
@@ -112,62 +112,62 @@
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");
@@ -178,7 +178,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -187,9 +187,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
@@ -205,9 +205,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();
@@ -220,9 +220,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/connector/v3/connector1.6/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/servlet/SimpleServlet.java
index be37a4a..a1c62f7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/servlet/SimpleServlet.java
@@ -44,17 +44,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.6 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
@@ -81,18 +81,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.6 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.6 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.properties
index 207a486..083b262 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/connector16/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.xml
index cc1dec0..f047011 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/build.xml
@@ -134,7 +134,7 @@
</antcall>
<antcall target="restore-default-security-permission"/>
-
+
<antcall target="delete-password-alias">
<param name="password.alias.name" value="ALIAS_TEST_PROPERTY"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml
index f22ca3c..ad950c7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml
@@ -51,7 +51,7 @@
</config-property-confidential>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -62,7 +62,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/build.xml
index ed29889..8528818 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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/connector/v3/connector1.6/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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/connector/v3/connector1.6/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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/connector/v3/connector1.6/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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/connector/v3/connector1.6/ra/src/connector/JSR322Work.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/JSR322Work.java
index 5107ac1..0203f4a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/JSR322Work.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/JSR322Work.java
@@ -48,6 +48,6 @@
public void run(){
super.run();
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MyAdminObject.java
index 2b28d62..8e7bac2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MyAdminObject.java
@@ -73,11 +73,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/connector/v3/connector1.6/ra/src/connector/MySecurityContext.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MySecurityContext.java
index 3178c1c..e19051e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MySecurityContext.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/MySecurityContext.java
@@ -62,7 +62,7 @@
CallerPrincipalCallback cpc = new CallerPrincipalCallback(execSubject, new PrincipalImpl(principalName));
debug("setting caller principal callback with principal : " + principalName);
callbacks.add(cpc);
-
+
/*
GroupPrincipalCallback gpc = new GroupPrincipalCallback(execSubject, null);
callbacks.add(gpc);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/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/connector/v3/connector1.6/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/SimpleResourceAdapterImpl.java
index d07c4e9..0867862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/SimpleResourceAdapterImpl.java
@@ -84,11 +84,11 @@
spec.validate();
work = new WorkDispatcher("DISPATCHER", ctx, factory, spec);
wm.scheduleWork(work, 30 * 1000, null, null);
-
+
//Test if a resource defined in the comp's namespace is available
Object o = (new InitialContext()).lookup("java:comp/env/MyDB");
System.out.println("**** lookedup in RA endpointActivation:" + o);
-
+
debug("B.001. Scheduled Dispatcher");
} catch (Exception ex) {
ex.printStackTrace();
@@ -106,7 +106,7 @@
System.out.println("lookedup in RA endpointDeactivation:" + o);
} catch (Exception ex){
System.out.println("**** Error while looking up in component context " +
- "in endpointDeactivation");
+ "in endpointDeactivation");
ex.printStackTrace();
throw new RuntimeException(ex);
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java
index 50af186..7fdcafd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java
@@ -86,7 +86,7 @@
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 {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/XID.java
index 18a970d..b2a906c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/build.properties
index 76ed22e..5ad2476 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-CustomResourceFactories"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/client/SimpleBMPClient.java
index 8f2f685..43704e4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/client/SimpleBMPClient.java
@@ -30,13 +30,13 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
- stat.addDescription(testSuite);
+ stat.addDescription(testSuite);
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/ejb-jar.xml
index 4a96330..93f8762 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/ejb-jar.xml
@@ -70,6 +70,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/glassfish-resources.xml
index 88dc0a7..3134795 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/descriptor/glassfish-resources.xml
@@ -55,4 +55,4 @@
<property name="host" value="java.sun.com" />
<property name="protocol" value="http" />
</custom-resource>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/build.properties
index 1c0e3cd..f6cbfa5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/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="datasource-definition"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/client/Client.java
index db2bb97..4766ac1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/client/Client.java
@@ -77,7 +77,7 @@
//The only way to confirm the fix for IT 9292 is that appclient console
//should not have "invalidDescriptorFailureException" printed
//no isolation level specified
- @DataSourceDefinition(name = "java:comp/env/Appclient_DataSource2",
+ @DataSourceDefinition(name = "java:comp/env/Appclient_DataSource2",
minPoolSize = 0,
initialPoolSize = 0,
className = "org.apache.derby.jdbc.ClientXADataSource",
@@ -210,7 +210,7 @@
return true;
} catch (Exception e) {
if(expectSuccess){
- e.printStackTrace();
+ e.printStackTrace();
}
return false;
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/application-client.xml
index e6f90f5..ab09cc2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/application-client.xml
@@ -46,7 +46,7 @@
<value>;create=true</value>
</property>
<login-timeout>0</login-timeout>
- <transactional>true</transactional>
+ <transactional>true</transactional>
<isolation-level>TRANSACTION_REPEATABLE_READ</isolation-level>
<initial-pool-size>-1</initial-pool-size>
<max-pool-size>-1</max-pool-size>
@@ -67,7 +67,7 @@
<value>;create=true</value>
</property>
<login-timeout>0</login-timeout>
- <transactional>true</transactional>
+ <transactional>true</transactional>
<isolation-level>TRANSACTION_REPEATABLE_READ</isolation-level>
<initial-pool-size>-1</initial-pool-size>
<max-pool-size>-1</max-pool-size>
@@ -88,7 +88,7 @@
<value>;create=true</value>
</property>
<login-timeout>0</login-timeout>
- <transactional>true</transactional>
+ <transactional>true</transactional>
<isolation-level>TRANSACTION_REPEATABLE_READ</isolation-level>
<initial-pool-size>-1</initial-pool-size>
<max-pool-size>-1</max-pool-size>
@@ -110,7 +110,7 @@
<value>;create=true</value>
</property>
<login-timeout>300</login-timeout>
- <transactional>false</transactional>
+ <transactional>false</transactional>
<isolation-level>TRANSACTION_REPEATABLE_READ</isolation-level>
<initial-pool-size>1</initial-pool-size>
<max-pool-size>2</max-pool-size>
@@ -131,7 +131,7 @@
<value>;create=true</value>
</property>
<login-timeout>0</login-timeout>
- <transactional>true</transactional>
+ <transactional>true</transactional>
<isolation-level>TRANSACTION_REPEATABLE_READ</isolation-level>
<initial-pool-size>-1</initial-pool-size>
<max-pool-size>-1</max-pool-size>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/web.xml
index 62063c5..1c4535b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/descriptor/web.xml
@@ -43,7 +43,7 @@
<value>;create=true</value>
</property>
</data-source>
-
+
<data-source>
<name>java:comp/env/Servlet_DD_DataSource</name>
<class-name>org.apache.derby.jdbc.ClientDataSource</class-name>
@@ -58,6 +58,6 @@
</property>
</data-source>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
index 9adb9a2..9c753f9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
@@ -34,13 +34,13 @@
value = {
//pure annotation that has url and no standard properties
//test-case for issue-14918
- @DataSourceDefinition(name="java:app/jdbc/appds_driver",
- className="org.apache.derby.jdbc.ClientDriver",
- user="dbuser",
- password="dbpassword",
- transactional=false,
- url="jdbc:derby://localhost:1527/testdb;create=true"
- ),
+ @DataSourceDefinition(name="java:app/jdbc/appds_driver",
+ className="org.apache.derby.jdbc.ClientDriver",
+ user="dbuser",
+ password="dbpassword",
+ transactional=false,
+ url="jdbc:derby://localhost:1527/testdb;create=true"
+ ),
@DataSourceDefinition(name = "java:global/env/HelloEJB_DataSource",
className = "org.apache.derby.jdbc.EmbeddedXADataSource",
@@ -73,13 +73,13 @@
),
// annotation + DD where URL specified in annotation wins
//test-case for issue-14918
- @DataSourceDefinition(name="java:module/env/HelloEJB_DataSource_driver",
- className="org.apache.derby.jdbc.ClientDriver",
- user="dbuser",
- password="dbpassword",
- transactional=false,
- url="jdbc:derby://localhost:1527/testdb;create=true"
- )
+ @DataSourceDefinition(name="java:module/env/HelloEJB_DataSource_driver",
+ className="org.apache.derby.jdbc.ClientDriver",
+ user="dbuser",
+ password="dbpassword",
+ transactional=false,
+ url="jdbc:derby://localhost:1527/testdb;create=true"
+ )
}
)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
index db30d12..068ae5c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
@@ -62,7 +62,7 @@
),
// only user should be considered.
- // incorrect values for : className, portNumber, url, properties which should be ignored
+ // incorrect values for : className, portNumber, url, properties which should be ignored
@DataSourceDefinition(name = "java:global/env/HelloStatefulEJB_DD_DataSource",
minPoolSize = 0,
initialPoolSize = 0,
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
index 1249e09..520bf51 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
@@ -36,8 +36,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>
@@ -55,8 +55,8 @@
</fileset>
<fileset dir="../ra">
<!-- <include name="*.rar"/> -->
- <!--<include name="sivajdbcra.rar"/>-->
- <include name="generic-ra.rar"/>
+ <!--<include name="sivajdbcra.rar"/>-->
+ <include name="generic-ra.rar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="reporter.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/build.properties
index ccf2433..1505150 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
index 0fc57d6..cc2b370 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
@@ -121,17 +121,17 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
dbConnection = ds.getConnection("dbuser","dbpassword");
-
+
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");
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.properties
index 9450d0d..5635439 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/defaultResource/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.xml
index 5b0d3dd..c4ba2d6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/build.xml
@@ -52,7 +52,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/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/build.xml
index 96146ff..46ec7c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/build.xml
@@ -35,7 +35,7 @@
<jar jarfile="generic-ra.rar" basedir="."
includes="generic-ra.jar, META-INF/ra.xml" />
- <echo message="inside all of ra build.xml"></echo>
+ <echo message="inside all of ra build.xml"></echo>
</target>
<!-- @Siva This deploy/undeploy target is never called as it is an embedded RA -->
<target name="deploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/build.xml
index ff8bcc2..8496f60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/MyAdminObject.java
index 862f9ff..d199d01 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/SimpleActivationSpec.java
index 946d987..bb7918e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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;
@@ -42,7 +42,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -51,7 +51,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -60,7 +60,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -76,7 +76,7 @@
this.resourceadapter = ra;
}
- public void validate() {}
+ public void validate() {}
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/SimpleResourceAdapterImpl.java
index 58813b3..4c5d98f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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,22 +68,22 @@
//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
@@ -93,14 +93,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
@@ -117,7 +117,7 @@
ex.printStackTrace();
}
-
+
for (int i = 0 ; i < 3; i++) {
TestWMWork w = new TestWMWork(i, false);
try {
@@ -125,7 +125,7 @@
} catch (Exception ex) {
System.out.println("FAIL: CAUGHT exception : i = " + i);
ex.printStackTrace();
- }
+ }
}
for (int i = 3 ; i < 6; i++) {
@@ -206,12 +206,12 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -227,7 +227,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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/TestWMWork.java
index 7e585a3..9cd0663 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/WorkDispatcher.java
index 34a604f..cd98c45 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/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/connector/v3/defaultConnectorResource/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
index c60e609..2bd69f5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
@@ -36,8 +36,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>
@@ -55,8 +55,8 @@
</fileset>
<fileset dir="../ra">
<!-- <include name="*.rar"/> -->
- <include name="sivajdbcra.rar"/>
- <include name="generic-ra.rar"/>
+ <include name="sivajdbcra.rar"/>
+ <include name="generic-ra.rar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="reporter.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.properties
index ccf2433..1505150 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
index 90ba055..b8420f3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
@@ -123,17 +123,17 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
dbConnection = ds.getConnection("dbuser","dbpassword");
-
+
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");
*/
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.properties
index 9450d0d..5635439 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/defaultResource/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml
index 2ca2ebc..21deb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml
index 96146ff..46ec7c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml
@@ -35,7 +35,7 @@
<jar jarfile="generic-ra.rar" basedir="."
includes="generic-ra.jar, META-INF/ra.xml" />
- <echo message="inside all of ra build.xml"></echo>
+ <echo message="inside all of ra build.xml"></echo>
</target>
<!-- @Siva This deploy/undeploy target is never called as it is an embedded RA -->
<target name="deploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/build.xml
index ff8bcc2..8496f60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/Messages.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/Messages.java
index b5b0f02..4c9c012 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/Messages.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/MyAdminObject.java
index 862f9ff..d199d01 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/MyWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/MyWork.java
index 2ecec63..a9a8881 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/MyWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/SimpleActivationSpec.java
index 946d987..bb7918e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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;
@@ -42,7 +42,7 @@
public String getDestinationName () {
return this.destinationName;
}
-
+
public void setDestinationName (String name) {
debug("setDestinationName() called... name = " + name);
this.destinationName = name;
@@ -51,7 +51,7 @@
public String getDestinationType() {
return this.destinationType;
}
-
+
public void setDestinationType (String type) {
debug("setDestinationType () called... type = " + type);
this.destinationType= type;
@@ -60,7 +60,7 @@
public String getTestProp() {
return this.testProp;
}
-
+
public void setTestProp (String testProp) {
debug("setTestProp () called... testProp = " + testProp);
this.testProp = testProp;
@@ -76,7 +76,7 @@
this.resourceadapter = ra;
}
- public void validate() {}
+ public void validate() {}
private void debug (String message)
{
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/SimpleResourceAdapterImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/SimpleResourceAdapterImpl.java
index 58813b3..4c5d98f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/SimpleResourceAdapterImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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,22 +68,22 @@
//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
@@ -93,14 +93,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
@@ -117,7 +117,7 @@
ex.printStackTrace();
}
-
+
for (int i = 0 ; i < 3; i++) {
TestWMWork w = new TestWMWork(i, false);
try {
@@ -125,7 +125,7 @@
} catch (Exception ex) {
System.out.println("FAIL: CAUGHT exception : i = " + i);
ex.printStackTrace();
- }
+ }
}
for (int i = 3 ; i < 6; i++) {
@@ -206,12 +206,12 @@
public void
endpointDeactivation (
- MessageEndpointFactory endpointFactory,
+ MessageEndpointFactory endpointFactory,
ActivationSpec spec) {
debug ("endpointDeactivation called...");
((WorkDispatcher) work).stop();
}
-
+
public String getTestName() {
return testName;
}
@@ -227,7 +227,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/connector/v3/defaultConnectorResource/ra/src/connector/TestWMWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/TestWMWork.java
index 7e585a3..9cd0663 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/TestWMWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/WorkDispatcher.java
index 34a604f..cd98c45 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/defaultConnectorResource/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/XID.java
index 77dbf34..6bd9e57 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/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/connector/v3/embeddedweb-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.xml
index cf21e1d..e1b5f20 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/build.xml
@@ -32,14 +32,14 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
@@ -51,7 +51,7 @@
<param name="sql.file" value="sql/dropBankTables.sql"/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<ant dir="ra" target="compile"/>
<antcall target="compile-common">
@@ -65,9 +65,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -76,41 +76,41 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <mkdir dir="${assemble.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${assemble.dir}/META-INF"/>
<copy file="descriptor/glassfish-resources.xml" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="true" filtering="true">
</copy>
<copy file="descriptor/glassfish-resources.xml" tofile="${assemble.dir}/META-INF/glassfish-resources.xml" failonerror="true" filtering="true">
</copy>
- <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"/>
<include name="META-INF/*.xml"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -118,28 +118,28 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="embeddedweb (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="embeddedweb (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="embeddedweb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="embeddedweb (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="undeploy-common">
<param name="extra-params" value="--cascade=true"/>
</antcall>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/v3/embeddedweb-resources-xml/descriptor/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/glassfish-resources.xml
index db12980..957b884 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/glassfish-resources.xml
@@ -58,4 +58,4 @@
<resource-adapter-config resource-adapter-name="web-subclassingApp#jdbcra">
<property name="RAProperty" value="VALID"></property>
</resource-adapter-config>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/sun-ejb-jar.xml
index 7995ce3..51f3bec 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>java:app/jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>java:app/jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
index 8a9b105..160eab9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
@@ -44,4 +44,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerChecking.java
index 61de291..b341c34 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerChecking.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
index 0520b60..07220db 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavings.java
index 338c921..883e04a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavings.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.xml
index ebea87b..34f6366 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index 70029f1..e966f98 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,169 +50,169 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
System.out.println("V3-TEST : " + dataSourceObject);
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
System.out.println("V3-TEST : " + dataSourceObject);
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index a956d97..11ad746 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/*
@@ -279,184 +279,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -506,162 +506,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 277efba..f7ea82b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -128,7 +128,7 @@
<config-property-value>testdb</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbuser</config-property-value>
@@ -139,12 +139,12 @@
<config-property-value>dbuser</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbpassword</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -154,7 +154,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>-->
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
@@ -165,17 +165,17 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
@@ -186,7 +186,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
@@ -198,82 +198,82 @@
</config-property>
<!--
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
-->
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index a9fa5f1..b1fc0e5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,7 +68,7 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
@@ -78,36 +78,36 @@
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
} catch(Exception e){
System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
+ e.printStackTrace();
}
System.out.println("V3-TEST : got connection");
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
/*
@@ -117,15 +117,15 @@
System.out.println("V3-TEST : returning connection");
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -136,409 +136,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -548,35 +548,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DataSource.java
index d90085d..51f1773 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,58 +51,58 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -115,91 +115,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
index efdf0d7..e209aac 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
@@ -17,16 +17,16 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
-import jakarta.ejb.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -42,14 +42,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -65,14 +65,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -89,7 +89,7 @@
customerSavings = customerSavingsLocalHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -102,7 +102,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -114,7 +114,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -126,12 +126,12 @@
customerSavingsLocalHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -141,7 +141,7 @@
customerSavings = (CustomerSavings)customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -150,7 +150,7 @@
customerChecking = (CustomerChecking)customerCheckingLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -210,9 +210,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
index d7e7fa1..c700654 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
@@ -32,7 +32,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<!--
<target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -41,15 +41,15 @@
<target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
@@ -57,41 +57,41 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup">
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/simpleBank.sql"/>
- </antcall>
- <antcall target="create-pool"/>
- <antcall target="create-resource"/>
- <antcall target="create-admin-object"/>
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/simpleBank.sql"/>
+ </antcall>
+ <antcall target="create-pool"/>
+ <antcall target="create-resource"/>
+ <antcall target="create-admin-object"/>
</target>
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
<target name="create-pool">
- <antcall target="create-connector-connpool-common">
+ <antcall target="create-connector-connpool-common">
<param name="ra.name" value="${appname}App#jdbcra"/>
<param name="extra-params" value="--matchconnections=false"/>
<param name="connection.defname" value="javax.sql.DataSource"/>
<param name="connector.conpool.name" value="embedded-ra-pool"/>
</antcall>
<antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
</target>
<target name="create-resource">
<antcall target="create-connector-resource-common">
@@ -104,18 +104,18 @@
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -123,16 +123,16 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
<target name="unsetup">
@@ -144,7 +144,7 @@
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>-->
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -154,7 +154,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -170,9 +170,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -181,35 +181,35 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="create-ra-config"/>
<antcall target="deploy-common"/>
@@ -218,29 +218,29 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="embeddedweb (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="embeddedweb (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="embeddedweb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="embeddedweb (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common">
<param name="extra-params" value="--cascade=true"/>
</antcall>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/v3/embeddedweb/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/sun-ejb-jar.xml
index 1d1200d..df4bb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
index 8a9b105..160eab9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
@@ -44,4 +44,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerChecking.java
index 61de291..b341c34 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerChecking.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
index 0520b60..07220db 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavings.java
index 338c921..883e04a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavings.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml
index cb6ff31..23a1a0c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index 70029f1..e966f98 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,169 +50,169 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
System.out.println("V3-TEST : " + dataSourceObject);
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
System.out.println("V3-TEST : " + dataSourceObject);
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index a956d97..11ad746 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/*
@@ -279,184 +279,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -506,162 +506,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 277efba..f7ea82b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -128,7 +128,7 @@
<config-property-value>testdb</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbuser</config-property-value>
@@ -139,12 +139,12 @@
<config-property-value>dbuser</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbpassword</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -154,7 +154,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>-->
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
@@ -165,17 +165,17 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
@@ -186,7 +186,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
@@ -198,82 +198,82 @@
</config-property>
<!--
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
-->
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index a9fa5f1..b1fc0e5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,7 +68,7 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
@@ -78,36 +78,36 @@
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
} catch(Exception e){
System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
+ e.printStackTrace();
}
System.out.println("V3-TEST : got connection");
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
/*
@@ -117,15 +117,15 @@
System.out.println("V3-TEST : returning connection");
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -136,409 +136,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -548,35 +548,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
index d90085d..51f1773 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,58 +51,58 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -115,91 +115,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
index bc7b55d..9892ff6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
@@ -17,16 +17,16 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
-import jakarta.ejb.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -42,14 +42,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -65,14 +65,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -89,7 +89,7 @@
customerSavings = customerSavingsLocalHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -102,7 +102,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -114,7 +114,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -126,12 +126,12 @@
customerSavingsLocalHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -141,7 +141,7 @@
customerSavings = (CustomerSavings)customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -150,7 +150,7 @@
customerChecking = (CustomerChecking)customerCheckingLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -210,9 +210,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/build.xml
index 53f8dde..501f37c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/build.xml
@@ -36,8 +36,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>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/ejb-jar.xml
index e94042b..8e547c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/ejb-jar.xml
@@ -33,8 +33,8 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
<resource-env-ref>
- <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
+ <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
+ <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
</resource-env-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/sun-ejb-jar.xml
index e73cb46..3fde230 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/META-INF/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<ejb>
<ejb-name>MyVersionChecker</ejb-name>
<jndi-name>MyVersionChecker</jndi-name>
-<!--
+<!--
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
@@ -42,10 +42,10 @@
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
--->
+-->
<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/connector/v3/force-deploy-rar/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/client/Client.java
index 7edb357..7663ed6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/client/Client.java
@@ -27,36 +27,36 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) {
Client client = new Client();
- System.out.println("Client: Args: ");
- for(int i = 0 ; i< args.length; i++) {
- System.out.println("Client: Args: " + args[i]);
- }
- Integer versionNumber = new Integer(args[0]);
+ System.out.println("Client: Args: ");
+ for(int i = 0 ; i< args.length; i++) {
+ System.out.println("Client: Args: " + args[i]);
+ }
+ Integer versionNumber = new Integer(args[0]);
client.doTest(versionNumber.intValue());
}
-
+
public String doTest(int versionToTest) {
stat.addDescription("This is to test redeployment of connectors "+
- "contracts.");
-
+ "contracts.");
+
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
- pass = checkResults(versionToTest);
- debug("Got expected results = " + pass);
-
- //do not continue if one test failed
- if (!pass) {
- res = "SOME TESTS FAILED";
- stat.addStatus("Redeploy Connector 1.5 test - ", stat.FAIL);
- } else {
- res = "ALL TESTS PASSED";
- stat.addStatus("Redeploy Connector 1.5 test - " , stat.PASS);
- }
+ pass = checkResults(versionToTest);
+ debug("Got expected results = " + pass);
+
+ //do not continue if one test failed
+ if (!pass) {
+ res = "SOME TESTS FAILED";
+ stat.addStatus("Redeploy Connector 1.5 test - ", stat.FAIL);
+ } else {
+ res = "ALL TESTS PASSED";
+ stat.addStatus("Redeploy Connector 1.5 test - " , stat.PASS);
+ }
} catch (Exception ex) {
System.out.println("Redeploy connector test failed.");
@@ -68,20 +68,20 @@
debug("EXITING... STATUS = " + res);
return res;
}
-
+
private boolean checkResults(int num) throws Exception {
- debug("checkResult" + num);
- debug("got initial context" + (new InitialContext()).toString());
+ debug("checkResult" + num);
+ debug("got initial context" + (new InitialContext()).toString());
Object o = (new InitialContext()).lookup("MyVersionChecker");
- debug("got o" + o);
- VersionCheckerHome home = (VersionCheckerHome)
+ debug("got o" + o);
+ VersionCheckerHome home = (VersionCheckerHome)
PortableRemoteObject.narrow(o, VersionCheckerHome.class);
debug("got home" + home);
- VersionChecker checker = home.create();
- debug("got o" + checker);
+ VersionChecker checker = home.create();
+ debug("got o" + checker);
//problem here!
- int result = checker.getVersion();
- debug("checkResult" + result);
+ int result = checker.getVersion();
+ debug("checkResult" + result);
return result == num;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
index a00913a..68211d8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
@@ -23,47 +23,47 @@
import com.sun.jdbcra.spi.JdbcSetupAdmin;
public class VersionCheckerEJB implements SessionBean {
- private InitialContext initContext = null;
- private SessionContext sessionContext = null;
+ private InitialContext initContext = null;
+ private SessionContext sessionContext = null;
public VersionCheckerEJB() {
debug("Constructor");
}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
- debug("ejbCreate()");
+ debug("ejbCreate()");
}
public int getVersion(){
- try {
- initContext = new javax.naming.InitialContext();
- } catch (Exception e) {
- System.out.println("Exception occured when creating InitialContext: " + e.toString());
- return -1;
- }
-
- try {
- JdbcSetupAdmin ja = (JdbcSetupAdmin) initContext.lookup("eis/jdbcAdmin");
- int versionno = ja.getVersion();
- debug("Version number is " + versionno);
- return versionno;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
- }
+ try {
+ initContext = new javax.naming.InitialContext();
+ } catch (Exception e) {
+ System.out.println("Exception occured when creating InitialContext: " + e.toString());
+ return -1;
+ }
+
+ try {
+ JdbcSetupAdmin ja = (JdbcSetupAdmin) initContext.lookup("eis/jdbcAdmin");
+ int versionno = ja.getVersion();
+ debug("Version number is " + versionno);
+ return versionno;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
}
public void setSessionContext(SessionContext context) {
- debug(" bean removed");
+ debug(" bean removed");
sessionContext = context;
}
public void ejbRemove() {
- debug(" bean removed");
+ debug(" bean removed");
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.properties
index fb2b4d8..44563e4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/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="force-deploy"/>
-<property name="appname" value="${module}-rar"/>
+<property name="appname" value="${module}-rar"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client"
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
index 851ded5..828b005 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
@@ -39,7 +39,7 @@
<target name="compile" depends="clean">
<ant dir="ra" inheritAll="false" target="compile"/>
-
+
<antcall target="compile-common">
<param name="src" value="ejb"/>
<param name="s1astest.classpath" value="${s1astest.classpath}:./ra/publish/internal/classes/"/>
@@ -134,7 +134,7 @@
<antcall target="undeploy-common"/>
-
+
<antcall target="setuptwo"/>
<antcall target="deploy"/>
<java classname="client.WebTest">
@@ -220,7 +220,7 @@
<param name="failonerror" value="true"/>
</antcall>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="versiontest-ra-pool"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/Client.java
index f999a8a..492e79a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/client/Client.java
@@ -27,35 +27,35 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) {
Client client = new Client();
- System.out.println("Client: Args: ");
- for(int i = 0 ; i< args.length; i++) {
- System.out.println("Client: Args: " + args[i]);
- }
- Integer versionNumber = new Integer(args[0]);
+ System.out.println("Client: Args: ");
+ for(int i = 0 ; i< args.length; i++) {
+ System.out.println("Client: Args: " + args[i]);
+ }
+ Integer versionNumber = new Integer(args[0]);
client.doTest(versionNumber.intValue());
}
-
+
public String doTest(int versionToTest) {
stat.addDescription("This is to test redeployment of connector modules. Testing version " + versionToTest);
-
+
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
- pass = checkResults(versionToTest);
- debug("Got expected results = " + pass);
-
- //do not continue if one test failed
- if (!pass) {
- res = "SOME TESTS FAILED";
- stat.addStatus("Redeploy Connector 1.5 test - Version : "+ versionToTest, stat.FAIL);
- } else {
- res = "ALL TESTS PASSED";
- stat.addStatus("Redeploy Connector 1.5 test - Version : " + versionToTest , stat.PASS);
- }
+ pass = checkResults(versionToTest);
+ debug("Got expected results = " + pass);
+
+ //do not continue if one test failed
+ if (!pass) {
+ res = "SOME TESTS FAILED";
+ stat.addStatus("Redeploy Connector 1.5 test - Version : "+ versionToTest, stat.FAIL);
+ } else {
+ res = "ALL TESTS PASSED";
+ stat.addStatus("Redeploy Connector 1.5 test - Version : " + versionToTest , stat.PASS);
+ }
} catch (Exception ex) {
System.out.println("Redeploy connector test failed.");
ex.printStackTrace();
@@ -66,20 +66,20 @@
debug("EXITING... STATUS = " + res);
return res;
}
-
+
private boolean checkResults(int num) throws Exception {
- debug("checkResult" + num);
- debug("got initial context" + (new InitialContext()).toString());
+ debug("checkResult" + num);
+ debug("got initial context" + (new InitialContext()).toString());
Object o = (new InitialContext()).lookup("java:comp/env/ejb/MyVersionChecker");
- debug("got o" + o);
- VersionCheckerHome home = (VersionCheckerHome)
+ debug("got o" + o);
+ VersionCheckerHome home = (VersionCheckerHome)
PortableRemoteObject.narrow(o, VersionCheckerHome.class);
debug("got home" + home);
- VersionChecker checker = home.create();
- debug("got o" + checker);
+ VersionChecker checker = home.create();
+ debug("got o" + checker);
//problem here!
- int result = checker.getVersion();
- debug("checkResult" + result);
+ int result = checker.getVersion();
+ debug("checkResult" + result);
return result == num;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/ejb-jar.xml
index e94042b..8e547c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/ejb-jar.xml
@@ -33,8 +33,8 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
<resource-env-ref>
- <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
+ <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
+ <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
</resource-env-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/sun-ejb-jar.xml
index cc5a3f9..e146722 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<ejb>
<ejb-name>MyVersionChecker</ejb-name>
<jndi-name>ejb/MyVersionChecker</jndi-name>
-<!--
+<!--
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
@@ -42,10 +42,10 @@
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
--->
+-->
<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/connector/v3/force-deploy-rar/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml
index 73e9805..a988eb8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/testjdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/testjdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index bfcbf0b..4ebed6e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/**
@@ -273,184 +273,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -500,162 +500,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index e60338f..c5ada46 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
public static final int VERSION = 2;
@@ -37,39 +37,39 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
/*
@@ -77,16 +77,16 @@
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
+ }
*/
}
-
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -96,5 +96,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 60e1e4e..65e8fb5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -122,136 +122,136 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>9092</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBUSER</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBPASSWORD</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DatabaseName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DataSourceName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>NetworkProtocol</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Delimiter</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
</config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 411b73f..d9874a0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,55 +68,55 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
setIsolation(mc);
isValid(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -127,409 +127,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -539,35 +539,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java
index 2068430..739ff4d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,91 +114,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index ae16b51..824510d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,8 +34,8 @@
public Integer getNoOfRows();
- public boolean checkSetup();
-
+ public boolean checkSetup();
+
public int getVersion();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 1a9e5c6..c72d74c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -66,62 +66,62 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- DataSource ds = (DataSource) ic.lookup(jndiName);
+ InitialContext ic = new InitialContext();
+ DataSource ds = (DataSource) ic.lookup(jndiName);
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
}
-
+ System.out.println("Returning setup :" +b);
+ return b;
+ }
+
public int getVersion(){
- return ResourceAdapter.VERSION;
+ return ResourceAdapter.VERSION;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.properties
index 5923fe3..862a084 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/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="installed-libraries"/>
<property name="appname" value="${module}-embedded"/>
@@ -24,7 +24,7 @@
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="installed_libraries_embedded"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
index 9089c0c..9a913f9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
@@ -42,22 +42,22 @@
<target name="all-ext" depends="clean, disable-resource-validation, build-ra-with-extension, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="setup">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
@@ -71,13 +71,13 @@
<antcall target="create-connector-connpool-common">
<param name="ra.name" value="${appname}App#jdbcra"/>
<param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
+ <param name="extra-params" value="--matchconnections=false"/>
<param name="connector.conpool.name" value="embedded-ra-pool"/>
</antcall>
<antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
</target>
<target name="create-resource">
<antcall target="create-connector-resource-common">
@@ -86,53 +86,53 @@
</antcall>
</target>
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-installed-libraries-embedded:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
<target name="unsetup">
@@ -144,7 +144,7 @@
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -154,7 +154,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-installed-libraries-embedded"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -169,9 +169,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
<target name="build-ra-with-extension">
@@ -189,27 +189,27 @@
</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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
@@ -245,28 +245,28 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="installed-libraries-embedded (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="installed-libraries-embedded (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="installed-libraries-embedded (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="installed-libraries-embedded (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common"/>
<antcall target="uninstall-library"/>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/v3/installed-libraries-embedded/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/sun-ejb-jar.xml
index cf55e21..0a31162 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-installed-libraries-embedded</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-installed-libraries-embedded</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
index ac9c971..f8324ba 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
@@ -44,4 +44,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerChecking.java
index 1149f38..c1200a7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerChecking.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
index 82c41a6..8868e6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
index 0f9c9af..ab87030 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -147,7 +147,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -214,12 +214,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavings.java
index ae40c68..3675711 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavings.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
index 9f5b76b..d58bab5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml
index 045d794..fb30972 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml
@@ -21,64 +21,64 @@
<!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
]>
-<project name="JDBCConnector top level" default="build">
+<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="clean,compile,assemble"/>
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
+ failonerror="true">
+ <classpath>
<fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
+ <include name="**/*.jar" />
</fileset>
- </classpath>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar" manifest="${jar.mf}"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar" manifest="${jar.mf}"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" manifest="${rar.mf}" excludes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" manifest="${rar.mf}" excludes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index 70029f1..e966f98 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,169 +50,169 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
System.out.println("V3-TEST : " + dataSourceObject);
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
System.out.println("V3-TEST : " + dataSourceObject);
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index a956d97..11ad746 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/*
@@ -279,184 +279,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -506,162 +506,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 1be4ded..4362561 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -24,8 +24,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
@Connector(
description = "Resource adapter wrapping Datasource implementation of driver",
@@ -49,52 +49,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -104,5 +104,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 2c29be6..09ce63d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -28,7 +28,7 @@
<outbound-resourceadapter>
<connection-definition>
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>User</config-property-name>
@@ -50,7 +50,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>testdb</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -60,7 +60,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
@@ -77,7 +77,7 @@
<connection-interface>java.sql.Connection</connection-interface>
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
<transaction-support>LocalTransaction</transaction-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 85916e5..99a46e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,8 +31,8 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
@ConnectionDefinition(
@@ -42,31 +42,31 @@
connectionFactoryImpl = com.sun.jdbcra.spi.DataSource.class
)
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -74,7 +74,7 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
@@ -84,36 +84,36 @@
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
} catch(Exception e){
System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
+ e.printStackTrace();
}
System.out.println("V3-TEST : got connection");
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
/*
@@ -123,15 +123,15 @@
System.out.println("V3-TEST : returning connection");
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -142,38 +142,38 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
@ConfigProperty(
defaultValue = "localhost",
@@ -182,42 +182,42 @@
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
@ConfigProperty(
defaultValue = "1527",
@@ -226,42 +226,42 @@
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
@ConfigProperty(
defaultValue="testdb",
@@ -270,42 +270,42 @@
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
@ConfigProperty(
type=java.lang.String.class
@@ -313,203 +313,203 @@
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
@ConfigProperty(
defaultValue = "#",
@@ -518,52 +518,52 @@
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -573,35 +573,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java
index d90085d..51f1773 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,58 +51,58 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -115,91 +115,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index f89be57..fc3a957 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -84,11 +84,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -97,10 +97,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -109,93 +109,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
index a8205cf..be9d2f5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
@@ -17,16 +17,16 @@
package samples.ejb.installed_libraries_embedded.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
-import jakarta.ejb.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
+import jakarta.ejb.*;
import samples.ejb.installed_libraries_embedded.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -42,14 +42,14 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -65,14 +65,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -89,7 +89,7 @@
customerSavings = customerSavingsLocalHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -102,7 +102,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -114,7 +114,7 @@
customerSavings = customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -126,12 +126,12 @@
customerSavingsLocalHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -141,7 +141,7 @@
customerSavings = (CustomerSavings)customerSavingsLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -150,7 +150,7 @@
customerChecking = (CustomerChecking)customerCheckingLocalHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -210,9 +210,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/build.properties
index 4434f01..7e1b0c1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="installed-libraries-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="rarfile" value="rar/blackbox-tx.rar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/descriptor/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/descriptor/glassfish-resources.xml
index 71d89c4..afcfbd3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/descriptor/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/descriptor/glassfish-resources.xml
@@ -46,4 +46,4 @@
<property name="booleanWithGetBooleanAccessor" value="true" />
</connector-connection-pool>
<connector-resource pool-name="installed-libraries-test-ccp" jndi-name="eis/connector-resource" />
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/JdbcConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/JdbcConnection.java
index fa64959..bb3656a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/JdbcConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/JdbcConnection.java
@@ -183,7 +183,7 @@
}
/////////////////////////////////////////////
- // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
+ // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
/////////////////////////////////////////////
///////////// BEGIN JDK 1.4 //////////////
@@ -329,27 +329,27 @@
}
///////////// END JDK 1.4 //////////////
-
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
void associateConnection(JdbcManagedConnection newMc)
throws ResourceException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
index 0e47ddc..a968601 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
@@ -109,7 +109,7 @@
if (!getBooleanWithGetBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Get Boolean Accessor is false");
}
-
+
if (!isBooleanWithIsBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Is Boolean Accessor is false");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
index 8f2f354..7925098 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
@@ -44,7 +44,7 @@
}
public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
- return null;
+ return null;
}
public BootstrapContext getBootstrapContext(){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
index 0fb1406..362849b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
@@ -74,7 +74,7 @@
}catch(NamingException ne){
ne.printStackTrace();
} catch (CreateException e) {
- e.printStackTrace();
+ e.printStackTrace();
}finally{
out.println("END_OF_TEST");
out.flush();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/create_pointbase.sql
index 4234115..ed6dbab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
-INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
-
-Drop table TXLEVELSWITCH2;
-
-CREATE TABLE TXLEVELSWITCH2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
-INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
-
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
+INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
+
+Drop table TXLEVELSWITCH2;
+
+CREATE TABLE TXLEVELSWITCH2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
+INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/build.properties
index 4434f01..7e1b0c1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="installed-libraries-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="rarfile" value="rar/blackbox-tx.rar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/JdbcConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/JdbcConnection.java
index fa64959..bb3656a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/JdbcConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/JdbcConnection.java
@@ -183,7 +183,7 @@
}
/////////////////////////////////////////////
- // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
+ // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
/////////////////////////////////////////////
///////////// BEGIN JDK 1.4 //////////////
@@ -329,27 +329,27 @@
}
///////////// END JDK 1.4 //////////////
-
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
void associateConnection(JdbcManagedConnection newMc)
throws ResourceException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
index 0e47ddc..a968601 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
@@ -109,7 +109,7 @@
if (!getBooleanWithGetBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Get Boolean Accessor is false");
}
-
+
if (!isBooleanWithIsBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Is Boolean Accessor is false");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
index 8f2f354..7925098 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
@@ -44,7 +44,7 @@
}
public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
- return null;
+ return null;
}
public BootstrapContext getBootstrapContext(){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
index 0fb1406..362849b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
@@ -74,7 +74,7 @@
}catch(NamingException ne){
ne.printStackTrace();
} catch (CreateException e) {
- e.printStackTrace();
+ e.printStackTrace();
}finally{
out.println("END_OF_TEST");
out.flush();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/create_pointbase.sql
index 4234115..ed6dbab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
-INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
-
-Drop table TXLEVELSWITCH2;
-
-CREATE TABLE TXLEVELSWITCH2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
-INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
-
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
+INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
+
+Drop table TXLEVELSWITCH2;
+
+CREATE TABLE TXLEVELSWITCH2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
+INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/build.properties
index 88aaaea..6cd1dda 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/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="jms-connection-factory-definition"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/build.properties
index 90d184e..93ec2e8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/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="jms-destination-definition"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.properties
index 5d78233..299559b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-tx_propagation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.client.Client"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.xml
index 713334c..d77e681 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
<param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
<param name="jdbc.resource.name" value="jdbc/xa"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-xa-pool.property.connectionAttributes=;create=true"/>
@@ -81,10 +81,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
@@ -92,9 +92,9 @@
</copy>-->
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
<param name="glassfish-resources-ear.xml" value="descriptor/glassfish-resources.xml"/>
</antcall>
@@ -103,9 +103,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -114,10 +114,10 @@
<antcall target="runclient-common"/>
<!-- <antcall target="runclient-standalone"/>-->
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
index 7467c41..6060593 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
@@ -64,7 +64,7 @@
PreparedStatement s = null;
try {
System.err.println("I am in client");
-
+
UserTransaction utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
ds = (DataSource)(new javax.naming.InitialContext()).lookup("java:app/jdbc/xa");
@@ -78,7 +78,7 @@
utx.begin();
System.err.println("utx.begin called ");
-
+
connection = ds.getConnection();
s = connection.prepareStatement("insert into EJB30_PERSISTENCE_EEM_INJECTION_PERSON values('1', '1')");
s.execute();
@@ -94,7 +94,7 @@
utx.rollback();
System.err.println("utx.rollback called ");
}
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -125,7 +125,7 @@
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/descriptor/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/descriptor/glassfish-resources.xml
index 0786c54..ccdeaa4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/descriptor/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/descriptor/glassfish-resources.xml
@@ -51,4 +51,4 @@
<property name="connectionAttributes" value=";create=true" />
</jdbc-connection-pool>
<jdbc-resource pool-name="java:app/jdbc-xa-pool" jndi-name="java:app/jdbc/xa" />
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java
index 14358ff..952cbec 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java
@@ -45,7 +45,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
index 3d4f30b..4b24df7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-tx_propagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -71,8 +71,8 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
-
+
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -100,5 +100,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
index 62d2097..337a43f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
index 8a96e20..f7a7aad 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
@@ -37,12 +37,12 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name);
p.setData(data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/create.sql b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/create.sql
index fa60742..c0ab43f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/drop.sql b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/drop.sql
index 5eb136f..d012c69 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/META-INF/glassfish-resources.xml
index 21be062..b741fed 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/META-INF/glassfish-resources.xml
@@ -72,4 +72,4 @@
<property name="ResetControl" value="BEGINNING"/>
</admin-object-resource>-->
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-gf-resources.xml
index 3eae403..389779a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-gf-resources.xml
@@ -57,4 +57,4 @@
<admin-object-resource enabled="true" jndi-name="java:module/eis/testAdmin" object-type="user" res-adapter="generic-ra" res-type="connector.MyAdminObject">
<property name="ResetControl" value="BEGINNING"/>
</admin-object-resource>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-jar.xml
index 582b781..12fb6d3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/ejb-jar.xml
@@ -114,8 +114,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/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/sun-ejb-jar.xml
index b88a868..69b0149 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/sun-ejb-jar.xml
@@ -32,7 +32,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -84,7 +84,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:module/eis/testAdmin</jndi-name>
+ <jndi-name>java:module/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/web-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/web-gf-resources.xml
index 816d5a9..c658a07 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/web-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/META-INF/web-gf-resources.xml
@@ -53,4 +53,4 @@
</jdbc-connection-pool>
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/web-level-ds" object-type="user" pool-name="java:module/jdbc/web-level-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
index 3f653e3..e4a50f4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -73,7 +73,7 @@
System.out.println("mao.getRA() is null");
}
}catch(Exception e){
- e.printStackTrace();
+ e.printStackTrace();
}
try{
@@ -97,11 +97,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();
@@ -120,22 +120,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 {
@@ -161,10 +161,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -199,7 +199,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -210,7 +210,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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/connector/v3/multiple-resources-app-module-scoped/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/Client.java
index 9343506..3939257 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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.6 test - " + testCount, stat.FAIL);
} else {
stat.addStatus("ID Connector 1.6 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("connector1.6ID");
-
+
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/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
index b7427aa..62c42ad 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
@@ -29,41 +29,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -74,7 +74,7 @@
//log("onMessage:: getCallerPrincipal : " + mdc.getCallerPrincipal());
//System.out.println("onMessage : ThreadID : " + Thread.currentThread().getName());
if(mdc.getCallerPrincipal() != null){
- log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
+ log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
}
log("onMessage : isCallerInRole('jagadish') : " + mdc.isCallerInRole("jagadish"));
@@ -83,7 +83,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -97,10 +97,10 @@
ex.printStackTrace();
}
}
-
+
/**
- * 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() {}
@@ -110,62 +110,62 @@
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");
@@ -176,7 +176,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -185,9 +185,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
@@ -203,9 +203,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();
@@ -218,9 +218,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/connector/v3/multiple-resources-app-module-scoped/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/servlet/SimpleServlet.java
index ea0d5d1..97a63e3 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/servlet/SimpleServlet.java
@@ -45,17 +45,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.6 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
@@ -94,18 +94,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.6 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.6 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/build.properties
index 207a486..083b262 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/connector16/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/glassfish-resources.xml
index a9349fc..0fcabdd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/glassfish-resources.xml
@@ -48,4 +48,4 @@
<principal-map eis-principal="eis-prasath" mapped-principal="prasath" />
<principal-map eis-principal="eis-jagadish" mapped-principal="jagadish" />
</work-security-map>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/ra.xml
index 9781e16..3ccf296 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/META-INF/ra.xml
@@ -51,7 +51,7 @@
</config-property-confidential>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -62,7 +62,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/build.xml
index ed29889..8528818 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/JSR322Work.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/JSR322Work.java
index 5107ac1..0203f4a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/JSR322Work.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/JSR322Work.java
@@ -48,6 +48,6 @@
public void run(){
super.run();
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MyAdminObject.java
index a68a5b7..9c28812 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MyAdminObject.java
@@ -51,11 +51,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/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MySecurityContext.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MySecurityContext.java
index 3178c1c..e19051e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MySecurityContext.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/MySecurityContext.java
@@ -62,7 +62,7 @@
CallerPrincipalCallback cpc = new CallerPrincipalCallback(execSubject, new PrincipalImpl(principalName));
debug("setting caller principal callback with principal : " + principalName);
callbacks.add(cpc);
-
+
/*
GroupPrincipalCallback gpc = new GroupPrincipalCallback(execSubject, null);
callbacks.add(gpc);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/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/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/WorkDispatcher.java
index ddff005..4e921a2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/WorkDispatcher.java
@@ -86,7 +86,7 @@
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 {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/XID.java
index 18a970d..b2a906c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/META-INF/glassfish-resources.xml
index 3bb4549..8cdf859 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/META-INF/glassfish-resources.xml
@@ -73,4 +73,4 @@
</admin-object-resource>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-gf-resources.xml
index fe4a090..d7f8f9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-gf-resources.xml
@@ -53,4 +53,4 @@
</jdbc-connection-pool>
<jdbc-resource enabled="true" jndi-name="java:module/jdbc/ejb-level-ds" object-type="user" pool-name="java:module/jdbc/ejb-level-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-jar.xml
index 582b781..12fb6d3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/ejb-jar.xml
@@ -114,8 +114,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/connector/v3/multiple-resources.xml/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/sun-ejb-jar.xml
index e46577f..cb8cd23 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/sun-ejb-jar.xml
@@ -33,7 +33,7 @@
TestIntegerProp
</activation-config-property-name>
<activation-config-property-value>
- 2
+ 2
</activation-config-property-value>
</activation-config-property>
</activation-config>
@@ -85,7 +85,7 @@
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <jndi-name>java:app/eis/testAdmin</jndi-name>
+ <jndi-name>java:app/eis/testAdmin</jndi-name>
</resource-env-ref>
<gen-classes/>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/web-gf-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/web-gf-resources.xml
index ae6fc11..8c2976f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/web-gf-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/META-INF/web-gf-resources.xml
@@ -53,4 +53,4 @@
</jdbc-connection-pool>
<jdbc-resource enabled="true" jndi-name="jdbc/web-level-ds" object-type="user" pool-name="jdbc/web-level-pool"/>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
index b648e91..21f7e92 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
@@ -40,7 +40,7 @@
public MessageCheckerEJB() {}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
System.out.println("bean created");
heldCon = null;
@@ -73,7 +73,7 @@
System.out.println("mao.getRA() is null");
}
}catch(Exception e){
- e.printStackTrace();
+ e.printStackTrace();
}
try{
@@ -98,11 +98,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();
@@ -121,22 +121,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 {
@@ -162,10 +162,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);
+ Controls = (MyAdminObject) ic.lookup("java:comp/env/eis/testAdmin");
+ System.out.println("CALLING INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
+ Controls.initialize();
+ System.out.println("CALLED INITILIZE ]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]" + Controls);
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -200,7 +200,7 @@
debug("Looked up Datasource\n");
debug("Get JDBC connection, auto sign on");
con = ds.getConnection();
-
+
if (con != null) {
return con;
} else {
@@ -211,7 +211,7 @@
throw ex1;
}
}
-
+
private void closeConnection(Connection con) throws SQLException {
if (heldCon != null) {
return;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/build.properties
index dad207b..0b38c19 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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/connector/v3/multiple-resources.xml/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/Client.java
index 9343506..3939257 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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.6 test - " + testCount, stat.FAIL);
} else {
stat.addStatus("ID Connector 1.6 test - " + testCount, stat.PASS);
- }
+ }
} else {
break;
}
- testCount ++;
+ testCount ++;
}
} catch (Exception ex) {
@@ -76,14 +76,14 @@
}
stat.printSummary("connector1.6ID");
-
+
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/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
index 78a3ee9..3ab0c2a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
@@ -30,41 +30,41 @@
/**
*/
-public class MyMessageBean implements MessageDrivenBean,
+public class MyMessageBean implements MessageDrivenBean,
MyMessageListener {
private transient MessageDrivenContext mdc = null;
private Context context;
-
+
/**
* Constructor, which is public and takes no arguments.
*/
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
@@ -75,7 +75,7 @@
//log("onMessage:: getCallerPrincipal : " + mdc.getCallerPrincipal());
//System.out.println("onMessage : ThreadID : " + Thread.currentThread().getName());
if(mdc.getCallerPrincipal() != null){
- log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
+ log("onMessage:: getCallerPrincipal Name : " + mdc.getCallerPrincipal().getName());
}
log("onMessage : isCallerInRole('jagadish') : " + mdc.isCallerInRole("jagadish"));
@@ -84,7 +84,7 @@
try {
if (inMessage.endsWith("WRITE")) {
- doDbStuff("WRITE",
+ doDbStuff("WRITE",
inMessage.substring(0, inMessage.lastIndexOf(":")));
} else if (inMessage.endsWith("DELETE")) {
doDbStuff("DELETE",
@@ -98,10 +98,10 @@
ex.printStackTrace();
}
}
-
+
/**
- * 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() {}
@@ -111,62 +111,62 @@
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");
@@ -177,7 +177,7 @@
} else {
//unsupported op
}
-
+
}finally{
try{
dbConnection.close();
@@ -186,9 +186,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
@@ -204,9 +204,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();
@@ -219,9 +219,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/connector/v3/multiple-resources.xml/app/src/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/servlet/SimpleServlet.java
index ac89e36..63878c6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/servlet/SimpleServlet.java
@@ -45,17 +45,17 @@
public String doTest(HttpServletRequest request, HttpServletResponse response) throws IOException{
System.out.println("This is to test connector 1.6 "+
- "contracts.");
+ "contracts.");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
res = "ALL TESTS PASSED";
- int testCount = 1;
+ int testCount = 1;
out.println("Starting the test");
out.flush();
@@ -94,18 +94,18 @@
res = "SOME TESTS FAILED";
System.out.println("ID Connector 1.6 test - " + testCount + " FAIL");
out.println("TEST:FAIL");
-
+
} else {
System.out.println("ID Connector 1.6 test - " + testCount + " PASS");
out.println("TEST:PASS");
- }
+ }
} else {
out.println("END_OF_EXECUTION");
break;
}
}
out.println("END_OF_EXECUTION");
-
+
} catch (Exception ex) {
System.out.println("Importing transaction test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/build.properties
index 207a486..083b262 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="contextroot" value="/connector16/servlet"/>
<property name="http:host" value="localhost"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/glassfish-resources.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/glassfish-resources.xml
index a9349fc..0fcabdd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/glassfish-resources.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/glassfish-resources.xml
@@ -48,4 +48,4 @@
<principal-map eis-principal="eis-prasath" mapped-principal="prasath" />
<principal-map eis-principal="eis-jagadish" mapped-principal="jagadish" />
</work-security-map>
-</resources>
+</resources>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/ra.xml
index 9781e16..3ccf296 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/META-INF/ra.xml
@@ -51,7 +51,7 @@
</config-property-confidential>
</config-property>
<inbound-resourceadapter>
- <messageadapter>
+ <messageadapter>
<messagelistener>
<messagelistener-type>
connector.MyMessageListener
@@ -62,7 +62,7 @@
</activationspec-class>
</activationspec>
</messagelistener>
- </messageadapter>
+ </messageadapter>
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>connector.MyAdminObject</adminobject-interface>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/build.xml
index ed29889..8528818 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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/connector/v3/multiple-resources.xml/ra/src/connector/Controls.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/Controls.java
index 55533d4..f59b2b3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/Controls.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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/connector/v3/multiple-resources.xml/ra/src/connector/DeliveryWork.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/DeliveryWork.java
index 658233e..d73c862 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/DeliveryWork.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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/connector/v3/multiple-resources.xml/ra/src/connector/FakeXAResource.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/FakeXAResource.java
index 100cace..fa93f63 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/FakeXAResource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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/connector/v3/multiple-resources.xml/ra/src/connector/JSR322Work.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/JSR322Work.java
index 5107ac1..0203f4a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/JSR322Work.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/JSR322Work.java
@@ -48,6 +48,6 @@
public void run(){
super.run();
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MyAdminObject.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MyAdminObject.java
index a68a5b7..9c28812 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MyAdminObject.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MyAdminObject.java
@@ -51,11 +51,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/connector/v3/multiple-resources.xml/ra/src/connector/MySecurityContext.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MySecurityContext.java
index 3178c1c..e19051e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MySecurityContext.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/MySecurityContext.java
@@ -62,7 +62,7 @@
CallerPrincipalCallback cpc = new CallerPrincipalCallback(execSubject, new PrincipalImpl(principalName));
debug("setting caller principal callback with principal : " + principalName);
callbacks.add(cpc);
-
+
/*
GroupPrincipalCallback gpc = new GroupPrincipalCallback(execSubject, null);
callbacks.add(gpc);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/SimpleActivationSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/SimpleActivationSpec.java
index 8182ef5..3fce544 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/SimpleActivationSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/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/connector/v3/multiple-resources.xml/ra/src/connector/WorkDispatcher.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/WorkDispatcher.java
index ddff005..4e921a2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/WorkDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/WorkDispatcher.java
@@ -86,7 +86,7 @@
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 {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/XID.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/XID.java
index 18a970d..b2a906c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/XID.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/ra/src/connector/XID.java
@@ -35,8 +35,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++;
@@ -54,10 +54,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;
@@ -97,7 +97,7 @@
"formatID(" + formatID + "), " +
"branchQualifier (" + branchQualifier + "), " +
"globalTxID(" + globalTxID + ")}");
-
+
return s;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.xml
index 80d07c4..75eaa5b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<!--
<target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -40,15 +40,15 @@
<target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="deploy-war"/>
+ <antcall target="run-war"/>
+ <antcall target="undeploy-war"/>
+ <antcall target="deploy-ear"/>
+ <antcall target="run-ear"/>
+ <antcall target="undeploy-ear"/>
+ <antcall target="unsetup"/>
</target>
-->
@@ -56,7 +56,7 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
@@ -64,7 +64,7 @@
<antcall target="create-pool"/>
<antcall target="create-resource"/>
<antcall target="create-admin-object"/>
-
+
</target>
<target name="create-pool">
<antcall target="create-connector-connpool-common">
@@ -84,37 +84,37 @@
</antcall>
</target>
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
<target name="create-admin-object" depends="init-common">
<!--<property file="../config/oracle.properties"/>-->
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
-<!-- <antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+<!-- <antcall target="reconfig-common"/>-->
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -122,16 +122,16 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
-<!-- <antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#jdbcra"/>
+ </antcall>
+<!-- <antcall target="reconfig-common"/>-->
</target>
<target name="unsetup">
@@ -143,7 +143,7 @@
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="embedded-ra-pool"/>
@@ -153,7 +153,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -169,9 +169,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -180,34 +180,34 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
- </fileset>
+ </fileset>
<fileset dir="ra/publish/lib">
<include name="*.rar"/>
</fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="create-ra-config"/>
<antcall target="deploy-common"/>
@@ -216,27 +216,27 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="non-string-mcf-properties (stand-alone war based)"/>
- </antcall>
+ <param name="testsuite.id" value="non-string-mcf-properties (stand-alone war based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="non-string-mcf-properties (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="non-string-mcf-properties (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/v3/nonstringmcfproperties/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/descriptor/sun-ejb-jar.xml
index 1d1200d..df4bb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
index 08107a5..0b2b49a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
@@ -47,4 +47,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerChecking.java
index 61de291..b341c34 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerChecking.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
index 9093b7e..b690099 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
@@ -92,5 +92,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
index 0520b60..07220db 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavings.java
index 338c921..883e04a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavings.java
@@ -20,4 +20,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.xml
index 74484fe..2b67446 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index bfcbf0b..4ebed6e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/**
@@ -273,184 +273,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -500,162 +500,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 0f3d510..173bfec 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -128,7 +128,7 @@
<config-property-value>testdb</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbuser</config-property-value>
@@ -139,12 +139,12 @@
<config-property-value>dbuser</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbpassword</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -154,7 +154,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>-->
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
@@ -165,17 +165,17 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
@@ -186,7 +186,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
@@ -197,31 +197,31 @@
<config-property-value>;create=true</config-property-value>
</config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
<!-- properties to test setting of a non-String value with overridden setters -->
<config-property>
<config-property-name>NonStringWithNoOverriddenSetter</config-property-name>
@@ -235,54 +235,54 @@
</config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 4bf9fed..3234032 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,14 +31,14 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -49,19 +49,19 @@
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -69,55 +69,55 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
setIsolation(mc);
isValid(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -128,409 +128,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -538,19 +538,19 @@
public Double getNonStringWithNoOverriddenSetter(){
System.out.println("DSManagedConnectionFactory : getNonStringWithNoOverriddenSetter() called");
- return this.nonStringWithNoOverriddenSetter;
+ return this.nonStringWithNoOverriddenSetter;
}
public void setNonStringWithNoOverriddenSetter(Double dbl) {
System.out.println("DSManagedConnectionFactory : setNonStringWithNoOverriddenSetter() called");
- this.nonStringWithNoOverriddenSetter = dbl;
+ this.nonStringWithNoOverriddenSetter = dbl;
}
public Double getNonStringWithOverriddenSetter(){
System.out.println("DSManagedConnectionFactory : getNonStringWithOverriddenSetter() called");
return this.nonStringWithOverriddenSetter;
}
-
+
public void setNonStringWithOverriddenSetter(Double dbl) {
System.out.println("DSManagedConnectionFactory : setNonStringWithOverriddenSetter(Double) called");
this.nonStringWithOverriddenSetter = dbl;
@@ -567,35 +567,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java
index 2068430..739ff4d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,91 +114,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/servlet/SimpleBankServlet.java
index ee3695f..a45dc0f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/servlet/SimpleBankServlet.java
@@ -17,15 +17,15 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -41,13 +41,13 @@
{
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
throws ServletException, IOException {
@@ -57,7 +57,7 @@
}catch(Exception e){
e.printStackTrace();
}
-
+
doLookup();
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -73,14 +73,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -97,7 +97,7 @@
customerSavings = customerSavingsHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -110,7 +110,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -122,7 +122,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -134,12 +134,12 @@
customerSavingsHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -149,7 +149,7 @@
customerSavings = (CustomerSavings)customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -158,7 +158,7 @@
customerChecking = (CustomerChecking)customerCheckingHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -218,9 +218,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/src/main/java/org/glassfish/osgi_resources_test/ResourcesTestActivator.java b/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/src/main/java/org/glassfish/osgi_resources_test/ResourcesTestActivator.java
index 72f367a..a4d3b57 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/src/main/java/org/glassfish/osgi_resources_test/ResourcesTestActivator.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/osgi-resources-test/src/main/java/org/glassfish/osgi_resources_test/ResourcesTestActivator.java
@@ -92,7 +92,7 @@
/*
testJdbcResources(null);
-
+
testJdbcResources("(osgi.jdbc.driver.class=oracle.jdbc.pool.OracleDataSource)");
testJdbcResources("(jndi-name=jdbc/oracle_type4_resource)");
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.properties
index 835c7cf..0ee661f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rar-accessibility-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="rarfile" value="rar/blackbox-tx.rar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.xml
index d423e11..c700356 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/build.xml
@@ -52,7 +52,7 @@
<antcall target="exec">
<param name="expected_count" value="2"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
index 6c4056a..2dd0273 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
@@ -57,7 +57,7 @@
InitialContext ctx = new InitialContext();
Object o = ctx.lookup(res);
System.out.println("CLASS_NAME: "+o.getClass().getName());
- System.out.println("CLASS_LOADER: " +
+ System.out.println("CLASS_LOADER: " +
Thread.currentThread().getContextClassLoader().loadClass(o.getClass().getName()).getClassLoader());
count++;
}catch(Throwable e){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/JdbcConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/JdbcConnection.java
index 70100b8..eb51323 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/JdbcConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/JdbcConnection.java
@@ -184,7 +184,7 @@
}
/////////////////////////////////////////////
- // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
+ // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
/////////////////////////////////////////////
///////////// BEGIN JDK 1.4 //////////////
@@ -330,27 +330,27 @@
}
///////////// END JDK 1.4 //////////////
-
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
void associateConnection(JdbcManagedConnection newMc)
throws ResourceException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
index 2480518..1b23b04 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/LocalTxManagedConnectionFactory.java
@@ -109,7 +109,7 @@
if (!getBooleanWithGetBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Get Boolean Accessor is false");
}
-
+
if (!isBooleanWithIsBooleanAccessor()) {
throw new ResourceException("Blackbox RAR : Is Boolean Accessor is false");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
index 9d78e6a..de70d4a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
@@ -44,7 +44,7 @@
}
public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
- return null;
+ return null;
}
public BootstrapContext getBootstrapContext(){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
index 4514f3e..58614b8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
@@ -76,7 +76,7 @@
}catch(NamingException ne){
ne.printStackTrace();
} catch (CreateException e) {
- e.printStackTrace();
+ e.printStackTrace();
}finally{
out.println("END_OF_TEST");
out.flush();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/create_pointbase.sql
index 4234115..ed6dbab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
-INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
-
-Drop table TXLEVELSWITCH2;
-
-CREATE TABLE TXLEVELSWITCH2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
-INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
-
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
+INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
+
+Drop table TXLEVELSWITCH2;
+
+CREATE TABLE TXLEVELSWITCH2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
+INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/build.xml
index 53f8dde..501f37c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/build.xml
@@ -36,8 +36,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>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/ejb-jar.xml
index e94042b..8e547c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/ejb-jar.xml
@@ -33,8 +33,8 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
<resource-env-ref>
- <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
+ <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
+ <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
</resource-env-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/sun-ejb-jar.xml
index e73cb46..3fde230 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/META-INF/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<ejb>
<ejb-name>MyVersionChecker</ejb-name>
<jndi-name>MyVersionChecker</jndi-name>
-<!--
+<!--
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
@@ -42,10 +42,10 @@
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
--->
+-->
<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/connector/v3/redeployRar/app/src/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/client/Client.java
index 7edb357..7663ed6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/client/Client.java
@@ -27,36 +27,36 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) {
Client client = new Client();
- System.out.println("Client: Args: ");
- for(int i = 0 ; i< args.length; i++) {
- System.out.println("Client: Args: " + args[i]);
- }
- Integer versionNumber = new Integer(args[0]);
+ System.out.println("Client: Args: ");
+ for(int i = 0 ; i< args.length; i++) {
+ System.out.println("Client: Args: " + args[i]);
+ }
+ Integer versionNumber = new Integer(args[0]);
client.doTest(versionNumber.intValue());
}
-
+
public String doTest(int versionToTest) {
stat.addDescription("This is to test redeployment of connectors "+
- "contracts.");
-
+ "contracts.");
+
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
- pass = checkResults(versionToTest);
- debug("Got expected results = " + pass);
-
- //do not continue if one test failed
- if (!pass) {
- res = "SOME TESTS FAILED";
- stat.addStatus("Redeploy Connector 1.5 test - ", stat.FAIL);
- } else {
- res = "ALL TESTS PASSED";
- stat.addStatus("Redeploy Connector 1.5 test - " , stat.PASS);
- }
+ pass = checkResults(versionToTest);
+ debug("Got expected results = " + pass);
+
+ //do not continue if one test failed
+ if (!pass) {
+ res = "SOME TESTS FAILED";
+ stat.addStatus("Redeploy Connector 1.5 test - ", stat.FAIL);
+ } else {
+ res = "ALL TESTS PASSED";
+ stat.addStatus("Redeploy Connector 1.5 test - " , stat.PASS);
+ }
} catch (Exception ex) {
System.out.println("Redeploy connector test failed.");
@@ -68,20 +68,20 @@
debug("EXITING... STATUS = " + res);
return res;
}
-
+
private boolean checkResults(int num) throws Exception {
- debug("checkResult" + num);
- debug("got initial context" + (new InitialContext()).toString());
+ debug("checkResult" + num);
+ debug("got initial context" + (new InitialContext()).toString());
Object o = (new InitialContext()).lookup("MyVersionChecker");
- debug("got o" + o);
- VersionCheckerHome home = (VersionCheckerHome)
+ debug("got o" + o);
+ VersionCheckerHome home = (VersionCheckerHome)
PortableRemoteObject.narrow(o, VersionCheckerHome.class);
debug("got home" + home);
- VersionChecker checker = home.create();
- debug("got o" + checker);
+ VersionChecker checker = home.create();
+ debug("got o" + checker);
//problem here!
- int result = checker.getVersion();
- debug("checkResult" + result);
+ int result = checker.getVersion();
+ debug("checkResult" + result);
return result == num;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
index a00913a..68211d8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
@@ -23,47 +23,47 @@
import com.sun.jdbcra.spi.JdbcSetupAdmin;
public class VersionCheckerEJB implements SessionBean {
- private InitialContext initContext = null;
- private SessionContext sessionContext = null;
+ private InitialContext initContext = null;
+ private SessionContext sessionContext = null;
public VersionCheckerEJB() {
debug("Constructor");
}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
- debug("ejbCreate()");
+ debug("ejbCreate()");
}
public int getVersion(){
- try {
- initContext = new javax.naming.InitialContext();
- } catch (Exception e) {
- System.out.println("Exception occured when creating InitialContext: " + e.toString());
- return -1;
- }
-
- try {
- JdbcSetupAdmin ja = (JdbcSetupAdmin) initContext.lookup("eis/jdbcAdmin");
- int versionno = ja.getVersion();
- debug("Version number is " + versionno);
- return versionno;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
- }
+ try {
+ initContext = new javax.naming.InitialContext();
+ } catch (Exception e) {
+ System.out.println("Exception occured when creating InitialContext: " + e.toString());
+ return -1;
+ }
+
+ try {
+ JdbcSetupAdmin ja = (JdbcSetupAdmin) initContext.lookup("eis/jdbcAdmin");
+ int versionno = ja.getVersion();
+ debug("Version number is " + versionno);
+ return versionno;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
}
public void setSessionContext(SessionContext context) {
- debug(" bean removed");
+ debug(" bean removed");
sessionContext = context;
}
public void ejbRemove() {
- debug(" bean removed");
+ debug(" bean removed");
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.properties
index 1493d12..b00fb16 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/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="redeploy"/>
-<property name="appname" value="${module}-rar"/>
+<property name="appname" value="${module}-rar"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client"
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/Client.java
index f999a8a..492e79a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/client/Client.java
@@ -27,35 +27,35 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) {
Client client = new Client();
- System.out.println("Client: Args: ");
- for(int i = 0 ; i< args.length; i++) {
- System.out.println("Client: Args: " + args[i]);
- }
- Integer versionNumber = new Integer(args[0]);
+ System.out.println("Client: Args: ");
+ for(int i = 0 ; i< args.length; i++) {
+ System.out.println("Client: Args: " + args[i]);
+ }
+ Integer versionNumber = new Integer(args[0]);
client.doTest(versionNumber.intValue());
}
-
+
public String doTest(int versionToTest) {
stat.addDescription("This is to test redeployment of connector modules. Testing version " + versionToTest);
-
+
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
- pass = checkResults(versionToTest);
- debug("Got expected results = " + pass);
-
- //do not continue if one test failed
- if (!pass) {
- res = "SOME TESTS FAILED";
- stat.addStatus("Redeploy Connector 1.5 test - Version : "+ versionToTest, stat.FAIL);
- } else {
- res = "ALL TESTS PASSED";
- stat.addStatus("Redeploy Connector 1.5 test - Version : " + versionToTest , stat.PASS);
- }
+ pass = checkResults(versionToTest);
+ debug("Got expected results = " + pass);
+
+ //do not continue if one test failed
+ if (!pass) {
+ res = "SOME TESTS FAILED";
+ stat.addStatus("Redeploy Connector 1.5 test - Version : "+ versionToTest, stat.FAIL);
+ } else {
+ res = "ALL TESTS PASSED";
+ stat.addStatus("Redeploy Connector 1.5 test - Version : " + versionToTest , stat.PASS);
+ }
} catch (Exception ex) {
System.out.println("Redeploy connector test failed.");
ex.printStackTrace();
@@ -66,20 +66,20 @@
debug("EXITING... STATUS = " + res);
return res;
}
-
+
private boolean checkResults(int num) throws Exception {
- debug("checkResult" + num);
- debug("got initial context" + (new InitialContext()).toString());
+ debug("checkResult" + num);
+ debug("got initial context" + (new InitialContext()).toString());
Object o = (new InitialContext()).lookup("java:comp/env/ejb/MyVersionChecker");
- debug("got o" + o);
- VersionCheckerHome home = (VersionCheckerHome)
+ debug("got o" + o);
+ VersionCheckerHome home = (VersionCheckerHome)
PortableRemoteObject.narrow(o, VersionCheckerHome.class);
debug("got home" + home);
- VersionChecker checker = home.create();
- debug("got o" + checker);
+ VersionChecker checker = home.create();
+ debug("got o" + checker);
//problem here!
- int result = checker.getVersion();
- debug("checkResult" + result);
+ int result = checker.getVersion();
+ debug("checkResult" + result);
return result == num;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/ejb-jar.xml
index e94042b..8e547c4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/ejb-jar.xml
@@ -33,8 +33,8 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
<resource-env-ref>
- <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
- <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
+ <resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
+ <resource-env-ref-type>com.sun.jdbcra.spi.JdbcSetupAdmin</resource-env-ref-type>
</resource-env-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/sun-ejb-jar.xml
index cc5a3f9..e146722 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<ejb>
<ejb-name>MyVersionChecker</ejb-name>
<jndi-name>ejb/MyVersionChecker</jndi-name>
-<!--
+<!--
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
@@ -42,10 +42,10 @@
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
--->
+-->
<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/connector/v3/redeployRar/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
index ac147cc..1949476 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
@@ -32,15 +32,15 @@
//import com.sun.jdbcra.spi.JdbcSetupAdmin;
public class VersionCheckerEJB implements SessionBean {
- private InitialContext initContext = null;
- private SessionContext sessionContext = null;
+ private InitialContext initContext = null;
+ private SessionContext sessionContext = null;
public VersionCheckerEJB() {
debug("Constructor");
}
- public void ejbCreate()
+ public void ejbCreate()
throws CreateException {
debug("ejbCreate()");
}
@@ -48,24 +48,24 @@
public int getVersion(){
debug("Checking the version!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- try {
- initContext = new javax.naming.InitialContext();
- } catch (Exception e) {
- System.out.println("Exception occured when creating InitialContext: " + e.toString());
+ try {
+ initContext = new javax.naming.InitialContext();
+ } catch (Exception e) {
+ System.out.println("Exception occured when creating InitialContext: " + e.toString());
e.printStackTrace();
- return -1;
- }
-
- try {
- com.sun.jdbcra.spi.JdbcSetupAdmin ja = (com.sun.jdbcra.spi.JdbcSetupAdmin) initContext.lookup("eis/testAdmin");
- int versionno = ja.getVersion();
- debug("Version number is " + versionno);
- return versionno;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e.getMessage());
- }
-
+ return -1;
+ }
+
+ try {
+ com.sun.jdbcra.spi.JdbcSetupAdmin ja = (com.sun.jdbcra.spi.JdbcSetupAdmin) initContext.lookup("eis/testAdmin");
+ int versionno = ja.getVersion();
+ debug("Version number is " + versionno);
+ return versionno;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
+
// return -1;
}
@@ -76,7 +76,7 @@
}
public void ejbRemove() {
- debug(" bean removed");
+ debug(" bean removed");
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties
index ee2eca0..fd21c3d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml
index 15f345a..ef59eba 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/testjdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/testjdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index bfcbf0b..4ebed6e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
/**
@@ -273,184 +273,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -500,162 +500,162 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
/**
- * Installs the given <code>Map</code> object as the tyoe map for this
+ * Installs the given <code>Map</code> object as the tyoe map for this
* <code> Connection </code> object.
*
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
+ * @param map <code>Map</code> a Map object to install.
+ * @throws SQLException In case of a database error.
*/
public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
+ checkValidity();
+ con.setTypeMap(map);
}
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index e60338f..c5ada46 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
public static final int VERSION = 2;
@@ -37,39 +37,39 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
/*
@@ -77,16 +77,16 @@
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
+ }
*/
}
-
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -96,5 +96,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 60e1e4e..65e8fb5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -122,136 +122,136 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>9092</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBUSER</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>DBPASSWORD</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DatabaseName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DataSourceName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>NetworkProtocol</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Delimiter</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
</config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 411b73f..d9874a0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,55 +68,55 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
setIsolation(mc);
isValid(mc);
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -127,409 +127,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -539,35 +539,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java
index 2068430..739ff4d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re.getMessage());
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,91 +114,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index ae16b51..824510d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,8 +34,8 @@
public Integer getNoOfRows();
- public boolean checkSetup();
-
+ public boolean checkSetup();
+
public int getVersion();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 1a9e5c6..c72d74c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -66,62 +66,62 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- DataSource ds = (DataSource) ic.lookup(jndiName);
+ InitialContext ic = new InitialContext();
+ DataSource ds = (DataSource) ic.lookup(jndiName);
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
}
-
+ System.out.println("Returning setup :" +b);
+ return b;
+ }
+
public int getVersion(){
- return ResourceAdapter.VERSION;
+ return ResourceAdapter.VERSION;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml
index 967868b..6410557 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -37,5 +37,5 @@
<target name="build14" depends="compile14"/>
- <target name="build" depends="build13, build14"/>
+ <target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java
index c9b67b2..91c2d43 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java
@@ -52,22 +52,22 @@
String res = "NOT RUN";
- debug("doTest() ENTER...");
+ debug("doTest() ENTER...");
boolean pass = false;
try {
- pass = checkResults(versionToTest);
- debug("Got expected results = " + pass);
+ pass = checkResults(versionToTest);
+ debug("Got expected results = " + pass);
- //do not continue if one test failed
- if (!pass) {
- res = "SOME TESTS FAILED";
- System.out.println("Redeploy Connector 1.5 test - Version : "+ versionToTest + " FAIL");
+ //do not continue if one test failed
+ if (!pass) {
+ res = "SOME TESTS FAILED";
+ System.out.println("Redeploy Connector 1.5 test - Version : "+ versionToTest + " FAIL");
out.println("TEST:FAIL");
- } else {
- res = "ALL TESTS PASSED";
- System.out.println("Redeploy Connector 1.5 test - Version : "+ versionToTest + " PASS");
+ } else {
+ res = "ALL TESTS PASSED";
+ System.out.println("Redeploy Connector 1.5 test - Version : "+ versionToTest + " PASS");
out.println("TEST:PASS");
- }
+ }
} catch (Exception ex) {
System.out.println("Redeploy connector test failed.");
ex.printStackTrace();
@@ -83,18 +83,18 @@
}
private boolean checkResults(int num) throws Exception {
- debug("checkResult" + num);
- debug("got initial context" + (new InitialContext()).toString());
+ debug("checkResult" + num);
+ debug("got initial context" + (new InitialContext()).toString());
Object o = (new InitialContext()).lookup("java:comp/env/ejb/MyVersionChecker");
- debug("got o" + o);
+ debug("got o" + o);
VersionCheckerHome home = (VersionCheckerHome)
PortableRemoteObject.narrow(o, VersionCheckerHome.class);
debug("got home" + home);
- VersionChecker checker = home.create();
- debug("got o" + checker);
+ VersionChecker checker = home.create();
+ debug("got o" + checker);
//problem here!
- int result = checker.getVersion();
- debug("checkResult" + result);
+ int result = checker.getVersion();
+ debug("checkResult" + result);
return result == num;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/report.xml b/appserver/tests/appserv-tests/devtests/connector/v3/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/report.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh b/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh
index 4e9a412..704f1dd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/run_test.sh
@@ -18,7 +18,7 @@
list_test_ids(){
echo connector_all connector_group_1 connector_group_2 connector_group_3 connector_group_4
}
-
+
test_run(){
#test functions goes here, maven test or ant test etc.
export HUDSON=true
@@ -45,16 +45,16 @@
}
get_test_target(){
- case ${1} in
- connector_all )
- TARGET=all
- export TARGET;;
+ case ${1} in
+ connector_all )
+ TARGET=all
+ export TARGET;;
* )
TARGET=$1
export TARGET;;
- esac
+ esac
}
-
+
OPT=${1}
TEST_ID=${2}
source `dirname ${0}`/../../../../common_test.sh
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.properties
index 0c68ad4..ec07f22 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/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="connector/securitymapweb"/>
<property name="poolname" value="MyPool"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
index fab9d0b..93ce3f8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/securitymapweb/build.xml
@@ -130,7 +130,7 @@
<arg line="${as.props}"/>
<arg line="domain.resources.connector-connection-pool.${poolname}.property.Password=${db.pwd}"/>
</exec>
-
+
<exec executable="${ASADMIN}" failonerror="false">
<arg line="set"/>
<arg line="${as.props}"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.properties
index 1b5985f..f63357a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="connector-serializable-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="rarfile" value="rar/blackbox-tx.rar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.xml
index 7cd7df6..626bbd9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/build.xml
@@ -56,7 +56,7 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/WebTest.java" destdir="."/>
-
+
</target>
<target name="build" depends="compile">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/Client.java
index 96f872d..468b72a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/client/Client.java
@@ -49,7 +49,7 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+
stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/BootstrapHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/BootstrapHolder.java
index 994cad8..390744f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/BootstrapHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/BootstrapHolder.java
@@ -28,7 +28,7 @@
private WorkManager wm;
public BootstrapHolder(BootstrapContext context) {
- this.context = context;
+ this.context = context;
this.wm = (WorkManager) makeCopyOfObject(context.getWorkManager());
checkEquality(wm, context.getWorkManager());
this.xat = (XATerminator) makeCopyOfObject(context.getXATerminator());
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/JdbcConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/JdbcConnection.java
index 6a7267c..d58af44 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/JdbcConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/JdbcConnection.java
@@ -183,7 +183,7 @@
}
/////////////////////////////////////////////
- // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
+ // THE FOLLOWING APIS ARE NEW FROM JDK 1.4 //
/////////////////////////////////////////////
///////////// BEGIN JDK 1.4 //////////////
@@ -329,27 +329,27 @@
}
///////////// END JDK 1.4 //////////////
-
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
void associateConnection(JdbcManagedConnection newMc)
throws ResourceException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
index 8f2f354..7925098 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/src/com/sun/connector/blackbox/ResourceAdapter.java
@@ -44,7 +44,7 @@
}
public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
- return null;
+ return null;
}
public BootstrapContext getBootstrapContext(){
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/create_pointbase.sql
index 4234115..ed6dbab 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
-INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
-
-Drop table TXLEVELSWITCH2;
-
-CREATE TABLE TXLEVELSWITCH2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
-INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
-
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(10, 'abcd');
+INSERT INTO TXLEVELSWITCH VALUES(11, 'pqrs');
+
+Drop table TXLEVELSWITCH2;
+
+CREATE TABLE TXLEVELSWITCH2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH2 VALUES(1, 'abcd');
+INSERT INTO TXLEVELSWITCH2 VALUES(2, 'pqrs');
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.properties b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.properties
index e2cc75d..dc19c9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-subclassing"/>
+<property name="appname" value="${module}-subclassing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<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="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="subclassing"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
index 0fd090a..52ed34f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&commonRun;
&testproperties;
-
+
<target name="all" depends="build, setup, deploy-ear, run-ear, undeploy-ear, unsetup"/>
@@ -39,14 +39,14 @@
<antcall target="clean-common"/>
<ant dir="ra" target="clean"/>
</target>
-
+
<target name="setup">
<antcall target="execute-sql-connector">
<param name="sql.file" value="sql/simpleBank.sql"/>
</antcall>
-
+
<antcall target="create-ra-config"/>
-
+
<antcall target="deploy-rar-common">
<param name="rarfile" value="ra/publish/lib/jdbcra.rar"/>
</antcall>
@@ -80,18 +80,18 @@
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
</antcall>
</target>
<target name="delete-admin-object" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -99,31 +99,31 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="jdbcra"/>
+ <param name="operand.props" value="jdbcra"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="jdbcra"/>
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
</target>
<target name="unsetup">
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/dropBankTables.sql"/>
- </antcall>
-
- <antcall target="delete-resource"/>
- <antcall target="delete-pool"/>
- <antcall target="delete-admin-object"/>
- <antcall target="undeploy-rar-common">
- <param name="undeployrar" value="jdbcra"/>
- </antcall>
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/dropBankTables.sql"/>
+ </antcall>
+
+ <antcall target="delete-resource"/>
+ <antcall target="delete-pool"/>
+ <antcall target="delete-admin-object"/>
+ <antcall target="undeploy-rar-common">
+ <param name="undeployrar" value="jdbcra"/>
+ </antcall>
</target>
-
+
<target name="delete-pool">
<antcall target="delete-connector-connpool-common">
<param name="connector.conpool.name" value="standalone-ra-pool"/>
@@ -133,7 +133,7 @@
<target name="delete-resource">
<antcall target="delete-connector-resource-common">
<param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
+ </antcall>
</target>
<target name="compile" depends="clean">
@@ -149,9 +149,9 @@
<echo message="common.xml: Compiling test source files" level="verbose"/>
<javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:ra/publish/internal/classes"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
@@ -160,31 +160,31 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<ant dir="ra" target="assemble"/>
<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>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/*.class"/>
</antcall>
-
+
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
</ear>
- </target>
+ </target>
-
+
<target name="deploy-ear" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -192,27 +192,27 @@
<target name="deploy-war" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-war" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-connector (stand-alone war and rar based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-connector (stand-alone war and rar based)"/>
+ </antcall>
</target>
<target name="run-ear" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-connector (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-connector (ear based)"/>
+ </antcall>
</target>
-
+
<target name="undeploy-ear" depends="init-common">
<antcall target="delete-ra-config"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="undeploy-war" 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/connector/web2connector/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/sun-ejb-jar.xml
index 1d1200d..df4bb93 100755
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/sun-ejb-jar.xml
@@ -29,20 +29,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
- <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
- <max-cache-size>100</max-cache-size>
- <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
- <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
- <victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
+ <pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
+ </bean-pool>
+ <bean-cache>
+ <max-cache-size>100</max-cache-size>
+ <cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
+ <removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
+ <victim-selection-policy>LRU</victim-selection-policy>
+ </bean-cache>
</ejb>
<ejb>
<ejb-name>CustomerCheckingEJB</ejb-name>
@@ -51,20 +51,20 @@
<res-ref-name>jdbc/SimpleBank</res-ref-name>
<jndi-name>jdbc/ejb-subclassing</jndi-name>
</resource-ref>
- <is-read-only-bean>false</is-read-only-bean>
- <commit-option>B</commit-option>
- <bean-pool>
- <steady-pool-size>0</steady-pool-size>
- <resize-quantity>1</resize-quantity>
- <max-pool-size>10</max-pool-size>
+ <is-read-only-bean>false</is-read-only-bean>
+ <commit-option>B</commit-option>
+ <bean-pool>
+ <steady-pool-size>0</steady-pool-size>
+ <resize-quantity>1</resize-quantity>
+ <max-pool-size>10</max-pool-size>
<pool-idle-timeout-in-seconds>3600</pool-idle-timeout-in-seconds>
- </bean-pool>
- <bean-cache>
+ </bean-pool>
+ <bean-cache>
<max-cache-size>100</max-cache-size>
<cache-idle-timeout-in-seconds>60</cache-idle-timeout-in-seconds>
<removal-timeout-in-seconds>3600</removal-timeout-in-seconds>
<victim-selection-policy>LRU</victim-selection-policy>
- </bean-cache>
+ </bean-cache>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
index 5922f31..3615e16 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
@@ -46,4 +46,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerChecking.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerChecking.java
index ff15e7e..89dc323 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerChecking.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerChecking.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
index ee0d17c..4b54444 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
@@ -94,5 +94,5 @@
}
}
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
index 0520b60..07220db 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
@@ -53,7 +53,7 @@
public String getAddress1()
{
- return address1;
+ return address1;
}
public String getAddress2()
@@ -139,7 +139,7 @@
System.out.println("SQL exception occured in ejbRemove method");
e.printStackTrace();
}
-
+
}
public void ejbStore()
@@ -206,12 +206,12 @@
} catch (SQLException e) {
System.out.println("SQLException occurred in ejbLoad() method");
e.printStackTrace();
- }
+ }
}
public void ejbActivate() {}
public void ejbPassivate() {}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavings.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavings.java
index 2740692..c45a1c5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavings.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavings.java
@@ -22,4 +22,4 @@
{
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
index f30b506..b0ce7b5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
@@ -95,6 +95,6 @@
}
}
-
-
-
+
+
+
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties
index ee2eca0..fd21c3d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties
@@ -14,7 +14,7 @@
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#
-
+
### Component Properties ###
src.dir=src
component.publish.home=.
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml
index cb66a45..3aceef2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml
@@ -23,62 +23,62 @@
<project name="JDBCConnector top level" default="build">
<property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
+
&common;
&testcommon;
<property file="./build.properties"/>
-
+
<target name="build" depends="compile,assemble" />
-
+
<!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
+ OS specific targets. -->
<target name="init" description="${component.name} initialization">
<tstamp>
<format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
+ </tstamp>
<echo message="Building component ${component.name}"/>
<mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
+ <mkdir dir="${component.lib.home}"/>
</target>
- <!-- compile -->
+ <!-- compile -->
<target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
+ description="Compile com/sun/* com/iplanet/* sources">
<!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
+ <javac srcdir="${src.dir}"
destdir="${component.classes.dir}"
failonerror="true">
<classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="**/*.jar" />
+ </fileset>
</classpath>
<include name="com/sun/jdbcra/**"/>
<include name="com/sun/appserv/**"/>
</javac>
</target>
-
+
<target name="all" depends="build"/>
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
+ <target name="assemble">
+
+ <jar jarfile="${component.lib.home}/jdbc.jar"
+ basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
+ com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
+
+ <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
+ tofile="${component.lib.home}/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
+ <jar jarfile="${component.lib.home}/jdbcra.rar"
+ basedir="${component.lib.home}" includes="jdbc.jar">
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
+ <metainf dir="${component.lib.home}">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
- <delete file="${component.lib.home}/ra.xml"/>
-
+ <delete file="${component.lib.home}/ra.xml"/>
+
</target>
<target name="clean" description="Clean the build">
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java
index 9f8399a..b6ef30b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java
@@ -20,15 +20,15 @@
import java.sql.SQLException;
/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
+ * The <code>javax.sql.DataSource</code> implementation of SunONE application
* server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
+ * to use this interface to do the extended functionality exposed by SunONE
* application server.
- * <p>A sample code for getting driver's connection implementation would like
+ * <p>A sample code for getting driver's connection implementation would like
* the following.
* <pre>
InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
+ com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
Connection con = ds.getConnection();
Connection drivercon = ds.getConnection(con);
@@ -36,13 +36,13 @@
con.close();
</pre>
- *
+ *
* @author Binod P.G
*/
public interface DataSource extends javax.sql.DataSource {
/**
- * Retrieves the actual SQLConnection from the Connection wrapper
+ * Retrieves the actual SQLConnection from the Connection wrapper
* implementation of SunONE application server. If an actual connection is
* supplied as argument, then it will be just returned.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index c2822e2..6a366b0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -27,22 +27,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Utility class, which would create necessary Datasource object according to the
+ * Utility class, which would create necessary Datasource object according to the
* specification.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
+ * @see com.sun.jdbcra.common.DataSourceSpec
+ * @see com.sun.jdbcra.util.MethodExcecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
private DataSourceSpec spec;
-
+
private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
+
+ private MethodExecutor executor = null;
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -50,167 +50,167 @@
private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
+ *
+ * @param spec <code> DataSourceSpec </code> object.
*/
public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
+ this.spec = spec;
+ executor = new MethodExecutor();
}
-
+
/**
* Construct the DataSource Object from the spec.
*
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
+ * @return Object constructed using the DataSourceSpec.
+ * @throws <code>ResourceException</code> if the class is not found or some issue in executing
+ * some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
for (int i=0; i < methods.length; i++) {
String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
+ if (methodName.equalsIgnoreCase("setUser")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPassword")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setLogWriter")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDatabaseName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDataSourceName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setDescription")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPortNumber")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setRoleName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setServerName")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxStatements")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+
+ } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+
+ } else if (driverProperties.containsKey(methodName.toUpperCase())){
+ Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
+ executor.runMethod(methods[i],dataSourceObject, values);
+ }
}
return dataSourceObject;
}
-
+
/**
* Get the extra driver properties from the DataSourceSpec object and
* parse them to a set of methodName and parameters. Prepare a hashtable
* containing these details and return.
*
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
+ * @param spec <code> DataSourceSpec </code> object.
+ * @return Hashtable containing method names and parameters,
+ * @throws ResourceException If delimiter is not provided and property string
+ * is not null.
*/
private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
+ if ( prop == null || prop.trim().equals("")) {
+ return new Hashtable();
+ } else if (delim == null || delim.equals("")) {
+ throw new ResourceException ("Delimiter is not provided in the configuration");
}
-
+
+ Hashtable properties = new Hashtable();
+ delim = delim.trim();
+ String sep = delim+delim;
+ int sepLen = sep.length();
+ String cache = prop;
+ Vector methods = new Vector();
+
+ while (cache.indexOf(sep) != -1) {
+ int index = cache.indexOf(sep);
+ String name = cache.substring(0,index);
+ if (name.trim() != "") {
+ methods.add(name);
+ cache = cache.substring(index+sepLen);
+ }
+ }
+
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
+ for (int i=0; methodDetails.hasMoreTokens();i++ ) {
+ String token = (String) methodDetails.nextToken();
+ if (i==0) {
+ methodName = token.toUpperCase();
+ } else {
+ parms.add(token);
+ }
+ }
+ properties.put(methodName,parms);
+ }
+ }
+ return properties;
+ }
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ try {
Class dataSourceClass = Class.forName(className);
Object dataSourceObject = dataSourceClass.newInstance();
return dataSourceObject;
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
+ _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
+
throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
} catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
throw new ResourceException("Error in instantiating" + className);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
+ _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
throw new ResourceException("Access Error in instantiating" + className);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
index ef6c4c9..3dc154d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
@@ -19,92 +19,92 @@
import java.util.Hashtable;
/**
- * Encapsulate the DataSource object details obtained from
+ * Encapsulate the DataSource object details obtained from
* ManagedConnectionFactory.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class DataSourceSpec implements java.io.Serializable{
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
+ public static final int USERNAME = 1;
+ public static final int PASSWORD = 2;
+ public static final int URL = 3;
+ public static final int LOGINTIMEOUT = 4;
+ public static final int LOGWRITER = 5;
+ public static final int DATABASENAME = 6;
+ public static final int DATASOURCENAME = 7;
+ public static final int DESCRIPTION = 8;
+ public static final int NETWORKPROTOCOL = 9;
+ public static final int PORTNUMBER = 10;
+ public static final int ROLENAME = 11;
+ public static final int SERVERNAME = 12;
+ public static final int MAXSTATEMENTS = 13;
+ public static final int INITIALPOOLSIZE = 14;
+ public static final int MINPOOLSIZE = 15;
+ public static final int MAXPOOLSIZE = 16;
+ public static final int MAXIDLETIME = 17;
+ public static final int PROPERTYCYCLE = 18;
+ public static final int DRIVERPROPERTIES = 19;
+ public static final int CLASSNAME = 20;
+ public static final int DELIMITER = 21;
+
+ public static final int XADATASOURCE = 22;
+ public static final int DATASOURCE = 23;
+ public static final int CONNECTIONPOOLDATASOURCE = 24;
+
+ //GJCINT
+ public static final int CONNECTIONVALIDATIONREQUIRED = 25;
+ public static final int VALIDATIONMETHOD = 26;
+ public static final int VALIDATIONTABLENAME = 27;
+
+ public static final int TRANSACTIONISOLATION = 28;
+ public static final int GUARANTEEISOLATIONLEVEL = 29;
+
private Hashtable details = new Hashtable();
-
+
/**
* Set the property.
*
- * @param property Property Name to be set.
- * @param value Value of property to be set.
+ * @param property Property Name to be set.
+ * @param value Value of property to be set.
*/
public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
+ details.put(new Integer(property),value);
}
-
+
/**
* Get the value of property
*
- * @return Value of the property.
+ * @return Value of the property.
*/
public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
+ if (details.containsKey(new Integer(property))) {
+ return (String) details.get(new Integer(property));
+ } else {
+ return null;
+ }
}
-
+
/**
* Checks whether two <code>DataSourceSpec</code> objects
* are equal or not.
*
- * @param obj Instance of <code>DataSourceSpec</code> object.
+ * @param obj Instance of <code>DataSourceSpec</code> object.
*/
public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
+ if (obj instanceof DataSourceSpec) {
+ return this.details.equals(((DataSourceSpec)obj).details);
+ }
+ return false;
}
-
+
/**
* Retrieves the hashCode of this <code>DataSourceSpec</code> object.
*
- * @return hashCode of this object.
+ * @return hashCode of this object.
*/
public int hashCode() {
- return this.details.hashCode();
- }
+ return this.details.hashCode();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml
index ef438fc..3b4faeb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/common"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -36,13 +36,13 @@
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
-
+
<target name="package13" depends="package"/>
<target name="package14" depends="package"/>
<target name="build13" depends="compile13, package13"/>
<target name="build14" depends="compile14, package14"/>
-
+
<target name="build" depends="build13, build14"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
index dbb5729..beabe55 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
@@ -24,24 +24,24 @@
import java.util.concurrent.Executor;
/**
- * Holds the java.sql.Connection object, which is to be
+ * Holds the java.sql.Connection object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
-public class ConnectionHolder implements Connection{
+public class ConnectionHolder implements Connection{
private Connection con;
-
+
private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
+
+ private boolean wrappedAlready = false;
+
private boolean isClosed = false;
-
+
private boolean valid = true;
-
+
private boolean active = false;
/**
* The active flag is false when the connection handle is
@@ -53,219 +53,219 @@
* function, the above method invocation succeeds; otherwise
* an exception is thrown.
*/
-
+
/**
* Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
+ *
+ * @param con <code>java.sql.Connection</code> object.
*/
public ConnectionHolder(Connection con, ManagedConnection mc) {
this.con = con;
this.mc = mc;
}
-
+
/**
* Returns the actual connection in this holder object.
- *
- * @return Connection object.
+ *
+ * @return Connection object.
*/
Connection getConnection() {
- return con;
+ return con;
}
-
+
/**
* Sets the flag to indicate that, the connection is wrapped already or not.
*
- * @param wrapFlag
+ * @param wrapFlag
*/
void wrapped(boolean wrapFlag){
this.wrappedAlready = wrapFlag;
}
-
+
/**
* Returns whether it is wrapped already or not.
*
- * @return wrapped flag.
+ * @return wrapped flag.
*/
boolean isWrapped(){
return wrappedAlready;
}
-
+
/**
* Returns the <code>ManagedConnection</code> instance responsible
* for this connection.
*
- * @return <code>ManagedConnection</code> instance.
+ * @return <code>ManagedConnection</code> instance.
*/
ManagedConnection getManagedConnection() {
return mc;
}
-
+
/**
* Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
+ * supplied. Also replace <code>ManagedConnection</code> link.
*
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
+ * @param con <code>Connection</code> object.
+ * @param mc <code> ManagedConnection</code> object.
*/
void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
+ this.mc = mc;
+ this.con = con;
}
-
+
/**
* Clears all warnings reported for the underlying connection object.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- public void clearWarnings() throws SQLException{
- checkValidity();
+ public void clearWarnings() throws SQLException{
+ checkValidity();
con.clearWarnings();
}
-
+
/**
- * Closes the logical connection.
+ * Closes the logical connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void close() throws SQLException{
isClosed = true;
- mc.connectionClosed(null, this);
+ mc.connectionClosed(null, this);
}
-
+
/**
* Invalidates this object.
*/
public void invalidate() {
- valid = false;
+ valid = false;
}
-
+
/**
* Closes the physical connection involved in this.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
- void actualClose() throws SQLException{
+ void actualClose() throws SQLException{
con.close();
}
-
+
/**
* Commit the changes in the underlying Connection.
*
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public void commit() throws SQLException {
- checkValidity();
- con.commit();
+ checkValidity();
+ con.commit();
}
-
+
/**
* Creates a statement from the underlying Connection
*
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement() throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement();
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
}
-
+
/**
* Creates a statement from the underlying Connection.
*
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code>Statement</code> object.
+ * @throws SQLException In case of a database error.
*/
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
+ public Statement createStatement(int resultSetType, int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ resultSetHoldabilty);
}
-
+
/**
* Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
*
* @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
+ checkValidity();
+ return con.getAutoCommit();
+ }
+
/**
* Retrieves the underlying <code>Connection</code> object's catalog name.
*
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
+ * @return Catalog Name.
+ * @throws SQLException In case of a database error.
*/
public String getCatalog() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getCatalog();
}
-
+
/**
* Retrieves the current holdability of <code>ResultSet</code> objects created
* using this connection object.
*
- * @return holdability value.
- * @throws SQLException In case of a database error.
+ * @return holdability value.
+ * @throws SQLException In case of a database error.
*/
public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
+ checkValidity();
+ return con.getHoldability();
}
-
+
/**
* Retrieves the <code>DatabaseMetaData</code>object from the underlying
* <code> Connection </code> object.
*
* @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
+ checkValidity();
+ return con.getMetaData();
}
-
+
/**
* Retrieves this <code>Connection</code> object's current transaction isolation level.
*
* @return Transaction level
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public int getTransactionIsolation() throws SQLException {
- checkValidity();
+ checkValidity();
return con.getTransactionIsolation();
}
-
+
/**
- * Retrieves the <code>Map</code> object associated with
+ * Retrieves the <code>Map</code> object associated with
* <code> Connection</code> Object.
*
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
+ * @return TypeMap set in this object.
+ * @throws SQLException In case of a database error.
*/
public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
+ checkValidity();
+ return con.getTypeMap();
}
public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
@@ -277,184 +277,184 @@
* <code>Connection</code> object.
*
* @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
+ checkValidity();
+ return con.getWarnings();
}
-
+
/**
* Retrieves whether underlying <code>Connection</code> object is closed.
*
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
+ * @return true if <code>Connection</code> object is closed, false
+ * if it is closed.
+ * @throws SQLException In case of a database error.
*/
public boolean isClosed() throws SQLException {
- return isClosed;
+ return isClosed;
}
-
+
/**
* Retrieves whether this <code>Connection</code> object is read-only.
*
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
+ * @return true if <code> Connection </code> is read-only, false other-wise
+ * @throws SQLException In case of a database error.
*/
public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
+ checkValidity();
+ return con.isReadOnly();
}
-
+
/**
* Converts the given SQL statement into the system's native SQL grammer.
*
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
+ * @param sql SQL statement , to be converted.
+ * @return Converted SQL string.
+ * @throws SQLException In case of a database error.
*/
public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
+ checkValidity();
+ return con.nativeSQL(sql);
}
-
+
/**
* Creates a <code> CallableStatement </code> object for calling database
* stored procedures.
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
+ checkValidity();
+ return con.prepareCall(sql);
}
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> CallableStatement </code> object for calling database
+ * stored procedures.
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> CallableStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public CallableStatement prepareCall(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException{
+ checkValidity();
+ return con.prepareCall(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
+ * @param sql SQL Statement
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
+ checkValidity();
+ return con.prepareStatement(sql);
}
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
/**
- * Creates a <code> PreparedStatement </code> object for sending
+ * Creates a <code> PreparedStatement </code> object for sending
* paramterized SQL statements to database
*
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
+ * @param sql SQL Statement
+ * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
* @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,autoGeneratedKeys);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnIndexes an array of column indexes indicating the columns that should be
+ * returned from the inserted row or rows.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql,columnIndexes);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql,int resultSetType,
+ int resultSetConcurrency) throws SQLException{
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param resultSetType Type of the ResultSet
+ * @param resultSetConcurrency ResultSet Concurrency.
+ * @param resultSetHoldability ResultSet Holdability.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
+ */
+ public PreparedStatement prepareStatement(String sql, int resultSetType,
+ int resultSetConcurrency,
+ int resultSetHoldabilty) throws SQLException {
+ checkValidity();
+ return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
+ resultSetHoldabilty);
+ }
+
+ /**
+ * Creates a <code> PreparedStatement </code> object for sending
+ * paramterized SQL statements to database
+ *
+ * @param sql SQL Statement
+ * @param columnNames Name of bound columns.
+ * @return <code> PreparedStatement</code> object.
+ * @throws SQLException In case of a database error.
*/
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
+ checkValidity();
+ return con.prepareStatement(sql,columnNames);
}
public Clob createClob() throws SQLException {
@@ -504,150 +504,150 @@
/**
* Removes the given <code>Savepoint</code> object from the current transaction.
*
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
+ * @param savepoint <code>Savepoint</code> object
+ * @throws SQLException In case of a database error.
*/
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
+ checkValidity();
+ con.releaseSavepoint(savepoint);
+ }
+
/**
* Rolls back the changes made in the current transaction.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
+ checkValidity();
+ con.rollback();
}
-
+
/**
* Rolls back the changes made after the savepoint.
*
- * @throws SQLException In case of a database error.
- */
+ * @throws SQLException In case of a database error.
+ */
public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
+ checkValidity();
+ con.rollback(savepoint);
}
-
+
/**
* Sets the auto-commmit mode of the <code>Connection</code> object.
*
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
+ * @param autoCommit boolean value indicating the auto-commit mode.
+ * @throws SQLException In case of a database error.
*/
public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
+ checkValidity();
+ con.setAutoCommit(autoCommit);
}
-
+
/**
* Sets the catalog name to the <code>Connection</code> object
*
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
+ * @param catalog Catalog name.
+ * @throws SQLException In case of a database error.
*/
public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
+ checkValidity();
+ con.setCatalog(catalog);
}
-
+
/**
- * Sets the holdability of <code>ResultSet</code> objects created
+ * Sets the holdability of <code>ResultSet</code> objects created
* using this <code>Connection</code> object.
*
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
+ * @param holdability A <code>ResultSet</code> holdability constant
+ * @throws SQLException In case of a database error.
*/
public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
+ checkValidity();
+ con.setHoldability(holdability);
}
-
+
/**
- * Puts the connection in read-only mode as a hint to the driver to
+ * Puts the connection in read-only mode as a hint to the driver to
* perform database optimizations.
*
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
+ * @param readOnly true enables read-only mode, false disables it.
+ * @throws SQLException In case of a database error.
*/
public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
+ checkValidity();
+ con.setReadOnly(readOnly);
}
-
+
/**
* Creates and unnamed savepoint and returns an object corresponding to that.
*
- * @return <code>Savepoint</code> object.
+ * @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
+ checkValidity();
+ return con.setSavepoint();
}
-
+
/**
* Creates a savepoint with the name and returns an object corresponding to that.
*
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
+ * @param name Name of the savepoint.
+ * @return <code>Savepoint</code> object.
+ * @throws SQLException In case of a database error.
*/
public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
+ checkValidity();
+ return con.setSavepoint(name);
+ }
+
/**
* Creates the transaction isolation level.
*
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
+ * @param level transaction isolation level.
+ * @throws SQLException In case of a database error.
*/
public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
+ checkValidity();
+ con.setTransactionIsolation(level);
+ }
+
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
+
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
-
-
+
+
/**
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
+ if (isClosed) throw new SQLException ("Connection closed");
+ if (!valid) throw new SQLException ("Invalid Connection");
+ if(active == false) {
+ mc.checkIfActive(this);
+ }
}
-
+
/**
* Sets the active flag to true
*
- * @param actv boolean
+ * @param actv boolean
*/
void setActive(boolean actv) {
active = actv;
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
index ac7e748..f0675a4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
@@ -33,19 +33,19 @@
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
* and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
+public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
-
+
protected DataSourceSpec spec = new DataSourceSpec();
protected transient DataSourceObjectBuilder dsObjBuilder;
-
+
protected java.io.PrintWriter logWriter = null;
protected jakarta.resource.spi.ResourceAdapter ra = null;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -54,8 +54,8 @@
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory() {
if(logWriter != null) {
@@ -63,16 +63,16 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
+
return cf;
}
-
+
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
+ *
+ * @param cxManager <code>ConnectionManager</code> passed by the application server
+ * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
@@ -80,55 +80,55 @@
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
(jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
+ return cf;
}
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public abstract boolean equals(Object other);
-
+
/**
* Get the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
+ * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setLogWriter</code>
*/
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
-
+
/**
* Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
*
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
+ * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
+ * @see <code>setResourceAdapter</code>
*/
public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
if(logWriter != null) {
@@ -136,11 +136,11 @@
}
return ra;
}
-
+
/**
* Returns the hash code for this <code>ManagedConnectionFactory</code>.
*
- * @return hash code for this <code>ManagedConnectionFactory</code>
+ * @return hash code for this <code>ManagedConnectionFactory</code>
*/
public int hashCode(){
if(logWriter != null) {
@@ -148,41 +148,41 @@
}
return spec.hashCode();
}
-
+
/**
- * Returns a matched <code>ManagedConnection</code> from the candidate
+ * Returns a matched <code>ManagedConnection</code> from the candidate
* set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
+ *
+ * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
+ * @param subject passed by the application server
+ * for retrieving information required for matching
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
+ * for retrieving information required for matching
+ * @return <code>ManagedConnection</code> that is the best match satisfying this request
+ * @throws ResourceException if there is an error accessing the <code>Subject</code>
+ * parameter or the <code>Set</code> of <code>ManagedConnection</code>
+ * objects passed by the application server
*/
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
+ public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
logWriter.println("In matchManagedConnections");
}
-
+
if(connectionSet == null) {
return null;
}
-
+
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
java.util.Iterator iter = connectionSet.iterator();
com.sun.jdbcra.spi.ManagedConnection mc = null;
while(iter.hasNext()) {
try {
mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
} catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
+ _logger.log(Level.SEVERE, "jdbc.exc_iter");
throw new ResourceException(nsee.getMessage());
}
if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
@@ -191,7 +191,7 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
+ _logger.log(Level.SEVERE, "jdbc.exc_re", re);
mc.connectionErrorOccurred(re, null);
}
} else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
@@ -200,45 +200,45 @@
isValid(mc);
return mc;
} catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
+ _logger.log(Level.SEVERE, "jdbc.re");
mc.connectionErrorOccurred(re, null);
}
}
}
return null;
}
-
+
//GJCINT
/**
* Checks if a <code>ManagedConnection</code> is to be validated or not
* and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
+ *
+ * @param mc <code>ManagedConnection</code> to be validated
+ * @throws ResourceException if the connection is not valid or
+ * if validation method is not proper
*/
void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
if(mc.isTransactionInProgress()) {
- return;
+ return;
}
-
- boolean connectionValidationRequired =
+
+ boolean connectionValidationRequired =
(new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
if( connectionValidationRequired == false || mc == null) {
return;
}
-
-
+
+
String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
+
mc.checkIfValid();
/**
* The above call checks if the actual physical connection
* is usable or not.
*/
java.sql.Connection con = mc.getActualConnection();
-
+
if(validationMethod.equals("auto-commit") == true) {
isValidByAutoCommit(con);
} else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
@@ -249,28 +249,28 @@
throw new ResourceException("The validation method is not proper");
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
- // Notice that using something like
+ // Notice that using something like
// dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
// some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
+ // We do not validate connections that are already enlisted
+ //in a transaction
+ // We cycle autocommit to true and false to by-pass drivers that
+ // might cache the call to set autocomitt
// Also notice that some XA data sources will throw and exception if
// you try to call setAutoCommit, for them this method is not recommended
@@ -281,90 +281,90 @@
con.rollback(); // prevents uncompleted transaction exceptions
con.setAutoCommit(true);
}
-
- con.setAutoCommit(ac);
+
+ con.setAutoCommit(ac);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
+ _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @throws ResourceException if the connection is not valid
*/
protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.DatabaseMetaData dmd = con.getMetaData();
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException("The connection is not valid as "
+ "getting the meta data failed: " + sqle.getMessage());
}
}
-
+
/**
* Checks if a <code>java.sql.Connection</code> is valid or not
* by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
+ *
+ * @param con <code>java.sql.Connection</code> to be validated
+ * @param tableName table which should be queried
+ * @throws ResourceException if the connection is not valid
*/
- protected void isValidByTableQuery(java.sql.Connection con,
+ protected void isValidByTableQuery(java.sql.Connection con,
String tableName) throws ResourceException {
if(con == null) {
throw new ResourceException("The connection is not valid as "
+ "the connection is null");
}
-
+
try {
java.sql.Statement stmt = con.createStatement();
java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
} catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
+ _logger.log(Level.SEVERE, "jdbc.exc_execute");
throw new ResourceException("The connection is not valid as "
+ "querying the table " + tableName + " failed: " + sqle.getMessage());
}
}
-
+
/**
* Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
* for the <code>ManagedConnection</code> passed.
*
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ con.setTransactionIsolation(tranIsolationInt);
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The transaction isolation could "
+ + "not be set: " + sqle.getMessage());
+ }
+ }
}
-
+
/**
* Resets the isolation level for the <code>ManagedConnection</code> passed.
* If the transaction level is to be guaranteed to be the same as the one
@@ -373,382 +373,382 @@
* isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
* it sets it to the transaction isolation passed.
*
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
+ * @param mc <code>ManagedConnection</code>
+ * @param tranIsol int
+ * @throws ResourceException if the isolation property is invalid
+ * or if the isolation cannot be set over the connection
*/
void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
+
+ java.sql.Connection con = mc.getActualConnection();
+ if(con == null) {
+ return;
+ }
+
+ String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
+ if(tranIsolation != null && tranIsolation.equals("") == false) {
+ String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
+
+ if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
+ boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
+
+ if(guarantee) {
+ int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
+ try {
+ if(tranIsolationInt != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsolationInt);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ } else {
+ try {
+ if(tranIsol != con.getTransactionIsolation()) {
+ con.setTransactionIsolation(tranIsol);
+ }
+ } catch(java.sql.SQLException sqle) {
+ _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
+ throw new ResourceException("The isolation level could not be set: "
+ + sqle.getMessage());
+ }
+ }
+ }
+ }
}
-
+
/**
* Gets the integer equivalent of the string specifying
* the transaction isolation.
*
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
+ * @param tranIsolation string specifying the isolation level
+ * @return tranIsolationInt the <code>java.sql.Connection</code> constant
+ * for the string specifying the isolation.
*/
private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
+ if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
+ return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
+ return java.sql.Connection.TRANSACTION_READ_COMMITTED;
+ } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
+ return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
+ } else if(tranIsolation.equalsIgnoreCase("serializable")) {
+ return java.sql.Connection.TRANSACTION_SERIALIZABLE;
+ } else {
+ throw new ResourceException("Invalid transaction isolation; the transaction "
+ + "isolation level can be empty or any of the following: "
+ + "read-uncommitted, read-committed, repeatable-read, serializable");
+ }
}
-
+
/**
* Set the log writer for this <code>ManagedConnectionFactory</code> instance.
*
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
+ * @param out <code>PrintWriter</code> passed by the application server
+ * @see <code>getLogWriter</code>
*/
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
-
+
/**
* Set the associated <code>ResourceAdapter</code> JavaBean.
*
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
+ * @param ra <code>ResourceAdapter</code> associated with this
+ * <code>ManagedConnectionFactory</code> instance
+ * @see <code>getResourceAdapter</code>
*/
public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
+ this.ra = ra;
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setUser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getUser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the user name
*
- * @param user <code>String</code>
+ * @param user <code>String</code>
*/
public void setuser(String user) {
spec.setDetail(DataSourceSpec.USERNAME, user);
}
-
+
/**
* Gets the user name
*
- * @return user
+ * @return user
*/
public String getuser() {
return spec.getDetail(DataSourceSpec.USERNAME);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setPassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getPassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the password
*
- * @param passwd <code>String</code>
+ * @param passwd <code>String</code>
*/
public void setpassword(String passwd) {
spec.setDetail(DataSourceSpec.PASSWORD, passwd);
}
-
+
/**
* Gets the password
*
- * @return passwd
+ * @return passwd
*/
public String getpassword() {
return spec.getDetail(DataSourceSpec.PASSWORD);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setClassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getClassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets the class name of the data source
*
- * @param className <code>String</code>
+ * @param className <code>String</code>
*/
public void setclassName(String className) {
spec.setDetail(DataSourceSpec.CLASSNAME, className);
}
-
+
/**
* Gets the class name of the data source
*
- * @return className
+ * @return className
*/
public String getclassName() {
return spec.getDetail(DataSourceSpec.CLASSNAME);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setConnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getConnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets if connection validation is required or not
*
- * @param conVldReq <code>String</code>
+ * @param conVldReq <code>String</code>
*/
public void setconnectionValidationRequired(String conVldReq) {
spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
}
-
+
/**
* Returns if connection validation is required or not
*
- * @return connection validation requirement
+ * @return connection validation requirement
*/
public String getconnectionValidationRequired() {
return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setValidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getValidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the validation method required
*
- * @param validationMethod <code>String</code>
+ * @param validationMethod <code>String</code>
*/
public void setvalidationMethod(String validationMethod) {
spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
}
-
+
/**
* Returns the connection validation method type
*
- * @return validation method
+ * @return validation method
*/
public String getvalidationMethod() {
return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setValidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getValidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the table checked for during validation
*
- * @param table <code>String</code>
+ * @param table <code>String</code>
*/
public void setvalidationTableName(String table) {
spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
}
-
+
/**
* Returns the table checked for during validation
*
- * @return table
+ * @return table
*/
public String getvalidationTableName() {
return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void setTransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String getTransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets the transaction isolation level
*
- * @param trnIsolation <code>String</code>
+ * @param trnIsolation <code>String</code>
*/
public void settransactionIsolation(String trnIsolation) {
spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return transaction isolation level
+ * @return transaction isolation level
*/
public String gettransactionIsolation() {
return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getGuaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
/**
* Sets if the transaction isolation level is to be guaranteed
*
- * @param guaranteeIsolation <code>String</code>
+ * @param guaranteeIsolation <code>String</code>
*/
public void setguaranteeIsolationLevel(String guaranteeIsolation) {
spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
}
-
+
/**
* Returns the transaction isolation level
*
- * @return isolation level guarantee
+ * @return isolation level guarantee
*/
public String getguaranteeIsolationLevel() {
return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
index 555be77..ea54076 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
@@ -26,8 +26,8 @@
/**
* <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
*/
public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
@@ -37,52 +37,52 @@
* Empty method implementation for endpointActivation
* which just throws <code>NotSupportedException</code>
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
*/
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty method implementation for endpointDeactivation
*
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
*/
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
}
-
+
/**
* Empty method implementation for getXAResources
* which just throws <code>NotSupportedException</code>
*
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
*/
public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
throw new NotSupportedException("This method is not supported for this JDBC connector");
}
-
+
/**
* Empty implementation of start method
*
- * @param ctx <code>BootstrapContext</code>
+ * @param ctx <code>BootstrapContext</code>
*/
public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
System.out.println("Resource Adapter is starting with configuration :" + raProp);
if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
}
-
+ }
+
/**
* Empty implementation of stop method
*/
public void stop() {
-
+
}
public void setRAProperty(String s) {
@@ -92,5 +92,5 @@
public String getRAProperty() {
return raProp;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml
index 5e14d44..ff0f02b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="${gjc.home}" default="build">
<property name="pkg.dir" value="com/sun/gjc/spi"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -29,55 +29,55 @@
</target>
<target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
+
+ <mkdir dir="${gjc.home}/dist/spi/1.5"/>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
+
<jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
+ <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
</copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
+ <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
+ <metainf dir="${gjc.home}/dist/spi/1.5">
+ <include name="ra.xml"/>
+ </metainf>
+ </jar>
+
+ <delete dir="${gjc.home}/dist/com"/>
+ <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
+ <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
+
</target>
<target name="build14" depends="compile14, package14"/>
<target name="build13"/>
- <target name="build" depends="build14, build13"/>
+ <target name="build" depends="build14, build13"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index df45777..a897f06 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -22,69 +22,69 @@
version="1.5">
<!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
+ <!-- This field can be optionally used by the driver vendor to provide a
description for the resource adapter.
-->
<description>Resource adapter wrapping Datasource implementation of driver</description>
-
+
<!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
+ <!-- The field can be optionally used by the driver vendor to provide a name that
is intended to be displayed by tools.
-->
<display-name>DataSource Resource Adapter</display-name>
-
+
<!-- There can be any number of "icon" elements including 0 -->
<!-- The following is an example.
<icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
+ This "small-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (16 x 16)
icon - JPEG or GIF image. The following is an example.
<small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
+
+ This "large-icon" element can occur atmost once. This should specify the
+ absolute or the relative path name of a file containing a small (32 x 32)
icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
+ <large-icon>largeicon.jpg</large-icon>
</icon>
-->
<icon>
<small-icon></small-icon>
- <large-icon></large-icon>
+ <large-icon></large-icon>
</icon>
-
+
<!-- The "vendor-name" element should occur exactly once. -->
<!-- This should specify the name of the driver vendor. The following is an example.
<vendor-name>XYZ INC.</vendor-name>
-->
<vendor-name>Sun Microsystems</vendor-name>
-
+
<!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
+ <!-- This should specify the database, for example the product name of
the database independent of any version information. The following
is an example.
<eis-type>XYZ</eis-type>
-->
<eis-type>Database</eis-type>
-
+
<!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
+ <!-- This specifies a string based version of the resource adapter from
the driver vendor. The default is being set as 1.0. The driver
vendor can change it as required.
-->
<resourceadapter-version>1.0</resourceadapter-version>
-
+
<!-- This "license" element can occur atmost once -->
<!-- This specifies licensing requirements for the resource adapter module.
The following is an example.
<license>
There can be any number of "description" elements including 0.
<description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
+ This field can be optionally used by the driver vendor to
+ provide a description for the licensing requirements of the
+ resource adapter like duration of license, numberof connection
restrictions.
</description>
-
+
This specifies whether a license is required to deploy and use the resource adapter.
Default is false.
<license-required>false</license-required>
@@ -93,24 +93,24 @@
<license>
<license-required>false</license-required>
</license>
-
+
<resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
+
+ <!--
+ The "config-property" elements can have zero or more "description"
elements. The "description" elements are not being included
in the "config-property" elements below. The driver vendor can
add them as required.
-->
-
+
<resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
+
<outbound-resourceadapter>
-
+
<connection-definition>
-
+
<managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
+
<!-- There can be any number of these elements including 0 -->
<config-property>
<config-property-name>ServerName</config-property-name>
@@ -128,7 +128,7 @@
<config-property-value>testdb</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>User</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbuser</config-property-value>
@@ -139,12 +139,12 @@
<config-property-value>dbuser</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>Password</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>dbpassword</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>URL</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
@@ -154,7 +154,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>-->
- <config-property>
+ <config-property>
<config-property-name>Description</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>Oracle thin driver Datasource</config-property-value>
@@ -165,17 +165,17 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>RoleName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>LoginTimeOut</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>0</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>DriverProperties</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
@@ -186,7 +186,7 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>#</config-property-value>
</config-property>
- <config-property>
+ <config-property>
<config-property-name>ClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
@@ -198,82 +198,82 @@
</config-property>
<!--
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
-->
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
+
<connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
+
<connection-interface>java.sql.Connection</connection-interface>
-
+
<connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
+
</connection-definition>
-
+
<transaction-support>LocalTransaction</transaction-support>
-
+
<authentication-mechanism>
<!-- There can be any number of "description" elements including 0 -->
<!-- Not including the "description" element -->
-
+
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
+
<credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
-
+
<reauthentication-support>false</reauthentication-support>
-
+
</outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
</adminobject>
-
+
</resourceadapter>
-
+
</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
index b219cd2..124809c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
@@ -24,26 +24,26 @@
/**
* ConnectionManager implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
+public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
/**
* Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
*
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
+ * @param mcf <code>ManagedConnectionFactory</code> object.
+ * @param info <code>ConnectionRequestInfo</code> object.
+ * @return A <code>Connection</code> Object.
+ * @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
+ ConnectionRequestInfo info)
+ throws ResourceException {
+ ManagedConnection mc = mcf.createManagedConnection(null, info);
+ return mc.getConnection(null, info);
}
-
+
/*
* This class could effectively implement Connection pooling also.
* Could be done for FCS.
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index 39c7876..c477fc2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -19,10 +19,10 @@
/**
* ConnectionRequestInfo implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
+public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
private String user;
private String password;
@@ -30,8 +30,8 @@
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
*
- * @param user User Name.
- * @param password Password
+ * @param user User Name.
+ * @param password Password
*/
public ConnectionRequestInfo(String user, String password) {
this.user = user;
@@ -41,7 +41,7 @@
/**
* Retrieves the user name of the ConnectionRequestInfo.
*
- * @return User name of ConnectionRequestInfo.
+ * @return User name of ConnectionRequestInfo.
*/
public String getUser() {
return user;
@@ -50,7 +50,7 @@
/**
* Retrieves the password of the ConnectionRequestInfo.
*
- * @return Password of ConnectionRequestInfo.
+ * @return Password of ConnectionRequestInfo.
*/
public String getPassword() {
return password;
@@ -59,7 +59,7 @@
/**
* Verify whether two ConnectionRequestInfos are equal.
*
- * @return True, if they are equal and false otherwise.
+ * @return True, if they are equal and false otherwise.
*/
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -75,18 +75,18 @@
/**
* Retrieves the hashcode of the object.
*
- * @return hashCode.
+ * @return hashCode.
*/
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
}
-
+
/**
* Compares two objects.
*
- * @param o1 First object.
- * @param o2 Second object.
+ * @param o1 First object.
+ * @param o2 Second object.
*/
private boolean isEqual(Object o1, Object o2) {
if (o1 == null) {
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index b67d23a..6537559 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -31,36 +31,36 @@
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
+
private transient javax.sql.DataSource dataSourceObj;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
private boolean debug = false;
-
+
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ *
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -68,58 +68,58 @@
logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
+
if(dataSourceObj == null) {
if(dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
-
+
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
+ _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
-
+
java.sql.Connection dsConn = null;
-
+
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
+ /* For the case where the user/passwd of the connection pool is
+ * equal to the PasswordCredential for the connection request
+ * get a connection from this pool directly.
+ * for all other conditions go create a new connection
+ */
+ if ( isEqual( pc, getUser(), getPassword() ) ) {
+ dsConn = dataSourceObj.getConnection();
+ } else {
+ dsConn = dataSourceObj.getConnection(pc.getUserName(),
+ new String(pc.getPassword()));
+ }
} catch(java.sql.SQLException sqle) {
sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
+ _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
+ throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
} catch(Exception e){
- e.printStackTrace();
+ e.printStackTrace();
}
-
+
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
//GJCINT
/*setIsolation(mc);
isValid(mc); */
return mc;
}
-
+
/**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
+ * Check if this <code>ManagedConnectionFactory</code> is equal to
* another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
+ *
+ * @param other <code>ManagedConnectionFactory</code> object for checking equality with
+ * @return true if the property sets of both the
+ * <code>ManagedConnectionFactory</code> objects are the same
+ * false otherwise
*/
public boolean equals(Object other) {
if(logWriter != null) {
@@ -130,409 +130,409 @@
* if and only if their properties are the same.
*/
if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
+ com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
(com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setserverName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getserverName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
+ * @see <code>getServerName</code>
*/
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
-
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
+ * @see <code>setServerName</code>
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setportNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getportNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the port number.
*
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
+ * @param portNumber <code>String</code>
+ * @see <code>getPortNumber</code>
*/
public void setPortNumber(String portNumber) {
spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
}
-
+
/**
* Gets the port number.
*
- * @return portNumber
- * @see <code>setPortNumber</code>
+ * @return portNumber
+ * @see <code>setPortNumber</code>
*/
public String getPortNumber() {
return spec.getDetail(DataSourceSpec.PORTNUMBER);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setdatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getdatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the database name.
*
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
+ * @param databaseName <code>String</code>
+ * @see <code>getDatabaseName</code>
*/
public void setDatabaseName(String databaseName) {
spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
}
-
+
/**
* Gets the database name.
*
- * @return databaseName
- * @see <code>setDatabaseName</code>
+ * @return databaseName
+ * @see <code>setDatabaseName</code>
*/
public String getDatabaseName() {
return spec.getDetail(DataSourceSpec.DATABASENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setdataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getdataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the data source name.
*
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
+ * @param dsn <code>String</code>
+ * @see <code>getDataSourceName</code>
*/
public void setDataSourceName(String dsn) {
spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
}
-
+
/**
* Gets the data source name.
*
- * @return dsn
- * @see <code>setDataSourceName</code>
+ * @return dsn
+ * @see <code>setDataSourceName</code>
*/
public String getDataSourceName() {
return spec.getDetail(DataSourceSpec.DATASOURCENAME);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setdescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getdescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the description.
*
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
+ * @param desc <code>String</code>
+ * @see <code>getDescription</code>
*/
public void setDescription(String desc) {
spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
}
-
+
/**
* Gets the description.
*
- * @return desc
- * @see <code>setDescription</code>
+ * @return desc
+ * @see <code>setDescription</code>
*/
public String getDescription() {
return spec.getDetail(DataSourceSpec.DESCRIPTION);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setnetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getnetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the network protocol.
*
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
+ * @param nwProtocol <code>String</code>
+ * @see <code>getNetworkProtocol</code>
*/
public void setNetworkProtocol(String nwProtocol) {
spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
}
-
+
/**
* Gets the network protocol.
*
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
+ * @return nwProtocol
+ * @see <code>setNetworkProtocol</code>
*/
public String getNetworkProtocol() {
return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setroleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getroleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the role name.
*
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
+ * @param roleName <code>String</code>
+ * @see <code>getRoleName</code>
*/
public void setRoleName(String roleName) {
spec.setDetail(DataSourceSpec.ROLENAME, roleName);
}
-
+
/**
* Gets the role name.
*
- * @return roleName
- * @see <code>setRoleName</code>
+ * @return roleName
+ * @see <code>setRoleName</code>
*/
public String getRoleName() {
return spec.getDetail(DataSourceSpec.ROLENAME);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setloginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getloginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the login timeout.
*
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
+ * @param loginTimeOut <code>String</code>
+ * @see <code>getLoginTimeOut</code>
*/
public void setLoginTimeOut(String loginTimeOut) {
spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
}
-
+
/**
* Gets the login timeout.
*
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
+ * @return loginTimeout
+ * @see <code>setLoginTimeOut</code>
*/
public String getLoginTimeOut() {
return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setdelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getdelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the delimiter.
*
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
+ * @param delim <code>String</code>
+ * @see <code>getDelimiter</code>
*/
public void setDelimiter(String delim) {
spec.setDetail(DataSourceSpec.DELIMITER, delim);
}
-
+
/**
* Gets the delimiter.
*
- * @return delim
- * @see <code>setDelimiter</code>
+ * @return delim
+ * @see <code>setDelimiter</code>
*/
public String getDelimiter() {
return spec.getDetail(DataSourceSpec.DELIMITER);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setdriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getdriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
-
+
/**
* Sets the driver specific properties.
*
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
+ * @param driverProps <code>String</code>
+ * @see <code>getDriverProperties</code>
*/
public void setDriverProperties(String driverProps) {
spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
}
-
+
/**
* Gets the driver specific properties.
*
- * @return driverProps
- * @see <code>setDriverProperties</code>
+ * @return driverProps
+ * @see <code>setDriverProperties</code>
*/
public String getDriverProperties() {
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
@@ -542,35 +542,35 @@
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
+ private boolean isEqual( PasswordCredential pc, String user,
String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
+ //if equal get direct connection else
+ //get connection with user and password.
+
+ if (user == null && pc == null) {
+ return true;
+ }
+
+ if ( user == null && pc != null ) {
+ return false;
+ }
+
+ if( pc == null ) {
+ return true;
+ }
+
+ if ( user.equals( pc.getUserName() ) ) {
+ if ( password == null && pc.getPassword() == null ) {
+ return true;
+ }
+ }
+
+ if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ return true;
+ }
+
+
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java
index 30da1fe..295c3fb 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java
@@ -28,22 +28,22 @@
import java.util.logging.Logger;
import java.util.logging.Level;
/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
+ * Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
*
- * @version 1.0, 02/07/31
- * @author Binod P.G
+ * @version 1.0, 02/07/31
+ * @author Binod P.G
*/
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
+ com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
+
private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
+ private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
- private String description;
+ private String description;
private Reference reference;
-
+
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
@@ -51,57 +51,57 @@
private boolean debug = false;
/**
- * Constructs <code>DataSource</code> object. This is created by the
+ * Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
*
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
+ * @param mcf <code>ManagedConnectionFactory</code> object
+ * creating this object.
+ * @param cm <code>ConnectionManager</code> object either associated
+ * with Application server or Resource Adapter.
*/
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
+ this.mcf = mcf;
+ if (cm == null) {
+ this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ } else {
+ this.cm = cm;
+ }
+ }
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
+ try {
+ return (Connection) cm.allocateConnection(mcf,null);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re);
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re);
+ }
}
-
+
/**
* Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
+ *
+ * @param user User name for the Connection.
+ * @param pwd Password for the Connection.
+ * @return <code> Connection </code> object.
+ * @throws SQLException In case of an error.
*/
public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
+ try {
+ ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
+ return (Connection) cm.allocateConnection(mcf,info);
+ } catch (ResourceException re) {
// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re);
- }
- }
+ _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
+ throw new SQLException (re);
+ }
+ }
/**
* Retrieves the actual SQLConnection from the Connection wrapper
@@ -114,91 +114,91 @@
*/
public Connection getConnection(Connection con) throws SQLException {
- Connection driverCon = con;
+ Connection driverCon = con;
if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
+ driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
+ }
return driverCon;
}
-
+
/**
* Get the login timeout
*
* @return login timeout.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public int getLoginTimeout() throws SQLException{
- return loginTimeout;
+ return loginTimeout;
}
-
+
/**
* Set the login timeout
*
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
+ * @param loginTimeout Login timeout.
+ * @throws SQLException If a database error occurs.
*/
public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
+ this.loginTimeout = loginTimeout;
}
-
- /**
+
+ /**
* Get the logwriter object.
*
* @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
+ return logWriter;
}
-
+
/**
* Set the logwriter on this object.
*
* @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
+ * @throws SQLException If a database error occurs.
*/
public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
+ this.logWriter = logWriter;
+ }
+
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
/**
* Retrieves the description.
*
- * @return Description about the DataSource.
+ * @return Description about the DataSource.
*/
public String getDescription() {
- return description;
+ return description;
}
-
+
/**
* Set the description.
*
* @param description Description about the DataSource.
*/
public void setDescription(String description) {
- this.description = description;
- }
-
+ this.description = description;
+ }
+
/**
* Get the reference.
*
* @return <code>Reference</code>object.
*/
public Reference getReference() {
- return reference;
+ return reference;
}
-
+
/**
* Get the reference.
*
- * @param reference <code>Reference</code> object.
+ * @param reference <code>Reference</code> object.
*/
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public <T> T unwrap(Class<T> iface) throws SQLException {
@@ -206,6 +206,6 @@
}
public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false;
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 574ed66..bec0d6b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -18,13 +18,13 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ public void setTableName(String db);
public String getTableName();
- public void setJndiName(String name);
+ public void setJndiName(String name);
- public String getJndiName();
+ public String getJndiName();
public void setSchemaName(String name);
@@ -34,6 +34,6 @@
public Integer getNoOfRows();
- public boolean checkSetup();
+ public boolean checkSetup();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 3bd7cad..fec7443 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -65,11 +65,11 @@
private void printHierarchy(ClassLoader cl, int cnt){
while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
+ for(int i =0; i < cnt; i++)
+ System.out.print(" " );
+ System.out.println("PARENT :" + cl);
+ cl = cl.getParent();
+ cnt += 3;
}
}
@@ -78,10 +78,10 @@
for(int i =0; i < cnt; i++)
System.out.print(" " );
System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
+ System.out.println("PARENT of ClassLoader 2 :" + cl2);
+ System.out.println("EQUALS : " + (cl1 == cl2));
cl1 = cl1.getParent();
- cl2 = cl2.getParent();
+ cl2 = cl2.getParent();
cnt += 3;
}
}
@@ -90,93 +90,93 @@
public boolean checkSetup(){
if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
+ return false;
+ }
Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
+ Statement s = null;
+ ResultSet rs = null;
+ boolean b = false;
try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
+ InitialContext ic = new InitialContext();
+ //debug
+ Class clz = DataSource.class;
/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
+ if(clz.getClassLoader() != null) {
+ System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
+ printHierarchy(clz.getClassLoader().getParent(), 8);
+ }
+ Class cls = ic.lookup(jndiName).getClass();
+ System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
+ printHierarchy(cls.getClassLoader().getParent(), 8);
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
+ System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
+ System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
+ if(clz.getClassLoader() != null) {
+ compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
+ }
- System.out.println("Before lookup");
+ System.out.println("Before lookup");
*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
+ Object o = ic.lookup(jndiName);
+// System.out.println("after lookup lookup");
- DataSource ds = (DataSource)o ;
+ DataSource ds = (DataSource)o ;
/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ System.out.println("after cast");
+ System.out.println("---------- Trying our Stuff !!!");
+ try {
+ Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
+ ClassLoader cl1 = o1.getClassLoader();
+ ClassLoader cl2 = DataSource.class.getClassLoader();
+ System.out.println("Cl1 == Cl2" + (cl1 == cl2));
+ System.out.println("Classes equal" + (DataSource.class == o1));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
+ String fullTableName = tableName;
+ if (schemaName != null && (!(schemaName.trim().equals("")))) {
+ fullTableName = schemaName.trim() + "." + fullTableName;
+ }
+ String qry = "select * from " + fullTableName;
- System.out.println("Executing query :" + qry);
+ System.out.println("Executing query :" + qry);
- s = con.createStatement();
- rs = s.executeQuery(qry);
+ s = con.createStatement();
+ rs = s.executeQuery(qry);
int i = 0;
- if (rs.next()) {
- i++;
- }
+ if (rs.next()) {
+ i++;
+ }
System.out.println("No of rows found:" + i);
System.out.println("No of rows expected:" + noOfRows);
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (i == noOfRows.intValue()) {
+ b = true;
+ } else {
+ b = false;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ b = false;
+ } finally {
+ try {
+ if (rs != null) rs.close();
+ if (s != null) s.close();
+ if (con != null) con.close();
} catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
+ }
+ }
+ System.out.println("Returning setup :" +b);
+ return b;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
index 8ebe057..c54a216 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
@@ -23,45 +23,45 @@
/**
* <code>LocalTransaction</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
+
private ManagedConnection mc;
-
+
/**
* Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
+ * @param mc <code>ManagedConnection</code> that returns
+ * this <code>LocalTransaction</code> object as
+ * a result of <code>getLocalTransaction</code>
*/
public LocalTransaction(ManagedConnection mc) {
this.mc = mc;
}
-
+
/**
* Begin a local transaction.
*
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection
*/
public void begin() throws ResourceException {
//GJCINT
- mc.transactionStarted();
+ mc.transactionStarted();
try {
mc.getActualConnection().setAutoCommit(false);
} catch(java.sql.SQLException sqle) {
throw new LocalTransactionException(sqle.getMessage());
}
}
-
+
/**
* Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or committing the transaction
*/
public void commit() throws ResourceException {
Exception e = null;
@@ -72,15 +72,15 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
/**
* Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
+ *
+ * @throws LocalTransactionException if there is an error in changing
+ * the autocommit mode of the physical
+ * connection or rolling back the transaction
*/
public void rollback() throws ResourceException {
try {
@@ -90,7 +90,7 @@
throw new LocalTransactionException(sqle.getMessage());
}
//GJCINT
- mc.transactionCompleted();
+ mc.transactionCompleted();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
index 30f460a..2dad59a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
@@ -41,8 +41,8 @@
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
@@ -52,7 +52,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
-
+
private int connectionType = ISNOTAPOOLEDCONNECTION;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
@@ -62,7 +62,7 @@
private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
private XAResource xar = null;
public ConnectionHolder activeConnectionHandle;
-
+
//GJCINT
private int isolationLevelWhenCleaned;
private boolean isClean = false;
@@ -77,71 +77,71 @@
static {
_logger = Logger.getAnonymousLogger();
}
-
+
/**
* Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
+ * to be null and sqlConn parameter is the actual connection in case where
+ * the actual connection is got from a non pooled datasource object. The
* pooledConn parameter is expected to be non null and sqlConn parameter
* is expected to be null in the case where the datasource object is a
* connection pool datasource or an xa datasource.
*
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
+ * @param pooledConn <code>PooledConnection</code> object in case the
+ * physical connection is to be obtained from a pooled
+ * <code>DataSource</code>; null otherwise
+ * @param sqlConn <code>java.sql.Connection</code> object in case the physical
+ * connection is to be obtained from a non pooled <code>DataSource</code>;
+ * null otherwise
+ * @param passwdCred object conatining the
+ * user and password for allocating the connection
+ * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
+ * that created this <code>ManagedConnection</code> object
+ * is not the same as returned by <code>PasswordCredential</code>
+ * object passed
*/
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
+ public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
if(pooledConn == null && sqlConn == null) {
throw new ResourceException("Connection object cannot be null");
}
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ actualConnection = sqlConn;
+ }
pc = pooledConn;
connectionHandles = new Hashtable();
passwdCredential = passwdCred;
this.mcf = mcf;
- if(passwdCredential != null &&
+ if(passwdCredential != null &&
this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
+ throw new ResourceException("The ManagedConnectionFactory that has created this " +
"ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
" the PasswordCredential for this ManagedConnection");
}
logWriter = mcf.getLogWriter();
activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+ ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
}
/**
* Adds a connection event listener to the ManagedConnection instance.
*
- * @param listener <code>ConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
+ this.listener = listener;
}
-
+
/**
- * Used by the container to change the association of an application-level
+ * Used by the container to change the association of an application-level
* connection handle with a <code>ManagedConnection</code> instance.
*
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
+ * @param connection <code>ConnectionHolder</code> to be associated with
+ * this <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is no more
+ * valid or the connection handle passed is null
*/
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
@@ -152,11 +152,11 @@
throw new ResourceException("Connection handle cannot be null");
}
ConnectionHolder ch = (ConnectionHolder) connection;
-
+
com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
+ mc.activeConnectionHandle = null;
+ isClean = false;
+
ch.associateConnection(actualConnection, this);
/**
* The expectation from the above method is that the connection holder
@@ -165,34 +165,34 @@
* to the ManagedConnection instance with this ManagedConnection instance.
* Any previous statements and result sets also need to be removed.
*/
-
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
ch.setActive(true);
- activeConnectionHandle = ch;
+ activeConnectionHandle = ch;
}
-
+
/**
- * Application server calls this method to force any cleanup on the
+ * Application server calls this method to force any cleanup on the
* <code>ManagedConnection</code> instance. This method calls the invalidate
* method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
+ *
+ * @throws ResourceException if the physical connection is no more valid
*/
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
}
checkIfValid();
-
+
/**
* may need to set the autocommit to true for the non-pooled case.
*/
//GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
+ //if (actualConnection != null) {
+ if (connectionType == ISNOTAPOOLEDCONNECTION ) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
@@ -201,17 +201,17 @@
}
}
isClean = true;
-
+
activeConnectionHandle = null;
}
-
+
/**
* This method removes all the connection handles from the table
* of connection handles and invalidates all of them so that any
* operation on those connection handles throws an exception.
*
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
+ * @throws ResourceException if there is a problem in retrieving
+ * the connection handles
*/
private void invalidateAllConnectionHandles() throws ResourceException {
Set handles = connectionHandles.keySet();
@@ -226,22 +226,22 @@
}
connectionHandles.clear();
}
-
+
/**
* Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
+ *
+ * @throws ResourceException if there is an error in closing the physical connection
*/
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
}
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
+ //GJCINT
+ if(isDestroyed == true) {
+ return;
+ }
- activeConnectionHandle = null;
+ activeConnectionHandle = null;
try {
if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
pc.close();
@@ -255,28 +255,28 @@
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
+ throw new ResourceException("The following exception has occured during destroy: "
+ sqle.getMessage());
}
isDestroyed = true;
passwdCredential = null;
connectionHandles = null;
}
-
+
/**
- * Creates a new connection handle for the underlying physical
+ * Creates a new connection handle for the underlying physical
* connection represented by the <code>ManagedConnection</code> instance.
*
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
+ * @param subject <code>Subject</code> parameter needed for authentication
+ * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
+ * and password required for getting this connection.
+ * @return Connection the connection handle <code>Object</code>
+ * @throws ResourceException if there is an error in allocating the
+ * physical connection from the pooled connection
+ * @throws SecurityException if there is a mismatch between the
+ * password credentials or reauthentication is requested
*/
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
+ public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
logWriter.println("In getConnection");
@@ -284,14 +284,14 @@
checkIfValid();
com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
+
if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
}
-
+
//GJCINT
getActualConnection();
-
+
/**
* The following code in the if statement first checks if this ManagedConnection
* is clean or not. If it is, it resets the transaction isolation level to what
@@ -301,28 +301,28 @@
if(isClean) {
((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
}
-
-
+
+
ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
+ isClean=false;
+
if(activeConnectionHandle != null) {
activeConnectionHandle.setActive(false);
}
-
+
connHolderObject.setActive(true);
activeConnectionHandle = connHolderObject;
-
+
return connHolderObject;
-
+
}
-
+
/**
* Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
+ * is used by the container to manage local transactions for a RM instance.
*
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>LocalTransaction</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
@@ -331,13 +331,13 @@
checkIfValid();
return new com.sun.jdbcra.spi.LocalTransaction(this);
}
-
+
/**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
+ * Gets the log writer for this <code>ManagedConnection</code> instance.
*
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>PrintWriter</code> instance associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
public PrintWriter getLogWriter() throws ResourceException {
@@ -345,46 +345,46 @@
logWriter.println("In getLogWriter");
}
checkIfValid();
-
+
return logWriter;
}
-
+
/**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
+ * Gets the metadata information for this connection's underlying EIS
+ * resource manager instance.
*
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @return <code>ManagedConnectionMetaData</code> instance
+ * @throws ResourceException if the physical connection is not valid
*/
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
}
checkIfValid();
-
+
return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
}
-
+
/**
- * Returns an <code>XAResource</code> instance.
+ * Returns an <code>XAResource</code> instance.
*
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
+ * @return <code>XAResource</code> instance
+ * @throws ResourceException if the physical connection is not valid or
+ * there is an error in allocating the
+ * <code>XAResource</code> instance
+ * @throws NotSupportedException if underlying datasource is not an
+ * <code>XADataSource</code>
*/
public XAResource getXAResource() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getXAResource");
}
checkIfValid();
-
+
if(connectionType == ISXACONNECTION) {
try {
if(xar == null) {
- /**
+ /**
* Using the wrapper XAResource.
*/
xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
@@ -397,16 +397,16 @@
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
}
-
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
+ * @param listener <code>ConnectionEventListener</code> to be removed
* @see <code>addConnectionEventListener</code>
*/
public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
+ listener = null;
}
/**
@@ -415,7 +415,7 @@
* LocalTransaction object when its begin() method is called.
*/
void transactionStarted() {
- transactionInProgress = true;
+ transactionInProgress = true;
}
/**
@@ -424,16 +424,16 @@
* LocalTransaction object when its end() method is called.
*/
void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
+ transactionInProgress = false;
+ if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
try {
isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
} catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
+ //check what to do in this case!!
+ _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
}
-
- try {
+
+ try {
actualConnection.close();
actualConnection = null;
} catch(SQLException sqle) {
@@ -441,7 +441,7 @@
}
}
-
+
isClean = true;
activeConnectionHandle = null;
@@ -453,28 +453,28 @@
* or not.
*/
public boolean isTransactionInProgress() {
- return transactionInProgress;
+ return transactionInProgress;
}
-
+
/**
* Sets the log writer for this <code>ManagedConnection</code> instance.
*
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
+ * @param out <code>PrintWriter</code> to be associated with this
+ * <code>ManagedConnection</code> instance
+ * @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
}
-
+
/**
- * This method determines the type of the connection being held
+ * This method determines the type of the connection being held
* in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
+ *
+ * @param pooledConn <code>PooledConnection</code>
+ * @return connection type
*/
private int getConnectionType(PooledConnection pooledConn) {
if(pooledConn == null) {
@@ -485,22 +485,22 @@
return ISPOOLEDCONNECTION;
}
}
-
+
/**
- * Returns the <code>ManagedConnectionFactory</code> instance that
+ * Returns the <code>ManagedConnectionFactory</code> instance that
* created this <code>ManagedConnection</code> instance.
*
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
+ * @return <code>ManagedConnectionFactory</code> instance that created this
+ * <code>ManagedConnection</code> instance
*/
ManagedConnectionFactory getManagedConnectionFactory() {
return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
}
-
+
/**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
+ * Returns the actual sql connection for this <code>ManagedConnection</code>.
*
- * @return the physical <code>java.sql.Connection</code>
+ * @return the physical <code>java.sql.Connection</code>
*/
//GJCINT
java.sql.Connection getActualConnection() throws ResourceException {
@@ -509,8 +509,8 @@
try {
if(actualConnection == null) {
actualConnection = pc.getConnection();
- }
-
+ }
+
} catch(SQLException sqle) {
sqle.printStackTrace();
throw new ResourceException(sqle.getMessage());
@@ -518,81 +518,81 @@
}
return actualConnection;
}
-
+
/**
* Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
*
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
+ * @return <code>PasswordCredential</code> associated with this
+ * <code>ManagedConnection</code> instance
*/
PasswordCredential getPasswordCredential() {
return passwdCredential;
}
-
+
/**
* Checks if this <code>ManagedConnection</code> is valid or not and throws an
* exception if it is not valid. A <code>ManagedConnection</code> is not valid if
* destroy has not been called and no physical connection error has
* occurred rendering the physical connection unusable.
*
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
+ * @throws ResourceException if <code>destroy</code> has been called on this
+ * <code>ManagedConnection</code> instance or if a
+ * physical connection error occurred rendering it unusable
*/
//GJCINT
void checkIfValid() throws ResourceException {
if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
+ throw new ResourceException("This ManagedConnection is not valid as the physical " +
"connection is not usable.");
}
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when its close method is
* called. This <code>ManagedConnection</code> instance invalidates the connection handle
* and sends a CONNECTION_CLOSED event to all the registered event listeners.
*
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
+ * @param e Exception that may have occured while closing the connection handle
+ * @param connHolderObject <code>ConnectionHolder</code> that has been closed
+ * @throws SQLException in case closing the sql connection got out of
+ * <code>getConnection</code> on the underlying
+ * <code>PooledConnection</code> throws an exception
*/
void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
connHolderObject.invalidate();
-
+
activeConnectionHandle = null;
-
+
ce.setConnectionHandle(connHolderObject);
listener.connectionClosed(ce);
-
+
}
-
+
/**
* This method is called by the <code>ConnectionHolder</code> when it detects a connecion
* related error.
*
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
+ * @param e Exception that has occurred during an operation on the physical connection
+ * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
+ * connection error
*/
- void connectionErrorOccurred(Exception e,
+ void connectionErrorOccurred(Exception e,
com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
+
ConnectionEventListener cel = this.listener;
ConnectionEvent ce = null;
ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
: new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
if (connHolderObject != null) {
ce.setConnectionHandle(connHolderObject);
- }
+ }
cel.connectionErrorOccurred(ce);
isUsable = false;
}
-
-
-
+
+
+
/**
* This method is called by the <code>XAResource</code> object when its start method
* has been invoked.
@@ -606,7 +606,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by the <code>XAResource</code> object when its end method
* has been invoked.
@@ -620,7 +620,7 @@
connectionErrorOccurred(e, null);
}
}
-
+
/**
* This method is called by a Connection Handle to check if it is
* the active Connection Handle. If it is not the active Connection
@@ -629,24 +629,24 @@
* Connection Handle object to this object if the active Connection
* Handle is null.
*
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
+ * @param ch <code>ConnectionHolder</code> that requests this
+ * <code>ManagedConnection</code> instance whether
+ * it can be active or not
+ * @throws SQLException in case the physical is not valid or
+ * there is already an active connection handle
*/
-
+
void checkIfActive(ConnectionHolder ch) throws SQLException {
if(isDestroyed == true || isUsable == false) {
throw new SQLException("The physical connection is not usable");
}
-
+
if(activeConnectionHandle == null) {
activeConnectionHandle = ch;
ch.setActive(true);
return;
}
-
+
if(activeConnectionHandle != ch) {
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 20f03aa..f650d41 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -25,8 +25,8 @@
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/03
+ * @author Evani Sai Surya Kiran
*/
public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
@@ -41,81 +41,81 @@
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
+ * @param mc <code>ManagedConnection</code>
+ * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
*/
public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
try {
this.mc = mc;
dmd = mc.getActualConnection().getMetaData();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
+ _logger.log(Level.SEVERE, "jdbc.exc_md");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product name of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product name of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns product version of the underlying EIS instance connected
* through the ManagedConnection.
*
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
+ * @return Product version of the EIS instance
+ * @throws <code>ResourceException</code>
*/
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
throw new ResourceException(sqle.getMessage(), sqle.getMessage());
}
}
-
+
/**
* Returns maximum limit on number of active concurrent connections
* that an EIS instance can support across client processes.
*
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
+ * @return Maximum limit for number of active concurrent connections
+ * @throws <code>ResourceException</code>
*/
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
} catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
+ _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
throw new ResourceException(sqle.getMessage());
}
}
-
+
/**
* Returns name of the user associated with the ManagedConnection instance. The name
* corresponds to the resource principal under whose whose security context, a connection
* to the EIS instance has been established.
*
- * @return name of the user
- * @throws <code>ResourceException</code>
+ * @return name of the user
+ * @throws <code>ResourceException</code>
*/
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
return pc.getUserName();
}
-
+
return mc.getManagedConnectionFactory().getUser();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
index dad1d77..482f332 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -24,148 +24,148 @@
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
*
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/08/23
+ * @author Evani Sai Surya Kiran
*/
public class XAResourceImpl implements XAResource {
XAResource xar;
ManagedConnection mc;
-
+
/**
* Constructor for XAResourceImpl
*
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
+ * @param xar <code>XAResource</code>
+ * @param mc <code>ManagedConnection</code>
*/
public XAResourceImpl(XAResource xar, ManagedConnection mc) {
this.xar = xar;
this.mc = mc;
}
-
+
/**
* Commit the global transaction specified by xid.
*
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
+ * @param xid A global transaction identifier
+ * @param onePhase If true, the resource manager should use a one-phase commit
+ * protocol to commit the work done on behalf of xid.
*/
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
+ mc.transactionCompleted();
xar.commit(xid, onePhase);
}
-
+
/**
* Ends the work performed on behalf of a transaction branch.
*
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
+ * @param xid A global transaction identifier that is the same as what
+ * was used previously in the start method.
+ * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
- //mc.transactionCompleted();
+ //mc.transactionCompleted();
}
-
+
/**
* Tell the resource manager to forget about a heuristically completed transaction branch.
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
-
+
/**
- * Obtain the current transaction timeout value set for this
+ * Obtain the current transaction timeout value set for this
* <code>XAResource</code> instance.
*
- * @return the transaction timeout value in seconds
+ * @return the transaction timeout value in seconds
*/
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
-
+
/**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
+ * This method is called to determine if the resource manager instance
+ * represented by the target object is the same as the resouce manager
* instance represented by the parameter xares.
*
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
+ * @param xares An <code>XAResource</code> object whose resource manager
+ * instance is to be compared with the resource
+ * @return true if it's the same RM instance; otherwise false.
*/
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
-
+
/**
- * Ask the resource manager to prepare for a transaction commit
+ * Ask the resource manager to prepare for a transaction commit
* of the transaction specified in xid.
*
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
+ * @param xid A global transaction identifier
+ * @return A value indicating the resource manager's vote on the
+ * outcome of the transaction. The possible values
+ * are: XA_RDONLY or XA_OK. If the resource manager wants
+ * to roll back the transaction, it should do so
+ * by raising an appropriate <code>XAException</code> in the prepare method.
*/
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
-
+
/**
* Obtain a list of prepared transaction branches from a resource manager.
*
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
+ * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
+ * must be used when no other flags are set in flags.
+ * @return The resource manager returns zero or more XIDs for the transaction
+ * branches that are currently in a prepared or heuristically
+ * completed state. If an error occurs during the operation, the resource
+ * manager should throw the appropriate <code>XAException</code>.
*/
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
-
+
/**
* Inform the resource manager to roll back work done on behalf of a transaction branch
*
- * @param xid A global transaction identifier
+ * @param xid A global transaction identifier
*/
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
+ //the transaction *actually* completes after the flow
+ //reaches here. the end() method might not really signal
+ //completion of transaction in case the transaction is
+ //suspended. In case of transaction suspension, the end
+ //method is still called by the transaction manager
mc.transactionCompleted();
xar.rollback(xid);
}
-
+
/**
* Set the current transaction timeout value for this <code>XAResource</code> instance.
*
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
+ * @param seconds the transaction timeout value in seconds.
+ * @return true if transaction timeout value is set successfully; otherwise false.
*/
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
-
+
/**
* Start work on behalf of a transaction branch specified in xid.
*
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
+ * @param xid A global transaction identifier to be associated with the resource
+ * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
public void start(Xid xid, int flags) throws XAException {
//GJCINT
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java
index ce321af..9e7f253 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java
@@ -26,8 +26,8 @@
/**
* Execute the methods based on the parameters.
*
- * @version 1.0, 02/07/23
- * @author Binod P.G
+ * @version 1.0, 02/07/23
+ * @author Binod P.G
*/
public class MethodExecutor implements java.io.Serializable{
@@ -39,130 +39,130 @@
/**
* Exceute a simple set Method.
*
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
+ * @param value Value to be set.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ if (value==null || value.trim().equals("")) {
+ return;
+ }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if ( parameters.length == 1) {
+ Object[] values = new Object[1];
+ values[0] = convertType(parameters[0], value);
+ method.invoke(obj, values);
+ }
+ } catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
- * Executes the method.
+ * Executes the method.
*
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
+ * @param method <code>Method</code> object.
+ * @param obj Object on which the method to be executed.
+ * @param values Parameter values for executing the method.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
+ try {
+ Class[] parameters = method.getParameterTypes();
+ if (values.size() != parameters.length) {
+ return;
+ }
+ Object[] actualValues = new Object[parameters.length];
+ for (int i =0; i<parameters.length ; i++) {
+ String val = (String) values.get(i);
+ if (val.trim().equals("NULL")) {
+ actualValues[i] = null;
+ } else {
+ actualValues[i] = convertType(parameters[i], val);
+ }
+ }
+ method.invoke(obj, actualValues);
+ }catch (IllegalAccessException iae) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ } catch (IllegalArgumentException ie) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
+ throw new ResourceException("Arguments are wrong for the method :" + method.getName());
+ } catch (InvocationTargetException ite) {
+ _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
+ throw new ResourceException("Access denied to execute the method :" + method.getName());
+ }
}
-
+
/**
* Converts the type from String to the Class type.
*
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
+ * @param type Class name to which the conversion is required.
+ * @param parameter String value to be converted.
+ * @return Converted value.
* @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
+ * a security violation.
*/
private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
+ try {
+ String typeName = type.getName();
+ if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
+ return parameter;
+ }
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
+ if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
+ return new Integer(parameter);
+ }
+
+ if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
+ return new Short(parameter);
+ }
+
+ if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
+ return new Byte(parameter);
+ }
+
+ if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
+ return new Long(parameter);
+ }
+
+ if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
+ return new Float(parameter);
+ }
+
+ if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
+ return new Double(parameter);
+ }
+
+ if (typeName.equals("java.math.BigDecimal")) {
+ return new java.math.BigDecimal(parameter);
+ }
+
+ if (typeName.equals("java.math.BigInteger")) {
+ return new java.math.BigInteger(parameter);
+ }
+
+ if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
+ return new Boolean(parameter);
+ }
+
+ return parameter;
+ } catch (NumberFormatException nfe) {
+ _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
+ throw new ResourceException(parameter+": Not a valid value for this method ");
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java
index fc149bf..f008e7f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java
@@ -29,36 +29,36 @@
/**
* SecurityUtils for Generic JDBC Connector.
*
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/22
+ * @author Evani Sai Surya Kiran
*/
public class SecurityUtils {
/**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
+ * This method returns the <code>PasswordCredential</code> object, given
+ * the <code>ManagedConnectionFactory</code>, subject and the
+ * <code>ConnectionRequestInfo</code>. It first checks if the
+ * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
* it constructs a <code>PasswordCredential</code> object with
* the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
+ * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
+ * is null, it retrieves the <code>PasswordCredential</code> objects from
* the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
+ * <code>PasswordCredential</code> object which contains a
* <code>ManagedConnectionFactory</code>, instance equivalent
* to the <code>ManagedConnectionFactory</code>, parameter.
*
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
+ * @param mcf <code>ManagedConnectionFactory</code>
+ * @param subject <code>Subject</code>
+ * @param info <code>ConnectionRequestInfo</code>
+ * @return <code>PasswordCredential</code>
+ * @throws <code>ResourceException</code> generic exception if operation fails
+ * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
*/
public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
- if (info == null) {
+ if (info == null) {
if (subject == null) {
return null;
} else {
@@ -89,14 +89,14 @@
return pc;
}
}
-
+
/**
* Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
+ *
+ * @param str1 <code>String</code>
+ * @param str2 <code>String</code>
+ * @return true if the two strings are equal
+ * false otherwise
*/
static private boolean isEqual(String str1, String str2) {
if (str1 == null) {
@@ -109,10 +109,10 @@
/**
* Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
*
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
+ * @param pC1 <code>PasswordCredential</code>
+ * @param pC2 <code>PasswordCredential</code>
+ * @return true if the two PasswordCredentials are equal
+ * false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
if (pC1 == pC2)
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml
index a55bbf0..f060e7d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml
@@ -19,7 +19,7 @@
<project name="jdbc_connector" basedir="." default="build">
<property name="pkg.dir" value="com/sun/gjc/util"/>
-
+
<target name="clean">
<ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
</target>
@@ -33,7 +33,7 @@
<jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
includes="${pkg.dir}/**/*"/>
</target>
-
+
<target name="compile13" depends="compile"/>
<target name="compile14" depends="compile"/>
@@ -44,5 +44,5 @@
<target name="build14" depends="compile14, package14"/>
<target name="build" depends="build13, build14"/>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
index 96e83a5..e14006e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
@@ -17,17 +17,17 @@
package samples.ejb.subclassing.servlet;
import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import jakarta.ejb.*;
+import jakarta.ejb.*;
-import samples.ejb.subclassing.ejb.*;
+import samples.ejb.subclassing.ejb.*;
import com.sun.jdbcra.spi.JdbcSetupAdmin;
-public class SimpleBankServlet extends HttpServlet {
+public class SimpleBankServlet extends HttpServlet {
InitialContext initContext = null;
@@ -44,14 +44,14 @@
doLookup();
}
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
doPost(request, response);
- }
+ }
- /** handles the HTTP POST operation **/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ /** handles the HTTP POST operation **/
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
System.out.println("SimpleBankServlet is executing");
String SSN = request.getParameter("SSN");
@@ -66,14 +66,14 @@
String zipCode = "";
long currentSavingsBalance = 0;
long currentCheckingBalance = 0;
-
+
String action = request.getParameter("action");
if (action.equals("Create"))
{
message = "Add Customer";
jsp = "/SimpleBankAdd.jsp";
}
- else if (action.equals("Add Customer"))
+ else if (action.equals("Add Customer"))
{
System.out.println("Add Customer button pressed");
SSN = request.getParameter("SSN");
@@ -90,7 +90,7 @@
customerSavings = customerSavingsHome.create(SSN, lastName, firstName, address1, address2, city, state, zipCode);
} catch (Exception e) {
System.out.println("Could not create the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Added.";
@@ -103,7 +103,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
jsp = "/SimpleBankEdit.jsp";
@@ -115,7 +115,7 @@
customerSavings = customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Delete Customer";
@@ -127,12 +127,12 @@
customerSavingsHome.findByPrimaryKey(SSN).remove();
} catch (Exception e) {
System.out.println("Could not delete the customer savings bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
message = "Customer Deleted.";
jsp = "/SimpleBankMessage.jsp";
- }
+ }
else if (action.equals("Update"))
@@ -142,7 +142,7 @@
customerSavings = (CustomerSavings)customerSavingsHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer savings remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -151,7 +151,7 @@
customerChecking = (CustomerChecking)customerCheckingHome.findByPrimaryKey(SSN);
} catch (Exception e) {
System.out.println("Could not find the customer checking remote bean : " + e.toString());
- throw new ServletException(e.getMessage());
+ throw new ServletException(e.getMessage());
//return;
}
@@ -211,9 +211,9 @@
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(jsp);
dispatcher.include(request, response);
return;
- }
+ }
- public void doLookup()
+ public void doLookup()
{
try {
initContext = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/sql/dropBankTables.sql b/appserver/tests/appserv-tests/devtests/connector/web2connector/sql/dropBankTables.sql
index df9df34..33a7069 100755
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/sql/dropBankTables.sql
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/sql/dropBankTables.sql
@@ -1 +1 @@
-drop table customer2;
+drop table customer2;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/DeploymentTest.java b/appserver/tests/appserv-tests/devtests/deployment/DeploymentTest.java
index f0a6593..a80c1fd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/DeploymentTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/DeploymentTest.java
@@ -40,16 +40,16 @@
* @author: tjquinn
*/
public abstract class DeploymentTest {
-
+
/** indicates if the test class has been initialized yet */
private boolean isInited = false;
-
+
/** ant project based on the build.xml in the current directory */
protected Project project;
-
+
/** the build.xml file in the current directory */
protected File buildFile;
-
+
/** Our current message output status. Follows Project.MSG_XXX. */
private int msgOutputLevel = Project.MSG_INFO;
@@ -57,7 +57,7 @@
private PrintStream out;
private PrintStream err;
private InputStream in;
-
+
/**
* The Ant logger class. There may be only one logger. It will have
* the right to use the 'out' PrintStream. The class must implements the
@@ -69,7 +69,7 @@
public DeploymentTest() {
init();
}
-
+
/**
*Reports if the class has been initialized or not.
*@return whether the initialized has occurred or not
@@ -77,7 +77,7 @@
protected boolean isInited() {
return isInited;
}
-
+
/**
*Prepare the callable ant environment for the test.
*/
@@ -87,12 +87,12 @@
err = System.err;
out = System.out;
in = System.in;
-
+
/*
*Use the build.xml in the current directory.
*/
buildFile = new File("build.xml");
-
+
/*
*To call into ant, create a new Project and prepare it for use.
*/
@@ -100,19 +100,19 @@
// msgOutputLevel = Project.MSG_VERBOSE;
project.addBuildListener(createLogger());
project.setBasedir(".");
-
+
project.init();
-
+
/*
*Set up the project to use the build.xml in the current directory.
*/
ProjectHelper helper = ProjectHelper.getProjectHelper();
helper.parse(project, buildFile);
-
+
isInited = true;
}
}
-
+
/**
*Assembles the required jar, war, ear files, etc.
*/
@@ -126,7 +126,7 @@
protected void deploy() {
project.executeTarget("deploy.asadmin");
}
-
+
/**
*Redeploys the application using asadmin.
*Removes app refs first, then deploys, then creates app refs.
@@ -147,7 +147,7 @@
*/
protected void clean() {
project.executeTarget("clean");
- }
+ }
/**
*Constructs an ExecTask instance, linked to the current project, for
@@ -160,7 +160,7 @@
protected ExecTask prepareRunExecTask() {
/*
This is the ant excerpt imitated by the exec task built by this method:
-
+
<exec executable="${APPCLIENT}" resultproperty="result" failonerror="false" output="${build}/${log.id}.output.log">
<arg line="-client ${archivedir}/${testName}Client.jar"/>
</exec>
@@ -173,7 +173,7 @@
exec.setTaskName("runclient");
return exec;
}
-
+
/**
*Prepares a command line argument object for use with the appclient
*exec task that uses the default set of arguments: the default
@@ -188,7 +188,7 @@
arg.setLine("-client " + archiveDir + "/" + testName + "Client.jar");
return arg;
}
-
+
/**
*Default implementation for executing the app client
*/
@@ -197,7 +197,7 @@
prepareRunCommandlineArg(exec);
exec.execute();
}
-
+
/**
*Prepares the test environment by cleaning the build directory
*and assembling the required jar files.
@@ -207,7 +207,7 @@
clean();
assemble();
}
-
+
/**
*Cleans up after all tests have run. In this case, undeploys
*the application.
@@ -218,7 +218,7 @@
}
// The following is inspired by the code in ant itself.
-
+
/**
* Creates the default build logger for sending build events to the ant
* log.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
index 08498d1..73c84d2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
@@ -21,8 +21,8 @@
import test.ejb.stateful.SFHello;
public class Client {
- private static @EJB SFHello sful1;
- private static @EJB(name="ejb/sfhello") SFHello sful2;
+ private static @EJB SFHello sful1;
+ private static @EJB(name="ejb/sfhello") SFHello sful2;
public void main(String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml
index 7605470..dd5e150 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml
@@ -23,24 +23,24 @@
<project name="ejb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <delete dir="${annotation.report.dir}"/>
+ <target name="private-all">
+ <delete dir="${annotation.report.dir}"/>
- <ant dir="ejb" target="private-all">
- <property name="build" value="${build}/ejb"/>
- </ant>
- <ant dir="appclient" target="private-all">
- <property name="build" value="${build}/appclient"/>
- </ant>
- <ant dir="web" target="private-all">
- <property name="build" value="${build}/web"/>
- </ant>
- <ant dir="inheritance" target="private-all">
- <property name="build" value="${build}/inheritance"/>
- </ant>
+ <ant dir="ejb" target="private-all">
+ <property name="build" value="${build}/ejb"/>
+ </ant>
+ <ant dir="appclient" target="private-all">
+ <property name="build" value="${build}/appclient"/>
+ </ant>
+ <ant dir="web" target="private-all">
+ <property name="build" value="${build}/web"/>
+ </ant>
+ <ant dir="inheritance" target="private-all">
+ <property name="build" value="${build}/inheritance"/>
+ </ant>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
index 550c6fb..c8bdc0a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
@@ -28,7 +28,7 @@
@AroundInvoke
Object aroundInvokeB(InvocationContext ctx) {
return null;
- }
+ }
@PreDestroy
void preDestroy() {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
index 4367939..c98feba 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
@@ -31,8 +31,8 @@
@DeclareRoles({"staff"})
public class ServletTest {
- private @EJB SFHello sful1;
- private @EJB(name="ejb/sfhello") SFHello sful2;
+ private @EJB SFHello sful1;
+ private @EJB(name="ejb/sfhello") SFHello sful2;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml
index f71b3ad..8be4969 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml
@@ -24,15 +24,15 @@
<project name="autodeploy" default="all" basedir=".">
- &commonBuild;
-
+ &commonBuild;
+
<property name="autodeploy.util.build" value="${build}/util"/>
<property name="autodeploy.archive.name" value="servletonly.war"/>
<property name="autodeploy.archive" value="../../build/war/servletonly/${autodeploy.archive.name}"/>
-
+
&autodeployUtil;
- <target name="private-all">
+ <target name="private-all">
<!--
Build the common tools used by autodeploy tests.
@@ -47,7 +47,7 @@
<ant dir="../war/servletonly" target="assemble">
<property name="build" value="${build}/war/servletonly"/>
</ant>
-
+
<ant dir="simple" target="private-all">
<property name="build" value="${build}/simple"/>
</ant>
@@ -55,14 +55,14 @@
<ant dir="slowCopy" target="private-all">
<property name="build" value="${build}/slowCopy"/>
</ant>
-
+
<!-- commented out because log search on Linux does not work as expected -->
<!--
<ant dir="withEJB" target="private-all">
<property name="build" value="${build}/withEJB"/>
</ant>
-->
-
- </target>
+
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml
index 8da3873..0d42a90 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml
@@ -22,38 +22,38 @@
<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
]>
<!--
- This makes sure that redeployment of an autodeployed app works. Specifically,
+ This makes sure that redeployment of an autodeployed app works. Specifically,
it tests that the validations (governing app refcs in particular) pass as
the autodeployed app is removed and then redeployed.
-->
-
+
<project name="autodeploy-simple" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
&autodeployUtil;
<property name="testName" value="simpleautodeploy"/>
-
+
<target name="prepare" depends="init">
<property name="result.property.file" value="${build}/result.properties"/>
-<echo>in simple/build.xml and build is ${build}</echo>
+<echo>in simple/build.xml and build is ${build}</echo>
<mkdir dir="${build}" />
</target>
-
+
<target name="build" depends="prepare">
-
+
<echo>Using previously-built ${autodeploy.archive}</echo>
<!--
Some earlier tests should have run already, so the app we use for autodeploy testing
should already be in place in the build directory.
-->
</target>
-
-
-
+
+
+
<target name="private-all" depends="build">
-
+
<antcall target="declare-test">
<param name="description" value="autodeploy/simple Test autodeploy, auto-redeploy, and autoundeploy"/>
</antcall>
@@ -63,7 +63,7 @@
record the results of the autodeploy directory monitoring Java class.
-->
<delete file="${result.property.file}" quiet="true"/>
-
+
<!--
Do the auto-deployment.
-->
@@ -75,7 +75,7 @@
</antcall>
<!--
- Redeploy the archive. This used to trigger an error because the
+ Redeploy the archive. This used to trigger an error because the
app ref was not removed before the app was removed.
-->
<antcall target="deploy.autodeploy">
@@ -113,7 +113,7 @@
<equals arg1="${simple.autodeploy.undeployResult}" arg2="0"/>
</and>
</condition>
-
+
<!--
If the property "result" was not set by the "condition" task just above then something
went wrong and we set result to 1 now.
@@ -123,12 +123,12 @@
<isset property="result"/>
</not>
</condition>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/output.log"/>
</antcall>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml
index 37170d2..e07d339 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml
@@ -22,21 +22,21 @@
<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
]>
<!--
- Note that this currently assumes that the ear/earwithejb and ejb/statelesshello projects have run to build
+ Note that this currently assumes that the ear/earwithejb and ejb/statelesshello projects have run to build
the ear used for this test.
Also note that this test expects the 'grep' command to be present in the operating environment.
- This is fine on Solaris and Linux systems, and should be fine on Windows systems prepared
- according to the requirements for building the app server.
+ This is fine on Solaris and Linux systems, and should be fine on Windows systems prepared
+ according to the requirements for building the app server.
-->
-
+
<project name="autodeploy-slowcopy" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
&autodeployUtil;
<property name="testName" value="slowcopy"/>
-
+
<target name="prepare" depends="init">
<property name="inputArchive" value="${autodeploy.archive}"/>
<property name="outputArchive" value="${autodeploy.dir}/${autodeploy.archive.name}"/>
@@ -47,41 +47,41 @@
interval with which the autodeploy thread rechecks the files
in the autodeploy directory. By using a setting significantly
longer than the 2-second autodeploy period, we test two code paths in the
- autodeploy code.
-
+ autodeploy code.
+
One code path suppresses a retry of the file
if it has failed to open successfully as an archive previously
and has grown in size since the last check of the file. The
assumption in this case is that, since the file has grown since the
- last check, it might continue to grow and so we decide not to
+ last check, it might continue to grow and so we decide not to
retry it at that moment.
-
+
The other code path detects runs when the
size has not changed since the last check. This set of logic
then tries to open the file as an archive
again. (Here, the assumption is that since the file did
not grow since the previous check, it might be done growing and
- therefore it makes sense to try to open it again now).
- For most of the iterations, this code path finds that the archive
+ therefore it makes sense to try to open it again now).
+ For most of the iterations, this code path finds that the archive
still will not open correctly - because the slow copy is still
in progress - and does not further work with the file in the
current iteration but leaves the file in the map of files to be
- monitored.
-
+ monitored.
+
At last, when the copy completes, an iteration discovers that
the file size has been stable since the last time through and
the attempt to open the file as an archive succeeds. The file
is then autodeployed normally.
-->
<property name="slowcopy.delay" value="4000"/>
-
+
<property name="result.property.file" value="${build}/result.properties"/>
-
+
<mkdir dir="${build}" />
</target>
-
+
<target name="build" depends="prepare">
-
+
<echo>Using previously-built ${inputArchive}</echo>
<!--
Some earlier tests should have run already, so the app we use for autodeploy testing
@@ -89,9 +89,9 @@
-->
</target>
-
+
<target name="private-all" depends="build">
-
+
<antcall target="declare-test">
<param name="description" value="autodeploy/slow Test autodeploy with slowly-copied file"/>
</antcall>
@@ -101,11 +101,11 @@
record the results of the autodeploy directory monitoring Java class.
-->
<delete file="${result.property.file}" quiet="true"/>
-
+
<tstamp prefix="slowcopy">
<format property="NOW" pattern="${dateFormat}"/>
</tstamp>
-
+
<!--
Do the auto-deployment but use the special tool that copies slowly.
-->
@@ -126,11 +126,11 @@
<classpath refid="autodeploy.compile.classpath"/>
</javaWithResult>
-
+
<antcall target="useMonitorToWaitForAutodeployCompletion">
<param name="log.id" value="2"/>
</antcall>
-
+
<!--
Now undeploy the app.
-->
@@ -159,7 +159,7 @@
<equals arg1="${slow.autodeploy.undeployResult}" arg2="0"/>
</and>
</condition>
-
+
<!--
If the property "result" was not set by the "condition" task just above then something
went wrong and we set result to 1 now.
@@ -169,14 +169,14 @@
<isset property="result"/>
</not>
</condition>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/output.log"/>
</antcall>
</target>
-
+
<target name="useMonitorToWaitForAutodeployCompletion">
<javaWithResult
fork="true"
@@ -195,17 +195,17 @@
<arg value="${dateFormat}"/>
<arg value="${slowcopy.NOW}"/>
</javaWithResult>
-
+
<!--
- The result property name used in the next task is an argument to the called target.
+ The result property name used in the next task is an argument to the called target.
Note that the echo is a little oddly formatted. The </echo> is on a line by itself and left-justified so
that the output to the file being written will reside on a line by itself. The
left-justification is not really needed but the properties file looks a bit nicer
- if you open it in an editor. This is because the next line in the properties file being
+ if you open it in an editor. This is because the next line in the properties file being
written is indented as far as the </echo> is indented here in the build.xml file.
-->
<echo file="${result.property.file}" append="true">${resultPropertyName}=${autodeployResult}
-</echo>
+</echo>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java
index cf501b2..5320364 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/AutoDeployMonitor.java
@@ -45,31 +45,31 @@
* @author tjquinn
*/
public class AutoDeployMonitor {
-
+
private static boolean DEBUG = Boolean.getBoolean("monitor.debug");
-
+
private static int ITERATION_LIMIT = Integer.getInteger("monitor.iterationLimit", 60 * 2 /* default = two minutes */).intValue();
-
+
private String archiveName = null;
-
+
// private String autodeployDirSpec = null;
-
+
private File autodeployDir = null;
// private String timestampFormat = null;
-
+
// private String timestampString = null;
-
+
private long timestamp;
-
+
private Date startTime = null;
-
+
private final static String LINE_SEP = System.getProperty("line.separator");
-
+
/** Creates a new instance of AutoDeployer */
public AutoDeployMonitor() {
}
-
+
/**
* @param args the command line arguments
*/
@@ -83,7 +83,7 @@
usage();
System.exit(1);
}
-
+
archiveName = args[0];
String autodeployDirSpec = args[1];
String timestampFormat = args[2];
@@ -95,21 +95,21 @@
debug("Autodeploy directory: " + autodeployDir.getAbsolutePath());
StringBuffer result = new StringBuffer();
-
+
/*
*Check auto-deploy directory.
*/
if ( ! autodeployDir.exists()) {
result.append(LINE_SEP).append("Autodeploy directory " + autodeployDir.getAbsolutePath() + " does not exist but should.");
}
-
+
/*
*Check archive file name.
*/
if (archiveName.length() == 0) {
result.append(LINE_SEP).append("Archive file name must not be empty but is.");
}
-
+
/*
*Check the timestamp format and value.
*/
@@ -122,12 +122,12 @@
} catch (ParseException pe) {
result.append(LINE_SEP).append("Could not interpret timestamp " + timestampString + " using format " + timestampFormat).append(LINE_SEP).append(" ").append(pe.getMessage());
}
-
+
if (result.length() > 0) {
throw new IllegalArgumentException(result.toString());
}
}
-
+
private int run(String[] args) {
/*
*The calling script should pass these command line arguments:
@@ -141,9 +141,9 @@
try {
processArguments(args);
-
+
/*
- *The timestamp handling allows the logic below to identify a marker file (..._deployed,
+ *The timestamp handling allows the logic below to identify a marker file (..._deployed,
*..._undeployed, ..._deployFailed, ..._undeployFailed) that was created after the
*archive was deposited into (for autodeploy) or removed from (for autoundeploy) the
*autodeploy directory. We need to do this to make sure we do not accidentally take
@@ -155,16 +155,16 @@
*For auto-deploy, the archive will have just been copied into the autodeploy directory.
*For auto-undeploy, the archive will have just been deleted from there. The file filter
*below uses both the file name and also a timestamp to make sure it accepts
- *marker files created after the archive itself.
+ *marker files created after the archive itself.
*
*Note that the following is both a declaration of the filter and its initialization by
*invoking its init method.
*/
- FileFilter filter = new FileFilter () {
+ FileFilter filter = new FileFilter () {
private long timestamp;
- private String archiveName = null;
+ private String archiveName = null;
public boolean accept(File candidateFile) {
/*
@@ -176,7 +176,7 @@
long candidateTimestamp = candidateFile.lastModified();
String candidateNameAndType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf(File.separator) + 1);
String candidateType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf('.') + 1);
-
+
boolean answer = (candidateTimestamp > this.timestamp)
&& (candidateNameAndType.equals(archiveName + AutoDeployConstants.DEPLOYED) ||
candidateNameAndType.equals(archiveName + AutoDeployConstants.UNDEPLOYED) ||
@@ -196,11 +196,11 @@
return this;
}
}.init(archiveName, timestamp);
-
+
File [] matches = null;
/*
- *Begin waiting for a new marker file to appear in the autodeploy directory. Don't wait longer than
+ *Begin waiting for a new marker file to appear in the autodeploy directory. Don't wait longer than
*two minutes (by default) in case there is some problem.
*/
int iterationCount = 0;
@@ -214,7 +214,7 @@
matches = autodeployDir.listFiles(filter);
} while ( (matches.length == 0) && (iterationCount++ < ITERATION_LIMIT));
-
+
/*
*Return 0 if the marker file found ends with _deployed, 1 if the marker ends with
*_deployFailed, and -1 otherwise.
@@ -243,7 +243,7 @@
return -1;
}
}
-
+
private void usage() {
System.err.println("Usage:");
System.err.println(" autodeploy.loader.client.AutoDeployMonitor <archive-name> <autodeploy-directory> <SimpleDateFormat-pattern-for-timestamp> <timestamp-value>");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java
index 924ab31..99fe50e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/SlowCopy.java
@@ -32,7 +32,7 @@
/**
*Provides a way to test autodeployer's behavior when an autodeployed file is
- *copied into the autodeploy directory slowly.
+ *copied into the autodeploy directory slowly.
*
*Usage:
*
@@ -49,17 +49,17 @@
* @author tjquinn
*/
public class SlowCopy {
-
+
/** Creates a new instance of SlowCopy */
public SlowCopy() {
}
-
+
/** default delay between successive writes of data to the output file */
private static final long DEFAULT_DELAY = 200; // milliseconds
-
+
/** size of read and write buffer */
private static final int BUFFER_SIZE = 1024;
-
+
public static void main(String[] args) {
try {
new SlowCopy().run(args);
@@ -69,22 +69,22 @@
System.exit(1);
}
}
-
+
private void run(String [] args) throws FileNotFoundException, IOException, InterruptedException {
System.out.println(Arrays.toString(args));
if (args.length < 3) {
throw new IllegalArgumentException("Command line args must specify prompt/timed, the original file, and the target file");
}
-
+
/*
- *Get delay from default and override the default if the delay is
+ *Get delay from default and override the default if the delay is
*specified on the command line.
*/
long delay = DEFAULT_DELAY;
if (args.length > 3) {
delay = Integer.decode(args[3]);
}
-
+
/*
*For interactive use, the tool would like to let the user press a
*key each time a read/write is to occur. This doesn't yet work and
@@ -93,7 +93,7 @@
boolean usePromptDelay = args[0].equalsIgnoreCase("prompt");
File oldF = new File(args[1]);
File newF = new File(args[2]);
-
+
System.out.println("Slow copy starting\n" +
" mode: " + args[0] + "\n" +
" input file: " + oldF.getAbsolutePath() + "\n" +
@@ -106,15 +106,15 @@
FileInputStream fis = new FileInputStream(oldF);
byte [] data = new byte [BUFFER_SIZE];
int bytesRead;
-
+
Scanner scanner = null;
boolean continuePrompting = usePromptDelay;
String lineSep = System.getProperty("line.separator");
-
+
if (usePromptDelay) {
scanner = new Scanner(System.in);
}
-
+
int totalBytesRead = 0;
/*
*Repeat the cycle of reading from the input file and writing to the
@@ -140,13 +140,13 @@
}
}
System.out.println("Finished copying " + totalBytesRead + " bytes at " + new Date().toString());
-
+
} finally {
if (fos != null) {
fos.close();
fos = null;
}
- if (fis != null) {
+ if (fis != null) {
fis.close();
fis = null;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml
index 5f86041..53200c3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml
@@ -23,17 +23,17 @@
]>
<project name="autodeploy-util" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
&autodeployUtil;
<target name="prepare" depends="init">
<mkdir dir="${build}" />
</target>
-
+
<target name="build" depends="compile">
-
+
</target>
-
+
<target name="compile" depends="prepare">
<javac srcdir="."
destdir="${build}"
@@ -46,5 +46,5 @@
<target name="private-all" depends="build">
<echo>Autodeploy util common tools are ready</echo>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml
index f5b39f5..f528529 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml
@@ -20,23 +20,23 @@
This file should be included by all autodeployment build.xml files and
defines properties and tasks used by multiple auto-deploy tests.
-->
-
+
<property name="dateFormat" value="yyyy-MM-dd-HH:mm:ss"/>
<property name="autodeploy.dir" value="${env.S1AS_HOME}/domains/domain1/autodeploy"/>
<property name="autodeploy.util.build" value="${testsRoot}/build/autodeploy/util"/>
-
+
<path id="autodeploy.compile.classpath">
<pathelement location="${inst}/lib/javaee.jar"/>
<pathelement location="${java.home}/lib/tools.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/deployment-autodeploy.jar"/>
<pathelement location="${autodeploy.util.build}"/>
- </path>
+ </path>
<!--
This target runs a Java class that watches the app server's autodeploy directory and detects
when the app server has deployed or undeployed the app (or has reported a failure to do so) by observing
- when the marker files appear in the directory.
-
+ when the marker files appear in the directory.
+
The target records its results in a temporary properties file in the ${build} directory.
This provides a simple way (relatively simple, at least) to use the same target more than once
and store different result values in a way that can be retrieved and used from the main
@@ -64,39 +64,39 @@
-->
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<!--
- The result property name used in the next task is an argument to the called target.
+ The result property name used in the next task is an argument to the called target.
Note that the echo is a little oddly formatted. The </echo> is on a line by itself and left-justified so
that the output to the file being written will reside on a line by itself. The
left-justification is not really needed but the properties file looks a bit nicer
- if you open it in an editor. This is because the next line in the properties file being
+ if you open it in an editor. This is because the next line in the properties file being
written is indented as far as the </echo> is indented here in the build.xml file.
-->
<echo file="${result.property.file}" append="true">${resultPropertyName}=${autodeployResult}
</echo>
-
+
</target>
-
+
<target name="deploy.autodeploy">
-
+
<!--
- To monitor auto-deployment or auto-undeployment, we start by getting the current time.
- Then we copy the archive file into the autodeploy directory (for auto-deploy) or delete
+ To monitor auto-deployment or auto-undeployment, we start by getting the current time.
+ Then we copy the archive file into the autodeploy directory (for auto-deploy) or delete
it (for auto-undeploy). All marker files created by the server during auto-deployment of
the newly-copied archive file will have later timestamps than the timestamp just created.
- There could be earlier marker files for the same archive in the directory and the monitor
+ There could be earlier marker files for the same archive in the directory and the monitor
wants to ignore those, which is why we get the current time and pass it to the monitor.
-
+
The monitor will check for marker files for the copied archive file
- and whose last modification time are after the current timestamp, returning 0 if the
- auto-deployer creates a _deployed or _undeployed file, 1 if it creates a _deploy_failed
+ and whose last modification time are after the current timestamp, returning 0 if the
+ auto-deployer creates a _deployed or _undeployed file, 1 if it creates a _deploy_failed
or _undeploy_failed file, and -1 if it recognized no marker file.
-->
<tstamp prefix="deploy">
<format property="NOW" pattern="${dateFormat}"/>
</tstamp>
-
+
<!-- Pause; some file systems record file rev date/time to 2-second precision -->
<sleep seconds="2"/>
@@ -104,7 +104,7 @@
Trigger the auto-deploy.
-->
<copy file="${archive.file}" todir="${autodeploy.dir}" overwrite="true"/>
-
+
<condition property="log.id" value="1">
<not>
<isset property="log.id"/>
@@ -120,11 +120,11 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="deploy.autoundeploy">
-
+
<!--
- This target works very much like the deploy.autodeploy target except that instead of
+ This target works very much like the deploy.autodeploy target except that instead of
copying the archive into the autodeploy directory it deletes the previously copied
archive from that directory.
-->
@@ -141,7 +141,7 @@
<delete quiet="true">
<fileset dir="${autodeploy.dir}" includes="${archive.name}"/>
</delete>
-
+
<condition property="log.id" value="2">
<not>
<isset property="log.id"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java
index cb5c827..c388ed6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/AutoDeployMonitor.java
@@ -45,31 +45,31 @@
* @author tjquinn
*/
public class AutoDeployMonitor {
-
+
private static boolean DEBUG = Boolean.getBoolean("monitor.debug");
-
+
private static int ITERATION_LIMIT = Integer.getInteger("monitor.iterationLimit", 60 * 2 /* default = two minutes */).intValue();
-
+
private String archiveName = null;
-
+
// private String autodeployDirSpec = null;
-
+
private File autodeployDir = null;
// private String timestampFormat = null;
-
+
// private String timestampString = null;
-
+
private long timestamp;
-
+
private Date startTime = null;
-
+
private final static String LINE_SEP = System.getProperty("line.separator");
-
+
/** Creates a new instance of AutoDeployer */
public AutoDeployMonitor() {
}
-
+
/**
* @param args the command line arguments
*/
@@ -83,7 +83,7 @@
usage();
System.exit(1);
}
-
+
archiveName = args[0];
String autodeployDirSpec = args[1];
String timestampFormat = args[2];
@@ -95,21 +95,21 @@
debug("Autodeploy directory: " + autodeployDir.getAbsolutePath());
StringBuffer result = new StringBuffer();
-
+
/*
*Check auto-deploy directory.
*/
if ( ! autodeployDir.exists()) {
result.append(LINE_SEP).append("Autodeploy directory " + autodeployDir.getAbsolutePath() + " does not exist but should.");
}
-
+
/*
*Check archive file name.
*/
if (archiveName.length() == 0) {
result.append(LINE_SEP).append("Archive file name must not be empty but is.");
}
-
+
/*
*Check the timestamp format and value.
*/
@@ -122,12 +122,12 @@
} catch (ParseException pe) {
result.append(LINE_SEP).append("Could not interpret timestamp " + timestampString + " using format " + timestampFormat).append(LINE_SEP).append(" ").append(pe.getMessage());
}
-
+
if (result.length() > 0) {
throw new IllegalArgumentException(result.toString());
}
}
-
+
private int run(String[] args) {
/*
*The calling script should pass these command line arguments:
@@ -141,9 +141,9 @@
try {
processArguments(args);
-
+
/*
- *The timestamp handling allows the logic below to identify a marker file (..._deployed,
+ *The timestamp handling allows the logic below to identify a marker file (..._deployed,
*..._undeployed, ..._deployFailed, ..._undeployFailed) that was created after the
*archive was deposited into (for autodeploy) or removed from (for autoundeploy) the
*autodeploy directory. We need to do this to make sure we do not accidentally take
@@ -155,16 +155,16 @@
*For auto-deploy, the archive will have just been copied into the autodeploy directory.
*For auto-undeploy, the archive will have just been deleted from there. The file filter
*below uses both the file name and also a timestamp to make sure it accepts
- *marker files created after the archive itself.
+ *marker files created after the archive itself.
*
*Note that the following is both a declaration of the filter and its initialization by
*invoking its init method.
*/
- FileFilter filter = new FileFilter () {
+ FileFilter filter = new FileFilter () {
private long timestamp;
- private String archiveName = null;
+ private String archiveName = null;
public boolean accept(File candidateFile) {
/*
@@ -176,7 +176,7 @@
long candidateTimestamp = candidateFile.lastModified();
String candidateNameAndType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf(File.separator) + 1);
String candidateType = candidateFileSpec.substring(candidateFileSpec.lastIndexOf('.') + 1);
-
+
boolean answer = (candidateTimestamp > this.timestamp)
&& (candidateNameAndType.equals(archiveName + AutoDeployConstants.DEPLOYED) ||
candidateNameAndType.equals(archiveName + AutoDeployConstants.UNDEPLOYED) ||
@@ -196,11 +196,11 @@
return this;
}
}.init(archiveName, timestamp);
-
+
File [] matches = null;
/*
- *Begin waiting for a new marker file to appear in the autodeploy directory. Don't wait longer than
+ *Begin waiting for a new marker file to appear in the autodeploy directory. Don't wait longer than
*two minutes (by default) in case there is some problem.
*/
int iterationCount = 0;
@@ -214,7 +214,7 @@
matches = autodeployDir.listFiles(filter);
} while ( (matches.length == 0) && (iterationCount < ITERATION_LIMIT));
-
+
/*
*Return 0 if the marker file found ends with _deployed, 1 if the marker ends with
*_deployFailed, and -1 otherwise.
@@ -243,7 +243,7 @@
return -1;
}
}
-
+
private void usage() {
System.err.println("Usage:");
System.err.println(" autodeploy.loader.client.AutoDeployMonitor <archive-name> <autodeploy-directory> <SimpleDateFormat-pattern-for-timestamp> <timestamp-value>");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml
index c5e0e84..f91c94b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml
@@ -22,36 +22,36 @@
]>
<!--
- Note that this currently assumes that the ear/earwithejb and ejb/statelesshello projects have run to build
+ Note that this currently assumes that the ear/earwithejb and ejb/statelesshello projects have run to build
the ear used for this test.
Also note that this test expects the 'grep' command to be present in the operating environment.
- This is fine on Solaris and Linux systems, and should be fine on Windows systems prepared
- according to the requirements for building the app server.
+ This is fine on Solaris and Linux systems, and should be fine on Windows systems prepared
+ according to the requirements for building the app server.
-->
-
+
<project name="autodeployWithEJB" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="withEJB"/>
<property name="dateFormat" value="yyyy-MM-dd-HH:mm:ss.SSS"/>
<property name="archivedir" value="${build}/archives"/>
-
+
<!--
The following property defines the exception text that appears in the server.log file if
the bug is present.
-->
<property name="exceptionText" value="EJBClassLoader instance that has already been shutdown"/>
-
+
<target name="prepare" depends="init">
<property name="archiveName" value="earwithejb.ear"/>
<property name="all.ear" value="${archivedir}/${archiveName}"/>
<property name="server.log.file" value="${env.S1AS_HOME}/domains/domain1/logs/server.log"/>
<property name="autodeploy.dir" value="${env.S1AS_HOME}/domains/domain1/autodeploy"/>
<property name="result.property.file" value="${build}/result.properties"/>
-
-
+
+
<mkdir dir="${build}" />
<path id="test.compile.classpath">
<pathelement location="${inst}/lib/j2ee.jar"/>
@@ -60,15 +60,15 @@
<pathelement location="${build}"/>
</path>
</target>
-
+
<target name="build" depends="prepare">
-
+
<echo>Building ear</echo>
<!--
The earlier tests should have run already, so the app we use for autodeploy testing
should already be in place.
-->
-
+
<!--
<ant dir="${testsRoot}/ejb/statelesshello" target="assemble">
<property name="build" value="${testsRoot}/build/ejb/statelesshello"/>
@@ -78,7 +78,7 @@
</ant>
-->
</target>
-
+
<target name="compile" depends="prepare">
<javac srcdir="."
destdir="${build}"
@@ -87,12 +87,12 @@
<classpath refid="test.compile.classpath"/>
</javac>
</target>
-
+
<!--
This target runs a Java class that watches the app server's autodeploy directory and detects
when the app server has deployed or undeployed the app (or has reported a failure to do so) by observing
- when the marker files appear in the directory.
-
+ when the marker files appear in the directory.
+
The target records its results in a temporary properties file in the ${build} directory.
This provides a simple way (relatively simple, at least) to use the same target more than once
and store different result values in a way that can be retrieved and used from the main
@@ -117,44 +117,44 @@
</classpath>
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<!--
- The result property name used in the next task is an argument to the called target.
+ The result property name used in the next task is an argument to the called target.
Note that the echo is a little oddly formatted. The </echo> is on a line by itself and left-justified so
that the output to the file being written will reside on a line by itself. The
left-justification is not really needed but the properties file looks a bit nicer
- if you open it in an editor. This is because the next line in the properties file being
+ if you open it in an editor. This is because the next line in the properties file being
written is indented as far as the </echo> is indented here in the build.xml file.
-->
<echo file="${result.property.file}" append="true">${resultPropertyName}=${autodeployResult}
</echo>
-
+
</target>
-
+
<target name="deploy.autodeploy">
-
+
<!--
- To monitor auto-deployment or auto-undeployment, we start by getting the current time.
- Then we copy the archive file into the autodeploy directory (for auto-deploy) or delete
+ To monitor auto-deployment or auto-undeployment, we start by getting the current time.
+ Then we copy the archive file into the autodeploy directory (for auto-deploy) or delete
it (for auto-undeploy). All marker files created by the server during auto-deployment of
the newly-copied archive file will have later timestamps than the timestamp just created.
- There could be earlier marker files for the same archive in the directory and the monitor
+ There could be earlier marker files for the same archive in the directory and the monitor
wants to ignore those, which is why we get the current time and pass it to the monitor.
-
+
The monitor will check for marker files for the copied archive file
- and whose last modification time are after the current timestamp, returning 0 if the
- auto-deployer creates a _deployed or _undeployed file, 1 if it creates a _deploy_failed
+ and whose last modification time are after the current timestamp, returning 0 if the
+ auto-deployer creates a _deployed or _undeployed file, 1 if it creates a _deploy_failed
or _undeploy_failed file, and -1 if it recognized no marker file.
-->
<tstamp prefix="deploy">
<format property="NOW" pattern="${dateFormat}"/>
</tstamp>
-
+
<!--
Trigger the auto-deploy.
-->
<copy file="${archive.file}" todir="${autodeploy.dir}" overwrite="true"/>
-
+
<!--
Use the monitor to detect when the auto-deploy has completed.
-->
@@ -165,25 +165,25 @@
<param name="log.id" value="1"/>
</antcall>
</target>
-
+
<target name="deploy.autoundeploy">
-
+
<!--
- This target works very much like the deploy.autodeploy target except that instead of
+ This target works very much like the deploy.autodeploy target except that instead of
copying the archive into the autodeploy directory it deletes the previously copied
archive from that directory.
-->
<tstamp prefix="undeploy">
<format property="NOW" pattern="${dateFormat}"/>
</tstamp>
-
+
<!--
Trigger auto-undeploy by deleting the file.
-->
<delete quiet="true">
<fileset dir="${autodeploy.dir}" includes="${archiveName}"/>
</delete>
-
+
<echo>Waiting for autoundeployment to complete...</echo>
<antcall target="runAutoDeployMonitor">
<param name="arg.list" value="${archiveName} ${autodeploy.dir} ${dateFormat} ${undeploy.NOW}"/>
@@ -197,14 +197,14 @@
See if the exception text appears in the server.log file. This step assumes the operating
environment supports the grep command. This should be fine for Solaris and Linux systems
and for Windows systems that support building the product.
-
- The output from the grep is saved into a property (grepOutput),then the property is written
+
+ The output from the grep is saved into a property (grepOutput),then the property is written
into a file. The file to be written (output.file) is also provided as an argument so this
- target can be called from different places and the results stored in different files for
+ target can be called from different places and the results stored in different files for
later comparison.
-->
- <exec
- executable="grep"
+ <exec
+ executable="grep"
resultproperty="grepResult"
outputproperty="grepOutput"
>
@@ -220,26 +220,26 @@
<condition property="statusMessage" value="The preceding Result: 1 message is expected; it means grep did not find the error string.">
<equals arg1="${grepResult}" arg2="1"/>
</condition>
-
+
<property name="statusMessage" value=""/>
<echo>${statusMessage}</echo>
-
+
<echo file="${output.file}">${grepOutput}</echo>
<echo file="${result.property.file}" append="true">${resultPropertyName}=${grepResult}
</echo>
</target>
-
+
<target name="checkForRegression" if="fileMatchError">
<echo>${fileMatchError}
The string "${exceptionText}" was found, implying that the bug is present.
</echo>
- </target>
-
+ </target>
+
<target name="private-all" depends="compile">
-
+
<antcall target="build"/>
-
+
<antcall target="declare-test">
<param name="description" value="autodeploy/loadertest Test autodeploy and context class loader"/>
</antcall>
@@ -249,7 +249,7 @@
record the results of the autodeploy directory monitoring Java class.
-->
<delete file="${result.property.file}" quiet="true"/>
-
+
<!--
Do the auto-deployment.
-->
@@ -264,7 +264,7 @@
We do this now, before undeploying, and capture the output in a file. Then we'll
do the same thing after undeploying, capturing that output to s separate file. We
hope the two output files will be the same, meaning that no new exceptions were
- thrown as a result of the undeploy. If the bug has resurfaced, then the second
+ thrown as a result of the undeploy. If the bug has resurfaced, then the second
output file will contain an additional exception as compared to the first output file.
-->
<antcall target="searchForException">
@@ -300,7 +300,7 @@
<param name="resultPropertyName" value="secondSearchResult"/>
<param name="output.file" value="${build}/after2nddeploy.log"/>
</antcall>
-
+
<!--
Autoundeploy the app once more just to clean up.
-->
@@ -326,10 +326,10 @@
<filesmatch file1="${build}/before2nddeploy.log" file2="${build}/after2nddeploy.log"/>
</not>
</condition>
-
+
<!--
Decide whether the test was successful or not. Make sure that the deploy and
- undeploy results are good and that the grep for the error string of the server.log
+ undeploy results are good and that the grep for the error string of the server.log
file was the same before and after the second autodeployment. We don't really care
if the second undeploy worked or not so we don't check its result property here.
-->
@@ -343,9 +343,9 @@
</not>
</and>
</condition>
-
+
<antcall target="checkForRegression"/>
-
+
<!--
If the property "result" was not set by the "condition" task just above then something
went wrong and we set result to 1 now. Normally checkForRegression will set the value to 0 or 1.
@@ -355,12 +355,12 @@
<isset property="result"/>
</not>
</condition>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/output.log"/>
</antcall>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/build-ng.xml b/appserver/tests/appserv-tests/devtests/deployment/build-ng.xml
index 1e82f2f..bc42ba5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/build-ng.xml
@@ -20,55 +20,55 @@
<!--
This ant script runs TestNG to manage tests in a GlassFish deployment devtest
directory. Note that this script expects:
-
+
- Environment variables:
APS_HOME should point to the GlassFish appserv-tests directory
JAVA_HOME should point to the JDK to be used for testing
-
- - The TestNG jar file be placed at ${APS_HOME}/lib with the name testng.jar.
- In the near future the TestNG jar may become available from the GlassFish
+
+ - The TestNG jar file be placed at ${APS_HOME}/lib with the name testng.jar.
+ In the near future the TestNG jar may become available from the GlassFish
site. Until then testers who wish to use it should download it themselves
- from http://www.testng.org and copy the jar file from that download as
+ from http://www.testng.org and copy the jar file from that download as
testng.jar into ${APS_HOME}/lib.
-
+
- One or more Java classes of any name exist at the lowest-level test
- directory. (For example, such a directory is ejb30/ear/session.) These
+ directory. (For example, such a directory is ejb30/ear/session.) These
classes are required to use the TestNG annotations to identify and
describe the test methods to be run. They must also (temporarily at least)
reside in a package that ends with .testng so the testng task below can
efficiently select which .class files to check for TestNG annotations.
- Such classes may extend DeploymentTest (in the GlassFish repository at
- ${APS_HOME}/devtests/deployment/DeploymentTest.java) if they wish but
+ Such classes may extend DeploymentTest (in the GlassFish repository at
+ ${APS_HOME}/devtests/deployment/DeploymentTest.java) if they wish but
they are not required to do so.
-
+
To use TestNG to run such tests, cd to the lower-level test directory
- of interest and invoke ant specifying this file.
-
- Note that this script and the test classes are fairly simple and will
- likely evolve and improve over time.
-
+ of interest and invoke ant specifying this file.
+
+ Note that this script and the test classes are fairly simple and will
+ likely evolve and improve over time.
+
-->
<project default="run-test" basedir=".">
<property environment="envng"/>
-
- <!--
+
+ <!--
Currently, deployment devtests user their own build area.
-->
<property name="depl.devtests.home" value="${envng.APS_HOME}/devtests/deployment"/>
<property name="depl.build.dir" value="${depl.devtests.home}/build"/>
-
- <!--
+
+ <!--
Classpath for the TestNG jar and the build class directory. The test files
themselves will be compiled into the deployment devtest build directory.
-
+
Currently, the TestNG-driven deployment devtests use callable ant, so the
- various ant jars need to be in the class path. Also, the devtests
+ various ant jars need to be in the class path. Also, the devtests
require compilation of Java files, so tools.jar must be in the classpath
for the compiler to be found when ant is invoked from the TestNG test.
-
+
-->
<path id="cp">
<pathelement location="${envng.APS_HOME}/lib/testng.jar"/>
@@ -78,7 +78,7 @@
</fileset>
<pathelement location="${envng.JAVA_HOME}/lib/tools.jar"/>
</path>
-
+
<!-- Define the task for running testng -->
<taskdef name="testng" classpathref="cp"
classname="org.testng.TestNGAntTask" />
@@ -90,19 +90,19 @@
file.
-->
<target name="compile-tests">
- <javac
- srcdir="${user.dir}:${depl.devtests.home}"
+ <javac
+ srcdir="${user.dir}:${depl.devtests.home}"
includes="*.java"
- destdir="${depl.build.dir}"
- debug="on"
+ destdir="${depl.build.dir}"
+ debug="on"
failonerror="true">
<classpath>
<path refid="cp"/>
</classpath>
</javac>
</target>
-
- <!--
+
+ <!--
Run using all tests, looking in those .class files for which the package
ends with .testng (for efficiency of searching only).
-->
@@ -111,5 +111,5 @@
<classfileset dir="${depl.build.dir}" includes="**/testng/*.class"/>
</testng>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/build.xml b/appserver/tests/appserv-tests/devtests/deployment/build.xml
index 7826200..76ddb5b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/build.xml
@@ -35,7 +35,7 @@
</ant>
<ant dir="ear" target="private-all">
<property name="build" value="${build}/ear"/>
- </ant>
+ </ant>
<ant dir="jsr88" target="private-all">
<property name="build" value="${build}/jsr88"/>
</ant>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
index 3cba4c0..1a987ee 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
@@ -17,7 +17,7 @@
-->
<!--
- Targets to be shared by all unit tests
+ Targets to be shared by all unit tests
-->
<!-- configuration -->
@@ -40,7 +40,7 @@
<property name="customtasks.dest" value="${testsRoot}/util/build/customAntTasks"/>
<property name="customtasks.jar" value="${customtasks.dest}/customAntTasks.jar"/>
<property name="junit.jar" value="${env.APS_HOME}/devtests/deployment/junit-4.12.jar" />
-<property name="annotation.report.dir" value="${testsRoot}/annotation/report"/>
+<property name="annotation.report.dir" value="${testsRoot}/annotation/report"/>
<property name="testDomain" value="depltest-domain"/>
<property name="testServer" value="depltest-server"/>
<property name="testCluster" value="depltest-cluster"/>
@@ -77,13 +77,13 @@
util directory for its own build.xml and the source files.
-->
-
+
<target name="init" depends="init.os,init.tools,setAsadminArgs">
<get src="https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar" dest="${env.APS_HOME}/devtests/deployment/junit-4.12.jar" usetimestamp="true"/>
<property name="root" value="${basedir}"/>
<available property="cluster.exists" file="${s1as.home}/domains/${testDomain}"/>
-
+
<available property="SetupStarted" file="${build}/setupdone"/>
<condition property="EE" value="true">
@@ -92,7 +92,7 @@
<equals arg1="${env.DEPL_TARGET}" arg2="CLUSTER"/>
</or>
</condition>
-
+
<condition property="doCluster">
<equals arg1="${env.DEPL_TARGET}" arg2="CLUSTER"/>
</condition>
@@ -100,7 +100,7 @@
<condition property="doInstance">
<equals arg1="${env.DEPL_TARGET}" arg2="SERVER"/>
</condition>
-
+
<condition property="PE">
<and>
<not>
@@ -123,7 +123,7 @@
<property name="s1as.secure" value="false"/>
<condition property="run.jsr88" value="false">
- <equals arg1="${run.jsr88}" arg2="false" />
+ <equals arg1="${run.jsr88}" arg2="false" />
</condition>
<condition property="jsr88.uri" value="deployer:Sun:AppServer::${admin.host}:${admin.port}:https">
@@ -144,13 +144,13 @@
<!--
See if the custom ant tasks jar file is up-to-date as compare to the source files. The
- resulting property will control whether the tasks are compiled and the jar file built
+ resulting property will control whether the tasks are compiled and the jar file built
because the init.customtasks task uses unless="customtasks.uptodate."
-->
<uptodate property="customtasks.uptodate" targetfile="${customtasks.jar}">
<srcfiles dir="${customtasks.src}" includes="*.java"/>
</uptodate>
-
+
<antcall target="init.customtasks"/>
<taskdef name="javaWithResult" classname="devtests.deployment.util.JavaWithResult" classpath="${customtasks.jar}"/>
@@ -312,12 +312,12 @@
</target>
<!--
- The following target compiles all Java files that are used in custom Ant tasks and places them into a
+ The following target compiles all Java files that are used in custom Ant tasks and places them into a
jar file. Subsequent taskdefs can then refer to the jar file.
-
+
Note that the compilation and construction of the jar file will occur only if the jar file is obsolete
compared to the java sources, thanks to the uptodate setting of customtasks.uptodate in the init target.
-
+
Note also that we use a separate build directory so we can capture only the custom task .class files into
the jar and not all .class files under the util tree.
-->
@@ -334,7 +334,7 @@
<path location="${customtasks.dest}"/> <!-- for cross-dependencies, if any, among custom task classes and/or helpers -->
</classpath>
</javac>
- <jar
+ <jar
destfile="${customtasks.jar}"
basedir="${customtasks.dest}"
includes="**/*.class"
@@ -353,7 +353,7 @@
AS_ADMIN_MASTERPASSWORD=changeit
</echo>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="create-file-user ${ASADMIN-ARGS-NOPASSWD} --passwordfile ${user.password.file} --echo=true --terse=true ${arg.list}"/>
</antcall>
<delete file="${user.password.file}" failonerror="false"/>
@@ -363,7 +363,7 @@
<!-- set dotted name enable using asadmin -->
<target name="common.dotted.enable.ref.asadmin" depends="setInstanceName">
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="set servers.server.${depltest.instance.name}.application-ref.${testName}.enabled=true"/>
</antcall>
<antcall target="dotted.enableAppOnInstance">
@@ -412,7 +412,7 @@
<!-- @param ${arg.list} (required) -->
<target name="common.disable.asadmin" depends="setAsadminArgs">
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="disable ${ASADMIN-ARGS} ${arg.list}"/>
</antcall>
<antcall target="disableAppOnInstance">
@@ -494,7 +494,7 @@
<!-- @param ${arg.list} (required) -->
<target name="common.deploy.asadmin" depends="setAsadminArgs">
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${deploy} ${ASADMIN-ARGS} ${arg.list}"/>
</antcall>
<antcall target="createAppRef">
@@ -507,7 +507,7 @@
<param name="testName" value="${testName}"/>
</antcall>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${deploy} ${ASADMIN-ARGS} --force=true ${arg.list}"/>
</antcall>
<antcall target="createAppRef">
@@ -519,7 +519,7 @@
<!-- @param ${arg.list} (required) -->
<target name="common.deploy.osgi.asadmin" depends="setAsadminArgs">
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${deploy} ${ASADMIN-ARGS} --type osgi ${arg.list}"/>
</antcall>
<antcall target="createAppRef">
@@ -532,7 +532,7 @@
<param name="testName" value="${testName}"/>
</antcall>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${deploy} ${ASADMIN-ARGS} --type osgi --force=true ${arg.list}"/>
</antcall>
<antcall target="createAppRef">
@@ -547,7 +547,7 @@
<param name="testName" value="${testName}"/>
</antcall>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${undeploy} ${ASADMIN-ARGS} ${arg.list}"/>
</antcall>
</target>
@@ -571,7 +571,7 @@
<target name="createAppRef" depends="init,setEnabled" if="doCluster" unless="doRollingUpgrade">
<echo message="Create Application Reference for ${testName}"/>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="create-application-ref --user ${admin.user} --passwordfile ${passwordFile} --port ${admin.port} --target ${testServer} --enabled ${enabled} ${testName}"/>
</antcall>
</target>
@@ -579,7 +579,7 @@
<target name="delAppRef" depends="init" if="doCluster">
<echo message="Delete Application Reference for ${testName}"/>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="delete-application-ref --user ${admin.user} --passwordfile ${passwordFile} --port ${admin.port} --target ${testServer} ${testName}"/>
</antcall>
</target>
@@ -602,7 +602,7 @@
<target name="dotted.enableAppOnInstance" depends="init" if="doCluster">
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="set servers.server.${testServer}.application-ref.${testName}.enabled=true"/>
</antcall>
</target>
@@ -795,7 +795,7 @@
<!--
Due to differences in command line parsing on Windows and non-Windows systems we need
- to pass the possibly-empty admin.password differently.
+ to pass the possibly-empty admin.password differently.
-->
<condition property="admin.password.arg" value=""${admin.password}"" else="${admin.password}">
<os family="windows"/>
@@ -803,7 +803,7 @@
<echo message="JSR88Deployer ${command} ${jsr88.uri} ${admin.user} ${admin.password} ${arg.list}"/>
<javaWithResult
- fork="true"
+ fork="true"
failonerror="false"
jvm="${JAVA}"
classname="devtests.deployment.util.JSR88Deployer"
@@ -895,8 +895,8 @@
</target>
<target name="transform" depends="init">
- <style in="${root}/tests-results.xml"
- out="${root}/results.html" extension=".html"
+ <style in="${root}/tests-results.xml"
+ out="${root}/results.html" extension=".html"
style="${testsRoot}/config/convert.xsl" destdir="."/>
<condition property="hasAnnotation">
<!-- need a better way to check if annotation is executed for this run -->
@@ -908,7 +908,7 @@
</or>
<available file="${annotation.report.dir}"/>
</and>
- </condition>
+ </condition>
<antcall target="jutransform"/>
</target>
@@ -934,8 +934,8 @@
<delete dir="${annotation.report.dir}"/>
</target>
-<!--
- Targets to process the test results
+<!--
+ Targets to process the test results
-->
<target name="processResult">
<condition property="testPassed">
@@ -956,11 +956,11 @@
<condition property="statusProvided">
<or>
<equals arg1="${result}" arg2="0"/>
- <equals arg1="${result}" arg2="-1"/>
- <equals arg1="${result}" arg2="1"/>
+ <equals arg1="${result}" arg2="-1"/>
+ <equals arg1="${result}" arg2="1"/>
</or>
</condition>
- <dirname property="antfile.dir" file="${ant.file}"/>
+ <dirname property="antfile.dir" file="${ant.file}"/>
<basename property="current.dir" file="${antfile.dir}"/>
<antcall target="failed">
<param name="testname" value="${current.dir}"/>
@@ -974,7 +974,7 @@
</target>
<!--
- Paramters:
+ Paramters:
testname - name of the test
result - numeric value of the exit status from the client
status - typically FAILED or UNKNOWN
@@ -1007,7 +1007,7 @@
<target name="passed" if="testPassed">
<echo message="Test ${testname} Passed"/>
<concat destfile="${root}/tests-results.xml" append="yes"><result status="PASSED" log="${log}"/></concat>
- <concat destfile="${root}/tests-results.xml" append="yes"></test></concat>
+ <concat destfile="${root}/tests-results.xml" append="yes"></test></concat>
</target>
<target name="unknown" unless="statusProvided">
@@ -1018,22 +1018,22 @@
<!-- @param ${description} (required) -->
<target name="declare-test">
- <dirname property="antfile.dir" file="${ant.file}"/>
+ <dirname property="antfile.dir" file="${ant.file}"/>
<basename property="current.dir" file="${antfile.dir}"/>
<echo message="Starting test ${current.dir} ${description}"/>
<concat destfile="${root}/tests-results.xml" append="yes"><test name="${current.dir}" description="${description}"></concat>
</target>
-<!--
- Targets private to this xml file only
+<!--
+ Targets private to this xml file only
-->
<target name="preTestsRun" depends="clean">
- <dirname property="antfile.dir" file="${ant.file}"/>
+ <dirname property="antfile.dir" file="${ant.file}"/>
<basename property="current.dir" file="${antfile.dir}"/>
<echo message="Running all ${current.dir} devtests"/>
<mkdir dir="${testsRoot}/build/archives"/>
<delete file="${root}/tests-results.xml"/>
- <concat destfile="${root}/tests-results.xml" append="yes"><tests></concat>
+ <concat destfile="${root}/tests-results.xml" append="yes"><tests></concat>
</target>
<target name="restart.server">
@@ -1054,7 +1054,7 @@
<exec executable="${ASADMIN}" failonerror="true">
<arg line="list-instances --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile}"/>
</exec>
- <mkdir dir="${build}/setupdone"/>
+ <mkdir dir="${build}/setupdone"/>
</target>
<target name="setupDomain">
@@ -1149,7 +1149,7 @@
</target>
<target name="deleteCluster" if="doCluster">
- <!-- stop-cluster does not work so use stop-instance to make sure
+ <!-- stop-cluster does not work so use stop-instance to make sure
instance is stopped before deleting it -->
<echo message="Running... asadmin stop-instance"/>
<exec executable="${ASADMIN}">
@@ -1198,7 +1198,7 @@
<copy todir="server-logs/${testServer}/logs">
<fileset dir="${testServer.dir}/logs" includes="*.log *.log.*"/>
</copy>
- <antcall target="copyClusterLog"/>
+ <antcall target="copyClusterLog"/>
<antcall target="deleteInstance"/>
<antcall target="deleteCluster"/>
<delete dir="${s1as.home}/nodeagents"/>
@@ -1213,7 +1213,7 @@
</target>
<target name="postTestsRun">
- <concat destfile="${root}/tests-results.xml" append="yes"></tests></concat>
+ <concat destfile="${root}/tests-results.xml" append="yes"></tests></concat>
<echo message="Processing tests results"/>
<antcall target="transform"/>
<loadfile srcFile="results.html" property="results"/>
@@ -1252,14 +1252,14 @@
<property name="APPCLIENT" value="${s1as.home}/bin/appclient.bat"/>
</target>
-<!--
- Targets to be deprecated
+<!--
+ Targets to be deprecated
-->
<target name="prepare-jsr88" >
<ant dir="${env.APS_HOME}/devtests/deployment/jsr88/tester" target="compile">
<property name="build" value="${build}"/>
- </ant>
+ </ant>
</target>
<target name="jsr88-deploy" depends="prepare-jsr88" >
@@ -1276,7 +1276,7 @@
<arg value="${admin.user}"/>
<arg value="${admin.password}"/>
</java>
-</target>
+</target>
<target name="list">
<echo message="All AVAILABLE modules"/>
@@ -1301,8 +1301,8 @@
<!--
On Windows, ant hangs when it runs an asadmin command that starts a process.
To work around that, this task distinguishes between Windows and non-Windows
- systems and uses a custom ant task for Windows.
-
+ systems and uses a custom ant task for Windows.
+
Any test that needs to start a process should NOT use ${ASADMIN} directly
but should call this start-process target instead. Pass the command line
to be run as <param name="line" value="..."/>.
@@ -1320,7 +1320,7 @@
<isset property="start-target"/>
</not>
</condition>
-
+
<!--
Invoke the target just chosen.
-->
@@ -1347,7 +1347,7 @@
</target>
<!--
- For non-Windows systems, ant works fine when invoking asadmin to start a
+ For non-Windows systems, ant works fine when invoking asadmin to start a
process, so do it that way for those systems.
-->
<target name="start-process-non-windows">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/build.xml
index 6d6923c..567d215 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/build.xml
@@ -23,11 +23,11 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="ear" target="private-all">
- <property name="build" value="${build}/ear"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="ear" target="private-all">
+ <property name="build" value="${build}/ear"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml
index b184e1d..b713418 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/build.xml
@@ -23,17 +23,17 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="no_appxml" target="private-all">
- <property name="build" value="${build}/no_appxml"/>
- </ant>
- <ant dir="dir_deploy" target="private-all">
- <property name="build" value="${build}/dir_deploy"/>
- </ant>
- <ant dir="no_appxml_2" target="private-all">
- <property name="build" value="${build}/no_appxml_2"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="no_appxml" target="private-all">
+ <property name="build" value="${build}/no_appxml"/>
+ </ant>
+ <ant dir="dir_deploy" target="private-all">
+ <property name="build" value="${build}/dir_deploy"/>
+ </ant>
+ <ant dir="no_appxml_2" target="private-all">
+ <property name="build" value="${build}/no_appxml_2"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/build.xml
index 8eb0e12..95de8e3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/build.xml
@@ -54,7 +54,7 @@
com/sun/s1asdev/deployment/noappxml/ejb/Sful.class,
com/sun/s1asdev/deployment/noappxml/ejb/Sless.class"/>
</jar>
- <copy todir="${build}/${testName}/ejb_jar">
+ <copy todir="${build}/${testName}/ejb_jar">
<fileset dir="${build}" includes="com/sun/s1asdev/deployment/noappxml/ejb/**.class"/>
</copy>
<copy file="./ejb/MANIFEST.MF" todir="${build}/${testName}/ejb_jar/META-INF"/>
@@ -79,11 +79,11 @@
<param name="testName" value="${testName}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="prepare,setOrbPort2">
- <exec executable="${APPCLIENT}"
- resultproperty="result"
- failonerror="false"
+ <exec executable="${APPCLIENT}"
+ resultproperty="result"
+ failonerror="false"
output="${build}/${log.id}.output.log">
<arg line="-targetserver ${appclient.targetservers} -client ${appclient.jar}"/>
</exec>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
index 5293865..3533a20 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
@@ -25,8 +25,8 @@
public static void main (String[] args) {
Client client = new Client(args);
client.doTest();
- }
-
+ }
+
public Client (String[] args) {}
@EJB
@@ -43,21 +43,21 @@
System.err.println("invoking stateless");
sless.hello();
-
+
pass();
} catch(Exception e) {
e.printStackTrace();
fail();
}
-
- return;
+
+ return;
}
private void pass() {
System.err.println("PASSED: descriptor_free_zone/ear/no_appxml");
System.exit(0);
}
-
+
private void fail() {
System.err.println("FAILED: descriptor_free_zone/ear/no_appxml");
System.exit(-1);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml
index 4bd4900..9d11451 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml
@@ -54,7 +54,7 @@
<fileset dir="${build}"
includes="com/sun/s1asdev/deployment/noappxml/ejb/**.class"/>
</jar>
- <jar destfile="${portable.ear}">
+ <jar destfile="${portable.ear}">
<fileset dir="${build}" includes="util.jar, ejb.jar"/>
</jar>
<jar destfile="${appclient.jar}" manifest="client/MANIFEST.MF">
@@ -85,7 +85,7 @@
<param name="testName" value="${testName}"/>
</antcall>
</target>
-
+
<target name="deploy.jsr88" depends="prepare">
<antcall target="common.deploy.jsr88">
<param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
@@ -125,9 +125,9 @@
</target>
<target name="runclient" depends="prepare,setOrbPort2">
- <exec executable="${APPCLIENT}"
- resultproperty="result"
- failonerror="false"
+ <exec executable="${APPCLIENT}"
+ resultproperty="result"
+ failonerror="false"
output="${build}/${log.id}.output.log">
<arg line="-targetserver ${appclient.targetservers} -client ${appclient.jar}"/>
</exec>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
index 5293865..3533a20 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
@@ -25,8 +25,8 @@
public static void main (String[] args) {
Client client = new Client(args);
client.doTest();
- }
-
+ }
+
public Client (String[] args) {}
@EJB
@@ -43,21 +43,21 @@
System.err.println("invoking stateless");
sless.hello();
-
+
pass();
} catch(Exception e) {
e.printStackTrace();
fail();
}
-
- return;
+
+ return;
}
private void pass() {
System.err.println("PASSED: descriptor_free_zone/ear/no_appxml");
System.exit(0);
}
-
+
private void fail() {
System.err.println("FAILED: descriptor_free_zone/ear/no_appxml");
System.exit(-1);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml
index 8b224fb..d256a64 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml
@@ -69,7 +69,7 @@
com/sun/s1asdev/deployment/noappxml/ejb/Sful.class,
com/sun/s1asdev/deployment/noappxml/ejb/Sless.class"/>
</jar>
- <jar destfile="${portable.ear}">
+ <jar destfile="${portable.ear}">
<fileset dir="${build}" includes="lib/util.jar, ejb/ejb.jar, web/web.war, client/appclient.jar"/>
</jar>
</target>
@@ -94,7 +94,7 @@
<param name="testName" value="${testName}"/>
</antcall>
</target>
-
+
<target name="deploy.jsr88" depends="prepare">
<antcall target="common.deploy.jsr88">
<param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
@@ -134,9 +134,9 @@
</target>
<target name="runclient" depends="prepare,setOrbPort2,setHttpPort2">
- <exec executable="${APPCLIENT}"
- resultproperty="result"
- failonerror="false"
+ <exec executable="${APPCLIENT}"
+ resultproperty="result"
+ failonerror="false"
output="${build}/${log.id}.output.log">
<arg line="-targetserver ${appclient.targetservers} -client ${testName}Client.jar http://${http.host}:${depltest.port}/web"/>
</exec>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
index 1f875ea..9ead29a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
@@ -27,8 +27,8 @@
public static void main (String[] args) {
Client client = new Client(args);
client.doTest(args);
- }
-
+ }
+
public Client (String[] args) {}
@EJB
@@ -54,21 +54,21 @@
fail();
return;
}
-
+
pass();
} catch(Exception e) {
e.printStackTrace();
fail();
}
-
- return;
+
+ return;
}
private void pass() {
System.err.println("PASSED: descriptor_free_zone/ear/no_appxml_2");
System.exit(0);
}
-
+
private void fail() {
System.err.println("FAILED: descriptor_free_zone/ear/no_appxml_2");
System.exit(-1);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/build.xml
index 97ccf16..9f91926 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/build.xml
@@ -23,9 +23,9 @@
<project name="dirdeploy" default="all" basedir=".">
- &commonBuild;
-
- <target name="private-all" if="PE">
+ &commonBuild;
+
+ <target name="private-all" if="PE">
<ant dir="ear" target="private-all">
<property name="build" value="${build}/ear"/>
</ant>
@@ -44,6 +44,6 @@
<ant dir="warwithsuffix" target="private-all">
<property name="build" value="${build}/warwithsuffix"/>
</ant>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
index 982e81f..5ac3650 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
@@ -28,11 +28,11 @@
public static void main(String[] args) {
- boolean testPositive = (Boolean.valueOf(args[0])).booleanValue();
- if(testPositive)
- System.out.println("Test expects successful result");
- else
- System.out.println("Test expected to fail");
+ boolean testPositive = (Boolean.valueOf(args[0])).booleanValue();
+ if(testPositive)
+ System.out.println("Test expects successful result");
+ else
+ System.out.println("Test expected to fail");
try {
Context ic = new InitialContext();
@@ -75,29 +75,29 @@
} else {
System.out.println("Failure! Caught unasked for Exception");
- System.exit(-1);
+ System.exit(-1);
}
}
System.out.println(
"Client is now trying to remove the session bean\n");
hr.remove();
} catch (NamingException ne) {
- if(testPositive) {
- System.out.println("Caught exception while initializing context : " +
- ne.getMessage() + " \n");
- System.exit(-1);
- } else {
- System.out.println("Recd exception as expected");
- }
+ if(testPositive) {
+ System.out.println("Caught exception while initializing context : " +
+ ne.getMessage() + " \n");
+ System.exit(-1);
+ } else {
+ System.out.println("Recd exception as expected");
+ }
} catch (Exception re) {
- if(testPositive) {
- re.printStackTrace();
- System.out.println( "Session beans could not be removed by the client.\n");
- System.exit(-1);
- } else {
- System.out.println("Recd exception as expected");
- }
- }
+ if(testPositive) {
+ re.printStackTrace();
+ System.out.println( "Session beans could not be removed by the client.\n");
+ System.exit(-1);
+ } else {
+ System.out.println("Recd exception as expected");
+ }
+ }
System.out.println(
"Session bean was successfully removed by the client.\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/TestClient.java
index de03ca3..12eee3e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/build.xml
index 2866114..e472ce8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/build.xml
@@ -22,23 +22,23 @@
]>
<!--
- Test directory deployment for ear with directory structure such
+ Test directory deployment for ear with directory structure such
as foo/bar_war
-->
-
+
<project name="directoryDeploy-Ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="dirDeployEar"/>
<property name="contextRoot" value="${testName}Web"/>
<property name="ear.build.dir" value="${build}/${testName}"/>
- <property name="ejb.build.dir"
+ <property name="ejb.build.dir"
value="${ear.build.dir}/${testName}Ejb_jar"/>
- <property name="web.build.dir"
+ <property name="web.build.dir"
value="${ear.build.dir}/${testName}Web_war"/>
<property name="client.build.dir" value="${build}/client"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${ear.build.dir}" />
@@ -65,11 +65,11 @@
<classpath refid="gfv3.classpath"/>
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<copy file="descriptor/web.xml" todir="${web.build.dir}/WEB-INF"/>
- <copy file="descriptor/sun-web.xml"
- todir="${web.build.dir}/WEB-INF"
+ <copy file="descriptor/sun-web.xml"
+ todir="${web.build.dir}/WEB-INF"
failonerror="false"/>
<copy todir="${web.build.dir}">
<fileset dir="war" includes="*.jsp, *.html"/>
@@ -78,18 +78,18 @@
<fileset dir="war" includes="*properties"/>
</copy>
<mkdir dir="${ejb.build.dir}/META-INF"/>
- <copy file="descriptor/ejb-jar.xml"
+ <copy file="descriptor/ejb-jar.xml"
todir="${ejb.build.dir}/META-INF"/>
- <copy file="descriptor/sun-ejb-jar.xml"
- todir="${ejb.build.dir}/META-INF"
+ <copy file="descriptor/sun-ejb-jar.xml"
+ todir="${ejb.build.dir}/META-INF"
failonerror="false"/>
<mkdir dir="${ear.build.dir}/META-INF"/>
<!-- application.xml is optional
- <copy file="descriptor/application.xml"
+ <copy file="descriptor/application.xml"
todir="${ear.build.dir}/META-INF"/>
-->
- <copy file="descriptor/sun-application.xml"
+ <copy file="descriptor/sun-application.xml"
todir="${ear.build.dir}/META-INF"
failonerror="false"/>
</target>
@@ -116,7 +116,7 @@
</target>
<target name="run" depends="run.positive"/>
-
+
<target name="run.positive" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}"/>
<antcall target="runclient">
@@ -124,7 +124,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="run.negative" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}/${testName}"/>
<antcall target="runclient">
@@ -132,7 +132,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="init">
<echo message="TestClient ${arg.list}"/>
<javaWithResult
@@ -144,7 +144,7 @@
resultproperty="result">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
+
<classpath>
<path refid="gfv3.classpath"/>
<path location="${client.build.dir}"/>
@@ -152,13 +152,13 @@
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
@@ -166,7 +166,7 @@
</antcall>
<antcall target="deploydir.asadmin"/>
<antcall target="run.positive"><param name="log.id" value="1"/></antcall>
-
+
<antcall target="declare-test">
<param name="description" value="directorydeploy/ear Test asadmin redeploydir"/>
</antcall>
@@ -183,5 +183,5 @@
<delete dir="${build}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
index 9047e64..3ace8d9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
@@ -26,12 +26,12 @@
* to obtain references to the bean's remote interface (Greeter, in this case).
*
*/
-public interface Greeter extends jakarta.ejb.EJBObject {
+public interface Greeter extends jakarta.ejb.EJBObject {
/**
* Returns a greeting.
* @return returns a greeting as a string.
* @exception throws a RemoteException.
*
*/
- public String getGreeting() throws java.rmi.RemoteException;
-}
+ public String getGreeting() throws java.rmi.RemoteException;
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
index b6bb56d..1324abe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
@@ -16,75 +16,75 @@
package samples.ejb.stateless.simple.ejb;
-import java.util.*;
-import java.io.*;
+import java.util.*;
+import java.io.*;
/**
* A simple stateless bean for the HelloWorld application. This bean implements one
* business method as declared by the remote interface.
*/
-public class GreeterEJB implements jakarta.ejb.SessionBean {
+public class GreeterEJB implements jakarta.ejb.SessionBean {
- private jakarta.ejb.SessionContext m_ctx = null;
-
+ private jakarta.ejb.SessionContext m_ctx = null;
+
/**
* Sets the session context. Required by EJB spec.
* @param ctx A SessionContext object.
*/
- public void setSessionContext(jakarta.ejb.SessionContext ctx) {
- m_ctx = ctx;
- }
+ public void setSessionContext(jakarta.ejb.SessionContext ctx) {
+ m_ctx = ctx;
+ }
/**
* Creates a bean. Required by EJB spec.
* @exception throws CreateException.
*/
- public void ejbCreate() throws jakarta.ejb.EJBException, jakarta.ejb.CreateException {
- System.out.println("ejbCreate() on obj " + this);
- }
+ public void ejbCreate() throws jakarta.ejb.EJBException, jakarta.ejb.CreateException {
+ System.out.println("ejbCreate() on obj " + this);
+ }
/**
* Removes the bean. Required by EJB spec.
*/
- public void ejbRemove() {
- System.out.println("ejbRemove() on obj " + this);
- }
+ public void ejbRemove() {
+ System.out.println("ejbRemove() on obj " + this);
+ }
/**
* Loads the state of the bean from secondary storage. Required by EJB spec.
*/
- public void ejbActivate() {
- System.out.println("ejbActivate() on obj " + this);
- }
+ public void ejbActivate() {
+ System.out.println("ejbActivate() on obj " + this);
+ }
/**
* Serializes the state of the bean to secondary storage. Required by EJB spec.
*/
- public void ejbPassivate() {
- System.out.println("ejbPassivate() on obj " + this);
- }
+ public void ejbPassivate() {
+ System.out.println("ejbPassivate() on obj " + this);
+ }
/**
* Required by EJB spec.
*/
- public void Greeter() {
- }
+ public void Greeter() {
+ }
/**
* Returns a greeting, based on the time of the day.
* @return returns a greeting as a string.
*/
- public String getGreeting() {
- String message = null;
- Calendar calendar = new GregorianCalendar();
- int currentHour = calendar.get(Calendar.HOUR_OF_DAY);
- if(currentHour < 12) message = "morning";
- else {
- if( (currentHour >= 12) &&
- (calendar.get(Calendar.HOUR_OF_DAY) < 18)) message = "afternoon";
- else message = "evening";
- }
- return message;
- }
-}
+ public String getGreeting() {
+ String message = null;
+ Calendar calendar = new GregorianCalendar();
+ int currentHour = calendar.get(Calendar.HOUR_OF_DAY);
+ if(currentHour < 12) message = "morning";
+ else {
+ if( (currentHour >= 12) &&
+ (calendar.get(Calendar.HOUR_OF_DAY) < 18)) message = "afternoon";
+ else message = "evening";
+ }
+ return message;
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
index 12d023a..a972ba9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
@@ -21,11 +21,11 @@
* to obtain references to the bean's remote interface.
*
*/
-public interface GreeterHome extends jakarta.ejb.EJBHome {
+public interface GreeterHome extends jakarta.ejb.EJBHome {
/**
* Gets a reference to the remote interface to the Greeter bean.
* @exception throws CreateException and RemoteException.
*
*/
- public Greeter create() throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-}
+ public Greeter create() throws java.rmi.RemoteException, jakarta.ejb.CreateException;
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
index 0035f0e..6da1bdb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
@@ -16,104 +16,104 @@
package samples.ejb.stateless.simple.servlet;
-import java.io.*;
-import java.util.*;
-import jakarta.servlet.*;
-import javax.naming.*;
-import jakarta.servlet.http.*;
+import java.io.*;
+import java.util.*;
+import jakarta.servlet.*;
+import javax.naming.*;
+import jakarta.servlet.http.*;
import javax.rmi.PortableRemoteObject;
-import jakarta.ejb.*;
+import jakarta.ejb.*;
-import samples.ejb.stateless.simple.ejb.*;
+import samples.ejb.stateless.simple.ejb.*;
/**
* This servlet is responsible for throwing the html pages for the HelloWorld application.
*/
-public class GreeterServlet extends HttpServlet {
+public class GreeterServlet extends HttpServlet {
/**
* The doGet method of the servlet. Handles all http GET request.
* Required by the servlet specification.
* @exception throws ServletException and IOException.
*/
- public void doGet (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
+ public void doGet (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
- jakarta.ejb.Handle beanHandle;
- Greeter myGreeterBean;
- GreeterHome myGreeterHome;
+ jakarta.ejb.Handle beanHandle;
+ Greeter myGreeterBean;
+ GreeterHome myGreeterHome;
Greeter myGreeterRemote;
-
- InitialContext initContext = null;
- Hashtable env = new java.util.Hashtable(1);
+
+ InitialContext initContext = null;
+ Hashtable env = new java.util.Hashtable(1);
ResourceBundle rb = ResourceBundle.getBundle("LocalStrings", Locale.getDefault());
- System.out.println("\n"+rb.getString("greeting_servlet")+ "...");
+ System.out.println("\n"+rb.getString("greeting_servlet")+ "...");
- System.out.println(rb.getString("retrieving_jndi"));
- try {
- initContext = new javax.naming.InitialContext();
- }
- catch (Exception e) {
- System.out.println(rb.getString("exception")+": " + e.toString());
- return;
- }
+ System.out.println(rb.getString("retrieving_jndi"));
+ try {
+ initContext = new javax.naming.InitialContext();
+ }
+ catch (Exception e) {
+ System.out.println(rb.getString("exception")+": " + e.toString());
+ return;
+ }
- try {
- System.out.println(rb.getString("looking_up"));
- String JNDIName = "java:comp/env/ejb/greeter";
- System.out.println(rb.getString("looking")+": " + JNDIName);
- Object objref = initContext.lookup(JNDIName);
+ try {
+ System.out.println(rb.getString("looking_up"));
+ String JNDIName = "java:comp/env/ejb/greeter";
+ System.out.println(rb.getString("looking")+": " + JNDIName);
+ Object objref = initContext.lookup(JNDIName);
myGreeterHome = (GreeterHome)PortableRemoteObject.narrow(objref,
GreeterHome.class);
- }
- catch(Exception e) {
- System.out.println(rb.getString("greeter_bean")+" - " +
- rb.getString("is_registered")+"?: " + e.toString());
- return;
- }
- try {
- System.out.println(rb.getString("creating"));
- myGreeterRemote = myGreeterHome.create();
- }
- catch(CreateException e) {
- System.out.println(rb.getString("could_not")+": "+
- e.toString());
- return;
- }
+ }
+ catch(Exception e) {
+ System.out.println(rb.getString("greeter_bean")+" - " +
+ rb.getString("is_registered")+"?: " + e.toString());
+ return;
+ }
+ try {
+ System.out.println(rb.getString("creating"));
+ myGreeterRemote = myGreeterHome.create();
+ }
+ catch(CreateException e) {
+ System.out.println(rb.getString("could_not")+": "+
+ e.toString());
+ return;
+ }
- System.out.println(rb.getString("getting"));
- String theMessage = myGreeterRemote.getGreeting();
- System.out.println(rb.getString("got")+": " + theMessage);
+ System.out.println(rb.getString("getting"));
+ String theMessage = myGreeterRemote.getGreeting();
+ System.out.println(rb.getString("got")+": " + theMessage);
- System.out.println(rb.getString("storing"));
- request.setAttribute("message", theMessage);
+ System.out.println(rb.getString("storing"));
+ request.setAttribute("message", theMessage);
- System.out.println(rb.getString("dispatching"));
- response.setContentType("text/html");
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher
- ("/GreeterView.jsp");
- dispatcher.include(request, response);
- return;
- }
+ System.out.println(rb.getString("dispatching"));
+ response.setContentType("text/html");
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher
+ ("/GreeterView.jsp");
+ dispatcher.include(request, response);
+ return;
+ }
/**
* The doPost method of the servlet. Handles all http POST request.
* Required by the servlet specification.
* @exception throws ServletException and IOException.
*/
- public void doPost (HttpServletRequest request,HttpServletResponse response)
- throws ServletException, IOException {
- doGet(request,response);
- }
+ public void doPost (HttpServletRequest request,HttpServletResponse response)
+ throws ServletException, IOException {
+ doGet(request,response);
+ }
/**
* Returns the servlet info as a String.
* @return returns the servlet info as a String.
*/
- public String getServletInfo() {
+ public String getServletInfo() {
ResourceBundle rb = ResourceBundle.getBundle("LocalStrings", Locale.getDefault());
- return rb.getString("call")+".";
- }
-}
+ return rb.getString("call")+".";
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/LocalStrings.properties b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/LocalStrings.properties
index 871fce6..a28a1a8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/LocalStrings.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/LocalStrings.properties
@@ -19,19 +19,19 @@
greeter_title=Greeter
hello_world=Hello World
good=Good
-enjoy_your=Enjoy your
+enjoy_your=Enjoy your\u0020
greeting_servlet=GreeterServlet is executing
-retrieving_jndi=Retrieving JNDI initial context
-exception=Exception creating InitialContext
-looking_up=Looking up greeter bean home interface
+retrieving_jndi=Retrieving JNDI initial context \u0020
+exception=Exception creating InitialContext \u0020
+looking_up=Looking up greeter bean home interface\u0020
looking=Looking up
-greeter_bean=Greeter bean home not found
-is_registered=Is bean registered with JNDI
+greeter_bean=Greeter bean home not found \u0020
+is_registered=Is bean registered with JNDI \u0020
creating=Creating the greeter bean
-could_not=Could not create the greeter bean
+could_not=Could not create the greeter bean\u0020
getting=Getting the message from the greeter bean
-got=Got this message from greeter bean
+got=Got this message from greeter bean\u0020
storing=Storing the message in request object
-dispatching=Dispatching JSP for output
+dispatching=Dispatching JSP for output \u0020
call=Call a session bean from a servlet and deliver result via a JSP
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/earwithsuffix/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/earwithsuffix/build.xml
index 0d304a8..500b857 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/earwithsuffix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/earwithsuffix/build.xml
@@ -22,23 +22,23 @@
]>
<!--
- Test directory deployment for ear with directory structure such
+ Test directory deployment for ear with directory structure such
as foo.ear/bar.war
-->
-
+
<project name="directoryDeploy-withEarSuffix" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="dirDeployWithEarSuffix"/>
<property name="contextRoot" value="${testName}Web"/>
<property name="ear.build.dir" value="${build}/${testName}.ear"/>
- <property name="ejb.build.dir"
+ <property name="ejb.build.dir"
value="${ear.build.dir}/${testName}Ejb.jar"/>
- <property name="web.build.dir"
+ <property name="web.build.dir"
value="${ear.build.dir}/${testName}Web.war"/>
<property name="client.build.dir" value="${build}/client"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${ear.build.dir}" />
@@ -66,11 +66,11 @@
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<copy file="../ear/descriptor/web.xml" todir="${web.build.dir}/WEB-INF"/>
- <copy file="../ear/descriptor/sun-web.xml"
- todir="${web.build.dir}/WEB-INF"
+ <copy file="../ear/descriptor/sun-web.xml"
+ todir="${web.build.dir}/WEB-INF"
failonerror="false"/>
<copy todir="${web.build.dir}">
<fileset dir="../ear/war" includes="*.jsp, *.html"/>
@@ -79,18 +79,18 @@
<fileset dir="../ear/war" includes="*properties"/>
</copy>
<mkdir dir="${ejb.build.dir}/META-INF"/>
- <copy file="../ear/descriptor/ejb-jar.xml"
+ <copy file="../ear/descriptor/ejb-jar.xml"
todir="${ejb.build.dir}/META-INF"/>
- <copy file="../ear/descriptor/sun-ejb-jar.xml"
- todir="${ejb.build.dir}/META-INF"
+ <copy file="../ear/descriptor/sun-ejb-jar.xml"
+ todir="${ejb.build.dir}/META-INF"
failonerror="false"/>
<mkdir dir="${ear.build.dir}/META-INF"/>
<!-- application.xml is optional
- <copy file="../ear/descriptor/application.xml"
+ <copy file="../ear/descriptor/application.xml"
todir="${ear.build.dir}/META-INF"/>
-->
- <copy file="../ear/descriptor/sun-application.xml"
+ <copy file="../ear/descriptor/sun-application.xml"
todir="${ear.build.dir}/META-INF"
failonerror="false"/>
</target>
@@ -117,7 +117,7 @@
</target>
<target name="run" depends="run.positive"/>
-
+
<target name="run.positive" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}"/>
<antcall target="runclient">
@@ -125,7 +125,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="run.negative" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}/${testName}"/>
<antcall target="runclient">
@@ -133,7 +133,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="init">
<echo message="TestClient ${arg.list}"/>
<javaWithResult
@@ -145,21 +145,21 @@
resultproperty="result">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
+
+ <classpath>
<path refid="gfv3.classpath"/>
<path location="${client.build.dir}"/>
</classpath>
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
@@ -167,7 +167,7 @@
</antcall>
<antcall target="deploydir.asadmin"/>
<antcall target="run.positive"><param name="log.id" value="1"/></antcall>
-
+
<antcall target="declare-test">
<param name="description" value="directorydeploy/earWithSuffix Test asadmin redeploydir"/>
</antcall>
@@ -184,5 +184,5 @@
<delete dir="${build}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/build.xml
index d8cd5c5..ef47218 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/build.xml
@@ -22,19 +22,19 @@
]>
<!--
- Test directory deployment for ejb with directory structure such
+ Test directory deployment for ejb with directory structure such
as bar
-->
-
+
<project name="directoryDeploy-Ejb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="dirDeployEjb"/>
- <property name="ejb.build.dir"
+ <property name="ejb.build.dir"
value="${build}/${testName}"/>
<property name="client.build.dir" value="${build}/client"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${ejb.build.dir}" />
@@ -54,7 +54,7 @@
</classpath>
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<mkdir dir="${ejb.build.dir}/META-INF"/>
<copy file="descriptor/ejb-jar.xml"
@@ -77,7 +77,7 @@
value="--name ${testName} --retrieve ${client.build.dir} ${build}/${testName}"/>
</antcall>
</target>
-
+
<target name="undeploy.asadmin">
<antcall target="common.undeploy.asadmin">
<param name="arg.list"
@@ -94,7 +94,7 @@
<param name="tgtPort" value="${depltest.orbport}"/>
</antcall>
</target>
-
+
<target name="run.negative" depends="init,setOrbPort">
<antcall target="runclient">
<param name="arg.list" value="false"/>
@@ -111,27 +111,27 @@
classname="standaloneclient.HelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
-
+
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${tgtPort}"/>
-
+
<classpath>
<path refid="gfv3.classpath"/>
<path location="${ejb.build.dir}"/>
<path location="${client.build.dir}"/>
<path location="${client.build.dir}/dirDeployEjbClient.jar"/>
</classpath>
-
+
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
@@ -161,5 +161,5 @@
<delete dir="${build}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
index f4b611d..ec3f69a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
import java.io.InputStream;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class StatelesshelloEJB implements SessionBean {
private SessionContext sc;
-
+
public StatelesshelloEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
}
public boolean isStatelesshello() throws EJBException {
@@ -52,47 +52,47 @@
- Double d = null;
- String name = null;
- StringBuffer buffer = new StringBuffer("Statelesshello EJB - checked environment properties for user ");
- System.out.println("StatelesshelloEJB is saying hello to user\n");
- System.out.println("Now going forward with reading the environment properties\n");
+ Double d = null;
+ String name = null;
+ StringBuffer buffer = new StringBuffer("Statelesshello EJB - checked environment properties for user ");
+ System.out.println("StatelesshelloEJB is saying hello to user\n");
+ System.out.println("Now going forward with reading the environment properties\n");
- try {
- InitialContext ic = new InitialContext();
- name = (String) ic.lookup("java:comp/env/user");
- buffer.append(name);
- buffer.append("\nand for number which is = ");
- d = (Double) ic.lookup("java:comp/env/number");
- buffer.append(d);
- buffer.append("\n");
- } catch(NamingException e) {
+ try {
+ InitialContext ic = new InitialContext();
+ name = (String) ic.lookup("java:comp/env/user");
+ buffer.append(name);
+ buffer.append("\nand for number which is = ");
+ d = (Double) ic.lookup("java:comp/env/number");
+ buffer.append(d);
+ buffer.append("\n");
+ } catch(NamingException e) {
e.printStackTrace();
throw new EJBException(e.getMessage());
- }
- if(d == null) {
- throw new EJBException("Wrong value for environment property");
- }
- System.out.println(buffer);
+ }
+ if(d == null) {
+ throw new EJBException("Wrong value for environment property");
+ }
+ System.out.println(buffer);
return new String(buffer);
}
-
+
public String getUserDefinedException() throws RemoteException, StatelesshelloException {
-
+
System.out.println("Throwing a User Defined Exception");
throw new StatelesshelloException("test exception");
-
+
}
-
-
+
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloException.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloException.java
index 943eb39..b88257d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloException.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloException.java
@@ -19,9 +19,9 @@
import java.rmi.RemoteException;
public class StatelesshelloException extends Exception {
-
+
public StatelesshelloException(String str) {
- super(str);
+ super(str);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejbwithsuffix/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejbwithsuffix/build.xml
index 09314b2..999292a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejbwithsuffix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejbwithsuffix/build.xml
@@ -22,19 +22,19 @@
]>
<!--
- Test directory deployment for ejb with directory structure such
+ Test directory deployment for ejb with directory structure such
as bar.jar
-->
-
+
<project name="directoryDeploy-withEjbSuffix" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="dirDeployWithEjbSuffix"/>
- <property name="ejb.build.dir"
+ <property name="ejb.build.dir"
value="${build}/${testName}.jar"/>
<property name="client.build.dir" value="${build}/client"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${ejb.build.dir}" />
@@ -55,7 +55,7 @@
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<mkdir dir="${ejb.build.dir}/META-INF"/>
<copy file="../ejb/descriptor/ejb-jar.xml"
@@ -95,7 +95,7 @@
<param name="tgtPort" value="${depltest.orbport}"/>
</antcall>
</target>
-
+
<target name="run.negative" depends="init,setOrbPort">
<antcall target="runclient">
<param name="arg.list" value="false"/>
@@ -112,27 +112,27 @@
classname="standaloneclient.HelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
-
+
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${tgtPort}"/>
-
+
<classpath>
<path refid="gfv3.classpath"/>
<path location="${ejb.build.dir}"/>
<path location="${client.build.dir}"/>
<path location="${client.build.dir}/dirDeployWithEjbSuffixClient.jar"/>
</classpath>
-
+
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
@@ -162,5 +162,5 @@
<delete dir="${build}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/build.xml
index 5cef10e..2feca67 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/build.xml
@@ -22,20 +22,20 @@
]>
<!--
- Test directory deployment for war with directory structure such
+ Test directory deployment for war with directory structure such
as bar
-->
-
+
<project name="directoryDeploy-War" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="dirDeployWar"/>
<property name="contextRoot" value="foo"/>
- <property name="web.build.dir"
+ <property name="web.build.dir"
value="${build}/${testName}"/>
<property name="client.build.dir" value="${build}/client"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${web.build.dir}" />
@@ -56,11 +56,11 @@
</classpath>
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<copy file="descriptor/web.xml" todir="${web.build.dir}/WEB-INF"/>
- <copy file="descriptor/sun-web.xml"
- todir="${web.build.dir}/WEB-INF"
+ <copy file="descriptor/sun-web.xml"
+ todir="${web.build.dir}/WEB-INF"
failonerror="false"/>
</target>
@@ -77,7 +77,7 @@
value="--name ${testName} ${build}/${testName}"/>
</antcall>
</target>
-
+
<target name="undeploy.asadmin">
<antcall target="common.undeploy.asadmin">
<param name="arg.list"
@@ -86,7 +86,7 @@
</target>
<target name="run" depends="run.positive"/>
-
+
<target name="run.positive" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}/servletonly"/>
<antcall target="runclient">
@@ -94,7 +94,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="run.negative" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}/${testName}"/>
<antcall target="runclient">
@@ -102,7 +102,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="init">
<echo message="TestClient ${arg.list}"/>
<javaWithResult
@@ -114,21 +114,21 @@
resultproperty="result">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
+
<classpath>
<path refid="gfv3.classpath"/>
<path location="${client.build.dir}"/>
</classpath>
-
+
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
@@ -136,7 +136,7 @@
</antcall>
<antcall target="deploydir.asadmin"/>
<antcall target="run.positive"><param name="log.id" value="1"/></antcall>
-
+
<antcall target="declare-test">
<param name="description" value="directorydeploy/war Test asadmin redeploydir"/>
</antcall>
@@ -153,5 +153,5 @@
<delete dir="${build}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/descriptor/web.xml
index d9321ef..6af6b4d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/war/descriptor/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>servletonly</display-name>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/warwithsuffix/build.xml b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/warwithsuffix/build.xml
index 9aad7d4..651782a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/warwithsuffix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/warwithsuffix/build.xml
@@ -22,20 +22,20 @@
]>
<!--
- Test directory deployment for war with directory structure such
+ Test directory deployment for war with directory structure such
as bar.war
-->
-
+
<project name="directoryDeploy-withWarSuffix" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="testName" value="dirDeployWithWarSuffix"/>
<property name="contextRoot" value="foo"/>
- <property name="web.build.dir"
+ <property name="web.build.dir"
value="${build}/${testName}.war"/>
<property name="client.build.dir" value="${build}/client"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${web.build.dir}" />
@@ -56,11 +56,11 @@
</classpath>
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<copy file="../war/descriptor/web.xml" todir="${web.build.dir}/WEB-INF"/>
- <copy file="../war/descriptor/sun-web.xml"
- todir="${web.build.dir}/WEB-INF"
+ <copy file="../war/descriptor/sun-web.xml"
+ todir="${web.build.dir}/WEB-INF"
failonerror="false"/>
</target>
@@ -86,7 +86,7 @@
</target>
<target name="run" depends="run.positive"/>
-
+
<target name="run.positive" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}/servletonly"/>
<antcall target="runclient">
@@ -94,7 +94,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="run.negative" depends="setHttpPort">
<property name="url" value="http://${http.host}:${depltest.port}/${contextRoot}/${testName}"/>
<antcall target="runclient">
@@ -102,7 +102,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="init">
<echo message="TestClient ${arg.list}"/>
<javaWithResult
@@ -114,21 +114,21 @@
resultproperty="result">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
+
<classpath>
<path refid="gfv3.classpath"/>
<path location="${client.build.dir}"/>
</classpath>
-
+
<arg line="${arg.list}"/>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
@@ -136,7 +136,7 @@
</antcall>
<antcall target="deploydir.asadmin"/>
<antcall target="run.positive"><param name="log.id" value="1"/></antcall>
-
+
<antcall target="declare-test">
<param name="description" value="directorydeploy/warWithSuffix Test asadmin redeploydir"/>
</antcall>
@@ -153,5 +153,5 @@
<delete dir="${build}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTest.java b/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTest.java
index 066f7f0..f827911 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTest.java
@@ -73,7 +73,7 @@
Archivist archivist = null;
ReadableArchive archive = null;
-
+
// first read/parse and write out the original valid archive
try {
File archiveFile = new File(fileName);
@@ -86,8 +86,8 @@
archivist.setAnnotationProcessingRequested(true);
JndiNameEnvironment nameEnv = (JndiNameEnvironment)archivist.open(archiveFile);
- Set<ResourceReferenceDescriptor> resRefDescs = nameEnv.getResourceReferenceDescriptors();
-
+ Set<ResourceReferenceDescriptor> resRefDescs = nameEnv.getResourceReferenceDescriptors();
+
for (ResourceReferenceDescriptor resRef : resRefDescs) {
String refName = resRef.getName();
String jndiName = resRef.getJndiName();
@@ -97,11 +97,11 @@
String auth = resRef.getAuthorization();
String scope = resRef.getSharingScope();
log ("Resource ref [" + refName + "] with JNDI name: " + jndiName + ", description: " + description + ", authorization: " + auth + ", sharing scope: " + scope + ", mappedName: " + mappedName + ", lookupName: " + lookupName);
- if (refName.equals("myDS7") &&
+ if (refName.equals("myDS7") &&
!description.equals(EXPECTED_RESOURCE_DESCRIPTION)) {
log("Descriptor did not override the @Resource description attribute as expected");
fail();
- } else if (refName.equals("myDS5and6")) {
+ } else if (refName.equals("myDS5and6")) {
Set<InjectionTarget> targets = resRef.getInjectionTargets();
for (InjectionTarget target : targets) {
log("Target class name: " + target.getClassName());
@@ -111,28 +111,28 @@
log("The additional injection target specified in the descriptor is not used as expected");
fail();
}
- } else if (refName.equals("myDS8") &&
+ } else if (refName.equals("myDS8") &&
!mappedName.equals(EXPECTED_RESOURCE_JNDI_NAME)) {
log("Descriptor did not override the @Resource mapped-name attribute as expected");
fail();
- } else if (refName.equals("myDS7") &&
+ } else if (refName.equals("myDS7") &&
!scope.equals(EXPECTED_RESOURCE_SHARING_SCOPE)) {
log("Descriptor did not override the @Resource sharing scope attribute as expected");
fail();
- } else if (refName.equals("myDS7") &&
+ } else if (refName.equals("myDS7") &&
!auth.equals(EXPECTED_RESOURCE_AUTHORIZATION)) {
log("Descriptor did not override the @Resource authorization attribute as expected");
fail();
- } else if (refName.equals("myDS7") &&
+ } else if (refName.equals("myDS7") &&
!lookupName.equals(EXPECTED_RESOURCE_JNDI_NAME)) {
log("Descriptor did not override the @Resource lookup name attribute as expected");
fail();
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
- log("Input archive: [" + fileName +
+ log("Input archive: [" + fileName +
"] is not valid");
fail();
} finally {
@@ -173,7 +173,7 @@
StartupContext startupContext = new StartupContext();
ServiceLocatorUtilities.addOneConstant(serviceLocator, startupContext);
- ServiceLocatorUtilities.addOneConstant(serviceLocator,
+ ServiceLocatorUtilities.addOneConstant(serviceLocator,
new ProcessEnvironment(ProcessEnvironment.ProcessType.Other));
Globals.setDefaultHabitat(serviceLocator);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTestServlet.java
index 56b36ba..4c8432e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/override/OverrideTestServlet.java
@@ -75,6 +75,6 @@
} catch(Exception ex) {
throw new IllegalStateException("Cannot get login timeout: " + ex);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/Validator.java b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/Validator.java
index 6aada10..c6caa3c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/Validator.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/Validator.java
@@ -65,7 +65,7 @@
Archivist archivist = null;
ReadableArchive archive = null;
-
+
// first read/parse and write out the original valid archive
try {
File archiveFile = new File(fileName);
@@ -74,11 +74,11 @@
archivist = archivistFactory.getArchivist(archiveType);
archivist.setHandleRuntimeInfo(true);
archivist.setArchiveUri(fileName);
- archivist.setXMLValidation(true);
- archivist.setXMLValidationLevel("full");
+ archivist.setXMLValidation(true);
+ archivist.setXMLValidationLevel("full");
archivist.setRuntimeXMLValidation(true);
archivist.setRuntimeXMLValidationLevel("full");
- log("Reading/parsing the orginal archive: " +
+ log("Reading/parsing the orginal archive: " +
fileName);
try {
Descriptor descriptor = archivist.open(archiveFile);
@@ -89,12 +89,12 @@
throw ex;
}
}
- log("Writing out the archive to: " +
+ log("Writing out the archive to: " +
outputFileName);
archivist.write(archive, outputFileName);
} catch (Exception e) {
e.printStackTrace();
- log("Input archive: [" + fileName +
+ log("Input archive: [" + fileName +
"] is not valid");
fail();
} finally {
@@ -119,12 +119,12 @@
archivist.setXMLValidationLevel("full");
archivist.setRuntimeXMLValidation(true);
archivist.setRuntimeXMLValidationLevel("full");
- log("Reading/parsing the output archive" +
+ log("Reading/parsing the output archive" +
outputFileName);
Descriptor descriptor = archivist.open(archiveFile);
} catch (Exception e) {
e.printStackTrace();
- log("The input archive: [" + outputFileName +
+ log("The input archive: [" + outputFileName +
"] is not valid");
fail();
}
@@ -134,7 +134,7 @@
archivist.write(archive, outputFileName2);
} catch (Exception e) {
e.printStackTrace();
- log("The output archive: [" + outputFileName2 +
+ log("The output archive: [" + outputFileName2 +
"] is not valid");
fail();
} finally {
@@ -193,7 +193,7 @@
}
private static String getExtension(String file) {
- String ext = file.substring(file.lastIndexOf("."));
+ String ext = file.substring(file.lastIndexOf("."));
return ext;
}
@@ -205,7 +205,7 @@
StartupContext startupContext = new StartupContext();
ServiceLocatorUtilities.addOneConstant(serviceLocator, startupContext);
- ServiceLocatorUtilities.addOneConstant(serviceLocator,
+ ServiceLocatorUtilities.addOneConstant(serviceLocator,
new ProcessEnvironment(ProcessEnvironment.ProcessType.Other));
Globals.setDefaultHabitat(serviceLocator);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/build.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/build.xml
index adfab82..9af8e54 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/build.xml
@@ -28,42 +28,42 @@
<property name="testName" value="validation"/>
<target name="prepare" depends="init">
- <property name="validation.war"
+ <property name="validation.war"
value="${build}/war/${testName}.war"/>
- <property name="validation.jar"
+ <property name="validation.jar"
value="${build}/ejb/${testName}-ejb.jar"/>
- <property name="validation.rar"
+ <property name="validation.rar"
value="${build}/rar/${testName}.rar"/>
- <property name="validation.car"
+ <property name="validation.car"
value="${build}/car/${testName}-client.jar"/>
- <property name="validation.wlsRar"
+ <property name="validation.wlsRar"
value="${build}/wlsRar/${testName}.rar"/>
<property name="validation.ear.dir" value="${build}/ear"/>
- <property name="validation.ear.war"
+ <property name="validation.ear.war"
value="${validation.ear.dir}/${testName}.war"/>
- <property name="validation.ear.jar"
+ <property name="validation.ear.jar"
value="${validation.ear.dir}/${testName}-ejb.jar"/>
- <property name="validation.ear.rar"
+ <property name="validation.ear.rar"
value="${validation.ear.dir}/${testName}.rar"/>
- <property name="validation.ear.car"
+ <property name="validation.ear.car"
value="${validation.ear.dir}/${testName}-client.jar"/>
- <property name="validation.ear"
+ <property name="validation.ear"
value="${validation.ear.dir}/${testName}.ear"/>
<property name="validation.wlsEar.dir" value="${build}/wlsEar"/>
- <property name="validation.wlsEar.wlsRar"
+ <property name="validation.wlsEar.wlsRar"
value="${validation.wlsEar.dir}/${testName}.rar"/>
- <property name="validation.wlsEar"
+ <property name="validation.wlsEar"
value="${validation.wlsEar.dir}/${testName}.ear"/>
<property name="validation.wlsEar2.dir" value="${build}/wlsEar2"/>
- <property name="validation.wlsEar2"
+ <property name="validation.wlsEar2"
value="${validation.wlsEar2.dir}/${testName}.ear"/>
<property name="validation.wlsEar3.dir" value="${build}/wlsEar3"/>
- <property name="validation.wlsEar3.wlsRar"
+ <property name="validation.wlsEar3.wlsRar"
value="${validation.wlsEar3.dir}/${testName}.rar"/>
- <property name="validation.wlsEar3"
+ <property name="validation.wlsEar3"
value="${validation.wlsEar3.dir}/${testName}.ear"/>
<mkdir dir="${build}/war"/>
@@ -106,7 +106,7 @@
<jar destfile="${validation.ear.war}" basedir="${basedir}/ear/war"/>
<jar destfile="${validation.ear.jar}" basedir="${basedir}/ear/ejb"/>
<jar destfile="${validation.ear.rar}" basedir="${basedir}/ear/rar"/>
- <jar destfile="${validation.ear.car}" basedir="${basedir}/ear/car"
+ <jar destfile="${validation.ear.car}" basedir="${basedir}/ear/car"
manifest="${basedir}/ear/car/META-INF/MANIFEST.MF"/>
<copy todir="${validation.ear.dir}">
<fileset dir="${basedir}/ear" includes="META-INF/*"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
index 7fc4880..821de55 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
@@ -37,13 +37,13 @@
<env-entry>
<description>beas env entryr</description>
<env-entry-name>BEAS</env-entry-name>
- <env-entry-type>java.lang.Double </env-entry-type>
- <env-entry-value>100.0</env-entry-value>
+ <env-entry-type>java.lang.Double </env-entry-type>
+ <env-entry-value>100.0</env-entry-value>
</env-entry>
<env-entry>
<env-entry-name>MSFT</env-entry-name>
- <env-entry-type>java.lang.Double </env-entry-type>
- <env-entry-value>150.0</env-entry-value>
+ <env-entry-type>java.lang.Double </env-entry-type>
+ <env-entry-value>150.0</env-entry-value>
</env-entry>
<ejb-ref>
<description>enroller ref</description>
@@ -548,7 +548,7 @@
<container-transaction>
<method>
<ejb-name>statefulSession</ejb-name>
- <method-name>*</method-name>
+ <method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
@@ -563,6 +563,6 @@
</method-params>
</method>
</exclude-list>
- </assembly-descriptor>
+ </assembly-descriptor>
<ejb-client-jar>cart-ejb-client.jar</ejb-client-jar>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/sun-ejb-jar.xml
index 4064abc..b006c32 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/sun-ejb-jar.xml
@@ -23,7 +23,7 @@
<unique-id>1</unique-id>
<ejb>
<ejb-name>statefulSession</ejb-name>
- <jndi-name>MyTraderBean</jndi-name>
+ <jndi-name>MyTraderBean</jndi-name>
</ejb>
</enterprise-beans>
<security-role-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml
index f8a2d99..cc6ce95 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml
@@ -58,7 +58,7 @@
<classes dir="${build}"/>
</war>
-
+
<copy file="application.xml" todir="${build}/archive/META-INF"/>
<copy file="${all.war}" todir="${build}/archive"/>
<jar destfile="${all.ear}" basedir="${build}/archive"/>
@@ -92,16 +92,16 @@
</antcall>
</target>
- <target name="enable.asadmin">
+ <target name="enable.asadmin">
<antcall target="common.enable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
<target name="disable.asadmin">
<antcall target="common.disable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
@@ -373,7 +373,7 @@
<param name="extra.args" value="${customized.config.client.args}"/>
</antcall>
</target>
-
+
<target name="check.added.customization.and.suppressed.original.config">
<antcall target="check.additive.customization">
<param name="log.id" value="${log.id}.1"/>
@@ -396,7 +396,7 @@
<param name="extra.args" value="-param builtin=in-app"/>
</antcall>
</target>
-
+
<target name="clobber" depends="clean">
<delete file="${all.ear}"/>
<delete dir="${build}"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml
index 99fcd9b..ce8391d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml
@@ -23,40 +23,40 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="earwithwar" target="private-all">
- <property name="build" value="${build}/earwithwar"/>
- </ant>
- <ant dir="earwithejb" target="private-all">
- <property name="build" value="${build}/earwithejb"/>
- </ant>
- <!--ant dir="wstoejb" target="private-all">
- <property name="build" value="${build}/wstoejb"/>
- </ant>
- <ant dir="earwithall" target="private-all">
- <property name="build" value="${build}/earwithall"/>
- </ant-->
- <ant dir="earwithall2" target="private-all">
- <property name="build" value="${build}/earwithall2"/>
- </ant>
- <ant dir="uniquecr" target="private-all">
- <property name="build" value="${build}/uniquecr"/>
- </ant>
- <ant dir="libClassPath" target="private-all">
- <property name="build" value="${build}/libClassPath"/>
- </ant>
-
+ <target name="private-all">
+ <ant dir="earwithwar" target="private-all">
+ <property name="build" value="${build}/earwithwar"/>
+ </ant>
+ <ant dir="earwithejb" target="private-all">
+ <property name="build" value="${build}/earwithejb"/>
+ </ant>
+ <!--ant dir="wstoejb" target="private-all">
+ <property name="build" value="${build}/wstoejb"/>
+ </ant>
+ <ant dir="earwithall" target="private-all">
+ <property name="build" value="${build}/earwithall"/>
+ </ant-->
+ <ant dir="earwithall2" target="private-all">
+ <property name="build" value="${build}/earwithall2"/>
+ </ant>
+ <ant dir="uniquecr" target="private-all">
+ <property name="build" value="${build}/uniquecr"/>
+ </ant>
+ <ant dir="libClassPath" target="private-all">
+ <property name="build" value="${build}/libClassPath"/>
+ </ant>
+
<ant dir="libclasspath2" target="private-all">
- <property name="build" value="${build}/libclasspath2"/>
- </ant>
- <ant dir="manifestClassPath" target="private-all">
- <property name="build" value="${build}/manifestClassPath"/>
- </ant>
+ <property name="build" value="${build}/libclasspath2"/>
+ </ant>
+ <ant dir="manifestClassPath" target="private-all">
+ <property name="build" value="${build}/manifestClassPath"/>
+ </ant>
<ant dir="appmgt" target="private-all">
<property name="build" value="${build}/appmgt"/>
</ant>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml
index 3e4d9f3..500dc24 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml
@@ -24,68 +24,68 @@
<project name="HelloServiceWS" default="all" basedir=".">
&commonBuild;
-
+
<property name="testName" value="SayHelloWS"/>
<property name="archivedir" value="${build}/archives"/>
<target name="prepare" depends="init">
- <property name="binary" value="${build}/WEB-INF/classes"/>
- <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
- <mkdir dir="${binary}" />
- <mkdir dir="${wsdl}"/>
- <mkdir dir="${build}/ejb"/>
- <property name="portable.war" value="${archivedir}/sayhello-portable.war"/>
- <property name="portable.jar" value="${archivedir}/statelesshello-portable.jar"/>
- <property name="portable.ear" value="${archivedir}/sayhello-portable.ear"/>
- <property name="all.war" value="${archivedir}/sayhello.war"/>
- <property name="all.jar" value="${archivedir}/statelesshello.jar"/>
- <property name="all.ear" value="${archivedir}/sayhello.ear"/>
- <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
+ <property name="binary" value="${build}/WEB-INF/classes"/>
+ <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
+ <mkdir dir="${binary}" />
+ <mkdir dir="${wsdl}"/>
+ <mkdir dir="${build}/ejb"/>
+ <property name="portable.war" value="${archivedir}/sayhello-portable.war"/>
+ <property name="portable.jar" value="${archivedir}/statelesshello-portable.jar"/>
+ <property name="portable.ear" value="${archivedir}/sayhello-portable.ear"/>
+ <property name="all.war" value="${archivedir}/sayhello.war"/>
+ <property name="all.jar" value="${archivedir}/statelesshello.jar"/>
+ <property name="all.ear" value="${archivedir}/sayhello.ear"/>
+ <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
</target>
-
+
<target name="compile" depends="prepare">
<javac srcdir="statelesshello" destdir="${build}/ejb">
<classpath refid="gfv3.classpath"/>
</javac>
- <javac srcdir="helloservice" destdir="${binary}">
+ <javac srcdir="helloservice" destdir="${binary}">
<classpath refid="gfv3.classpath"/>
</javac>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
- </exec>
+ <echo message="invoking wscompile to generate wsdl file"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
+ </exec>
</target>
-
+
<target name="assemble" depends="compile">
- <copy file="web.xml" todir="${build}/WEB-INF"/>
- <copy file="webservices.xml" todir="${build}/WEB-INF"/>
- <jar destfile="${portable.war}" basedir="${build}"/>
- <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
- <jar destfile="${all.war}" basedir="${build}"/>
+ <copy file="web.xml" todir="${build}/WEB-INF"/>
+ <copy file="webservices.xml" todir="${build}/WEB-INF"/>
+ <jar destfile="${portable.war}" basedir="${build}"/>
+ <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
+ <jar destfile="${all.war}" basedir="${build}"/>
- <mkdir dir="${build}/ejb/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/ejb/META-INF"/>
- <jar destfile="${portable.jar}" basedir="${build}/ejb"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/ejb/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}" basedir="${build}/ejb"/>
+ <mkdir dir="${build}/ejb/META-INF"/>
+ <copy file="ejb-jar.xml" todir="${build}/ejb/META-INF"/>
+ <jar destfile="${portable.jar}" basedir="${build}/ejb"/>
+ <copy file="sun-ejb-jar.xml" todir="${build}/ejb/META-INF" failonerror="false"/>
+ <jar destfile="${all.jar}" basedir="${build}/ejb"/>
- <mkdir dir="${build}/plan"/>
- <copy file="sun-ejb-jar.xml" tofile="${build}/plan/statelesshello-portable.jar.sun-ejb-jar.xml"/>
- <copy file="sun-web.xml" tofile="${build}/plan/sayhello-portable.war.sun-web.xml"/>
- <jar destfile="${deployplan.jar}" basedir="${build}/plan"/>
+ <mkdir dir="${build}/plan"/>
+ <copy file="sun-ejb-jar.xml" tofile="${build}/plan/statelesshello-portable.jar.sun-ejb-jar.xml"/>
+ <copy file="sun-web.xml" tofile="${build}/plan/sayhello-portable.war.sun-web.xml"/>
+ <jar destfile="${deployplan.jar}" basedir="${build}/plan"/>
- <mkdir dir="${build}/ear"/>
- <mkdir dir="${build}/ear/META-INF"/>
- <copy file="application.xml" todir="${build}/ear/META-INF"/>
- <copy file="${all.war}" todir="${build}/ear"/>
- <copy file="${all.jar}" todir="${build}/ear"/>
- <jar destfile="${all.ear}" basedir="${build}/ear"/>
- <delete file="${build}/ear/sayhello.war"/>
- <delete file="${build}/ear/statelesshello.jar"/>
- <delete file="${build}/ear/META-INF/application.xml"/>
- <copy file="portable-app.xml" tofile="${build}/ear/META-INF/application.xml"/>
- <copy file="${portable.war}" todir="${build}/ear"/>
- <copy file="${portable.jar}" todir="${build}/ear"/>
- <jar destfile="${portable.ear}" basedir="${build}/ear"/>
+ <mkdir dir="${build}/ear"/>
+ <mkdir dir="${build}/ear/META-INF"/>
+ <copy file="application.xml" todir="${build}/ear/META-INF"/>
+ <copy file="${all.war}" todir="${build}/ear"/>
+ <copy file="${all.jar}" todir="${build}/ear"/>
+ <jar destfile="${all.ear}" basedir="${build}/ear"/>
+ <delete file="${build}/ear/sayhello.war"/>
+ <delete file="${build}/ear/statelesshello.jar"/>
+ <delete file="${build}/ear/META-INF/application.xml"/>
+ <copy file="portable-app.xml" tofile="${build}/ear/META-INF/application.xml"/>
+ <copy file="${portable.war}" todir="${build}/ear"/>
+ <copy file="${portable.jar}" todir="${build}/ear"/>
+ <jar destfile="${portable.ear}" basedir="${build}/ear"/>
</target>
<target name="deploy.asadmin" depends="prepare">
@@ -93,10 +93,10 @@
<param name="arg.list" value="--name ${testName} ${all.ear}"/>
<param name="testName" value="${testName}"/>
</antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
+ <echo message="Create client webservices artifacts"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
+ </exec>
</target>
<target name="redeploy.asadmin" depends="prepare">
@@ -104,10 +104,10 @@
<param name="arg.list" value="--name ${testName} ${all.ear}"/>
<param name="testName" value="${testName}"/>
</antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
+ <echo message="Create client webservices artifacts"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
+ </exec>
</target>
<target name="undeploy.asadmin">
@@ -176,7 +176,7 @@
<javaWithResult
fork="true"
failonerror="false"
- jvm="${JAVA}"
+ jvm="${JAVA}"
classname="staticstubclient.SayHelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml
index a99d9c0..894789a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
+ <service
+ name="SayHelloService"
+ targetNamespace="urn:DeploymentWebServiceTest"
+ typeNamespace="urn:DeploymentWebServiceTest"
packageName="helloservice">
<interface name="helloservice.SayHello"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java
index 0774d61..d25335b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHello.java
@@ -15,7 +15,7 @@
*/
package helloservice;
-
+
import java.rmi.Remote;
import java.rmi.RemoteException;
@@ -23,11 +23,11 @@
* This is a minimum WebService interface
*/
public interface SayHello extends Remote {
-
- /*
- * @return a hello string
- */
- public String sayHello(String name) throws RemoteException;
-
+
+ /*
+ * @return a hello string
+ */
+ public String sayHello(String name) throws RemoteException;
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
index ed449a6..93e8598 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
@@ -24,32 +24,32 @@
public class SayHelloImpl implements SayHello {
- public String message ="Message from servlet is : Bonjour ";
+ public String message ="Message from servlet is : Bonjour ";
- public String sayHello(String s) throws RemoteException {
- try {
+ public String sayHello(String s) throws RemoteException {
+ try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref = ic.lookup("java:comp/env/ejb/MyStatelesshello");
- System.out.println("Looked up home!!");
+ // create EJB using factory from container
+ java.lang.Object objref = ic.lookup("java:comp/env/ejb/MyStatelesshello");
+ System.out.println("Looked up home!!");
- StatelesshelloHome home =
- (StatelesshelloHome) PortableRemoteObject.narrow(
- objref, StatelesshelloHome.class);
- System.out.println("Narrowed home!!");
+ StatelesshelloHome home =
+ (StatelesshelloHome) PortableRemoteObject.narrow(
+ objref, StatelesshelloHome.class);
+ System.out.println("Narrowed home!!");
- Statelesshello hr = home.create();
- System.out.println("Got the EJB!!");
+ Statelesshello hr = home.create();
+ System.out.println("Got the EJB!!");
- // invoke method on the EJB
- message = hr.sayStatelesshello() + ";" + message + s;
- } catch (Exception e) {
- System.out.println("Servlet sayHelloImpl recd exception : " +
- e.getMessage());
- e.printStackTrace();
- }
- return message;
- }
+ // invoke method on the EJB
+ message = hr.sayStatelesshello() + ";" + message + s;
+ } catch (Exception e) {
+ System.out.println("Servlet sayHelloImpl recd exception : " +
+ e.getMessage());
+ e.printStackTrace();
+ }
+ return message;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
index 4933850..74bed76 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
@@ -17,7 +17,7 @@
package statelesshello;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -25,26 +25,26 @@
public class StatelesshelloEJB implements SessionBean {
private SessionContext sc;
-
+
public StatelesshelloEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
}
public String sayStatelesshello() throws EJBException {
- System.out.println("StatelesshelloEJB is saying hello to user\n");
+ System.out.println("StatelesshelloEJB is saying hello to user\n");
return("A Big hello from stateless HELLO");
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java
index 8010064..d61f78e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/staticstubclient/SayHelloClient.java
@@ -26,28 +26,28 @@
public static void main(String[] args) {
System.out.println("Endpoint address = " + args[0]);
- boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
+ boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
try {
Stub stub = createProxy();
stub._setProperty
(javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY,
- args[0]);
- SayHello hello = (SayHello)stub;
+ args[0]);
+ SayHello hello = (SayHello)stub;
System.out.println(hello.sayHello("Jerome !"));
} catch (Exception ex) {
- if(testPositive) {
- ex.printStackTrace();
- System.exit(-1);
- } else {
- System.out.println("Exception recd as expected");
- }
- }
- System.exit(0);
- }
+ if(testPositive) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } else {
+ System.out.println("Exception recd as expected");
+ }
+ }
+ System.exit(0);
+ }
private static Stub createProxy() {
// Note: MyHelloService_Impl is implementation-specific.
- return
+ return
(Stub) (new SayHelloService_Impl().getSayHelloPort());
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml
index f6eff39..873fd79 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml
@@ -21,6 +21,6 @@
<sun-web-app>
<ejb-ref>
<ejb-ref-name>ejb/MyStatelesshello</ejb-ref-name>
- <jndi-name>ejb/MyStatelesshello</jndi-name>
+ <jndi-name>ejb/MyStatelesshello</jndi-name>
</ejb-ref>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java
index 34e9660..49155e2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java
index 1efe77b..a7a9a25 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder.java
@@ -28,7 +28,7 @@
TestDeplOrder client = new TestDeplOrder();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String path = args[0];
@@ -41,7 +41,7 @@
} else {
fail();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java
index 7216a98..712f66d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/TestDeplOrder2.java
@@ -28,7 +28,7 @@
TestDeplOrder2 client = new TestDeplOrder2();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String path = args[0];
@@ -41,7 +41,7 @@
} else {
fail();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml
index 5b5c5d7..f31c63c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml
@@ -27,7 +27,7 @@
</module>
<!--
<module>
- <java>app-client-ic.jar</java>
+ <java>app-client-ic.jar</java>
</module>
-->
<module>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml
index 0f3ce51..e96bb20 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml
@@ -129,7 +129,7 @@
<param name="testName" value="${appName}"/>
</antcall>
</target>
-
+
<target name="deploy.asadmin.war" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--deploymentorder 102 ${testWar}"/>
@@ -200,9 +200,9 @@
</antcall>
</target>
- <target name="enable.asadmin">
+ <target name="enable.asadmin">
<antcall target="common.enable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${appName}"/>
<param name="testName" value="${appName}"/>
</antcall>
@@ -210,7 +210,7 @@
<target name="disable.asadmin">
<antcall target="common.disable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${appName}"/>
<param name="testName" value="${appName}"/>
</antcall>
@@ -248,7 +248,7 @@
</antcall>
</target>
- <!-- as it's not easy to implement the undeploy-stream using the
+ <!-- as it's not easy to implement the undeploy-stream using the
current JSR88 Deployer, let's just undeploy all -->
<target name="undeploy-stream.jsr88">
<antcall target="common.undeploy.jsr88">
@@ -289,7 +289,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="init">
<echo message="TestClient ${arg.list}"/>
<javaWithResult
@@ -412,15 +412,15 @@
<target name="addClusterRefs" depends="prepare" if="doCluster">
<!-- create-app-ref to cluster -->
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="create-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${appName}"/>
</antcall>
</target>
-
+
<target name="delClusterRefs" depends="prepare" if="doCluster">
<!-- delete-app-ref to remote instance server -->
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="delete-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${appName}"/>
</antcall>
</target>
@@ -431,7 +431,7 @@
<!-- deployment to Domain -->
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target domain ${all.ear}"/>
</antcall>
@@ -452,7 +452,7 @@
<antcall target="addInstanceRef"/>
<antcall target="addClusterRefs"/>
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --force=true --target domain ${all.ear}"/>
</antcall>
<antcall target="run.positive">
@@ -480,7 +480,7 @@
<!-- undeploy from Domain -->
<antcall target="common.run.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="undeploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target domain ${appName}"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
index 0981dcb..d00efe9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
@@ -21,11 +21,11 @@
public interface JustBean extends EJBObject {
- public void
- log(String message)
+ public void
+ log(String message)
throws RemoteException;
public String[]
- findAllMarbles()
+ findAllMarbles()
throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
index 539fb70..3c97ab6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
@@ -19,11 +19,11 @@
import java.rmi.RemoteException;
import jakarta.ejb.EJBHome;
import jakarta.ejb.CreateException;
-
+
public interface JustBeanHome extends EJBHome {
-
- public JustBean
- create()
+
+ public JustBean
+ create()
throws RemoteException, CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
index 42b3df8..713efbf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
@@ -21,25 +21,25 @@
import jakarta.ejb.SessionContext;
public class JustSessionBean implements SessionBean {
-
+
private SessionContext ctx;
-
- public void
- ejbCreate()
- throws RemoteException
+
+ public void
+ ejbCreate()
+ throws RemoteException
{
log("JustSessionBean.ejbCreate()...");
}
- public void
- ejbRemove()
- throws RemoteException
+ public void
+ ejbRemove()
+ throws RemoteException
{
log("JustSessionBean.ejbRemove()...");
}
-
+
public void
- log(String message)
+ log(String message)
{
Log.log(message);
}
@@ -53,43 +53,43 @@
strArray[1] = "You have lost all your marbles.";
return strArray;
}
-
-
- /**
+
+
+ /**
* ejbDestroy - called by the Container before this bean is destroyed.
- */
- public void
- ejbDestroy()
+ */
+ public void
+ ejbDestroy()
{
log("JustSessionBean.ejbDestroy()...");
}
-
- /**
- * ejbActivate - called by the Container after this bean instance
+
+ /**
+ * ejbActivate - called by the Container after this bean instance
* is activated from its passive state.
*/
- public void
- ejbActivate()
+ public void
+ ejbActivate()
{
log("JustSessionBean.ejbActivate()...");
}
-
+
/**
- * ejbPassivate - called by the Container before this bean instance
- * is put in passive state.
- */
- public void
- ejbPassivate()
+ * ejbPassivate - called by the Container before this bean instance
+ * is put in passive state.
+ */
+ public void
+ ejbPassivate()
{
log("JustSessionBean.ejbPassivate()...");
}
-
+
/**
* setSessionContext - called by the Container after creation of this
* bean instance.
*/
- public void
- setSessionContext(SessionContext context)
+ public void
+ setSessionContext(SessionContext context)
{
log("JustSessionBean.setSessionContext(ctx)... ctx = " + ctx);
ctx = context;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java
index f3b5e55..34aa4f4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/Log.java
@@ -16,7 +16,7 @@
package justbean;
-public class Log implements java.io.Serializable
+public class Log implements java.io.Serializable
{
public static void
log (String message)
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java
index 9d8b29f..e0b7896 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justweb/JustWebServlet.java
@@ -52,7 +52,7 @@
}
catch (Exception ex) {
ex.printStackTrace();
- }
+ }
System.out.println("JustWebServlet.service()... JustBean created.");
System.out.println("USERNAME = " + getInitParameter("USERNAME"));
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml
index 49acd2c..866cc68 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml
@@ -20,7 +20,7 @@
<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
]>
-
+
<project name="statelesshello" default="all" basedir=".">
&commonBuild;
@@ -28,51 +28,51 @@
<property name="testName" value="StatelessHelloEjb"/>
<property name="archivedir" value="${build}/archives"/>
<target name="prepare" depends="init">
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- <property name="portable.ear" value="${archivedir}/earwithejb-portable.ear"/>
- <property name="portable.jar" value="${archivedir}/earwithejb-portable.jar"/>
- <property name="all.ear" value="${archivedir}/earwithejb.ear"/>
- <property name="all.jar" value="${archivedir}/earwithejb.jar"/>
- <property name="deployplan.jar" value="${archivedir}/earwithejb-deployplan.jar"/>
+ <mkdir dir="${build}" />
+ <mkdir dir="${archivedir}" />
+ <property name="portable.ear" value="${archivedir}/earwithejb-portable.ear"/>
+ <property name="portable.jar" value="${archivedir}/earwithejb-portable.jar"/>
+ <property name="all.ear" value="${archivedir}/earwithejb.ear"/>
+ <property name="all.jar" value="${archivedir}/earwithejb.jar"/>
+ <property name="deployplan.jar" value="${archivedir}/earwithejb-deployplan.jar"/>
</target>
-
+
<target name="assemble" depends="prepare">
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-ejb-jar.xml"/>
- </jar>
+ <jar destfile="${deployplan.jar}">
+ <fileset dir="${basedir}" includes="sun-ejb-jar.xml"/>
+ </jar>
- <mkdir dir="${build}/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <jar destfile="${portable.jar}">
- <fileset dir="../../build/ejb/statelesshello"
+ <mkdir dir="${build}/META-INF"/>
+ <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
+ <jar destfile="${portable.jar}">
+ <fileset dir="../../build/ejb/statelesshello"
excludes="**/archives/**"/>
- <fileset dir="${build}"
+ <fileset dir="${build}"
excludes="**/archives/**"/>
- </jar>
+ </jar>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}">
- <fileset dir="../../build/ejb/statelesshello"/>
- <fileset dir="${build}"
+ <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
+ <jar destfile="${all.jar}">
+ <fileset dir="../../build/ejb/statelesshello"/>
+ <fileset dir="${build}"
excludes="**/archives/**"/>
- </jar>
+ </jar>
- <mkdir dir="${build}/META-INF"/>
- <copy file="portable-app.xml" tofile="${build}/META-INF/application.xml"/>
- <copy file="${portable.jar}" todir="${build}"/>
- <jar destfile="${portable.ear}" basedir="${build}" excludes="**ejb-jar.xml"/>
+ <mkdir dir="${build}/META-INF"/>
+ <copy file="portable-app.xml" tofile="${build}/META-INF/application.xml"/>
+ <copy file="${portable.jar}" todir="${build}"/>
+ <jar destfile="${portable.ear}" basedir="${build}" excludes="**ejb-jar.xml"/>
- <delete file="${build}/earwithejb-portable.jar"/>
- <delete file="${build}/META-INF/application.xml"/>
- <delete file="${build}/META-INF/sun-ejb-jar.xml"/>
- <delete file="${build}/META-INF/ejb-jar.xml"/>
- <delete file="${build}/earwithejb-portable.jar"/>
- <copy file="application.xml" todir="${build}/META-INF"/>
- <copy file="alt-ejbjar.xml" todir="${build}"/>
- <copy file="sun-alt-ejbjar.xml" todir="${build}" failonerror="false"/>
- <copy file="${all.jar}" todir="${build}"/>
- <jar destfile="${all.ear}" basedir="${build}" excludes="**/archives/**"/>
+ <delete file="${build}/earwithejb-portable.jar"/>
+ <delete file="${build}/META-INF/application.xml"/>
+ <delete file="${build}/META-INF/sun-ejb-jar.xml"/>
+ <delete file="${build}/META-INF/ejb-jar.xml"/>
+ <delete file="${build}/earwithejb-portable.jar"/>
+ <copy file="application.xml" todir="${build}/META-INF"/>
+ <copy file="alt-ejbjar.xml" todir="${build}"/>
+ <copy file="sun-alt-ejbjar.xml" todir="${build}" failonerror="false"/>
+ <copy file="${all.jar}" todir="${build}"/>
+ <jar destfile="${all.ear}" basedir="${build}" excludes="**/archives/**"/>
</target>
<target name="deploy.asadmin" depends="prepare">
@@ -131,7 +131,7 @@
<target name="deploy.autodeploy">
</target>
-
+
<target name="run" depends="run.positive"/>
<target name="run.positive" depends="init,setOrbPort">
@@ -189,7 +189,7 @@
<javaWithResult
fork="true"
failonerror="false"
- jvm="${JAVA}"
+ jvm="${JAVA}"
classname="standaloneclient.HelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
@@ -205,7 +205,7 @@
<path location="${archivedir}/earwithejb.jar"/>
</classpath>
- <arg line="${arg.list}"/>
+ <arg line="${arg.list}"/>
</javaWithResult>
<antcall target="processResult">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml
index 24bbdb7..25e3753 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml
@@ -165,7 +165,7 @@
<param name="log.id" value="${log.id}"/>
</antcall>
</target>
-
+
<target name="runclient" depends="init">
<javaWithResult
fork="true"
@@ -211,13 +211,13 @@
<antcall target="run.negative">
<param name="log.id" value="3"/>
<param name="desc" value="ear/earwithwar Test asadmin disable"/>
- </antcall>
+ </antcall>
<antcall target="enable.asadmin"/>
<antcall target="run.positive">
<param name="log.id" value="4"/>
<param name="desc" value="ear/earwithwar Test asadmin enable"/>
- </antcall>
+ </antcall>
<antcall target="undeploy.asadmin"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/client/i18n/simple/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/client/i18n/simple/TestClient.java
index 4232902..04f101a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/client/i18n/simple/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/client/i18n/simple/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/descriptor/sun-web.xml
index f7f8627..c908797 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/descriptor/sun-web.xml
@@ -22,8 +22,8 @@
<sun-web-app>
<session-config>
<session-manager/>
- </session-config>
- <jsp-config/>
+ </session-config>
+ <jsp-config/>
<locale-charset-info default-locale="ja">
<locale-charset-map charset="EUC-JP" locale="ja" agent="Mozilla/4.7 [en] (X11; I; SunOS 5.8 sun4u)">
<description>Charset mapping for Japanese locale</description>
@@ -36,11 +36,11 @@
</locale-charset-map>
<locale-charset-map charset="Shift_JIS" locale="ja" agent="Mozilla/4.79 [en] (Windows NT 5.0; U)">
<description>Charset mapping for Japanese locale</description>
- </locale-charset-map>
+ </locale-charset-map>
<locale-charset-map charset="ISO-8859-1" locale="de_DE">
<description>Charset mapping for German locale</description>
</locale-charset-map>
<parameter-encoding form-hint-field="charsetval" />
- </locale-charset-info>
+ </locale-charset-info>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml
index 8767c14..8403de1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/build.xml
@@ -23,30 +23,30 @@
<project name="i18n-simple" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
+ <target name="prepare" depends="init">
<mkdir dir="${build}" />
</target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="samples" destdir="${build}">
- <classpath>
- <pathelement location="${inst}/lib/j2ee.jar"/>
- <pathelement location="${inst}/lib/appserv-rt.jar"/>
- <pathelement location="${build}/WEB-INF/lib/library.jar"/>
- </classpath>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <jar destfile="${archivedir}/a/b/i18n-simple.jar"
- basedir="${build}"/>
- </target>
- <target name="private-all" depends="assemble">
- </target>
+ <target name="compile" depends="prepare">
+ <javac srcdir="samples" destdir="${build}">
+ <classpath>
+ <pathelement location="${inst}/lib/j2ee.jar"/>
+ <pathelement location="${inst}/lib/appserv-rt.jar"/>
+ <pathelement location="${build}/WEB-INF/lib/library.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="assemble" depends="compile">
+ <jar destfile="${archivedir}/a/b/i18n-simple.jar"
+ basedir="${build}"/>
+ </target>
+
+ <target name="private-all" depends="assemble">
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java
index 56d16f2..b84b14c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java
@@ -26,110 +26,110 @@
/**
* A simple message taghandler to display localized message from a resource bundle based on jsp request
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class MessageTag extends TagSupport {
- private String key = null;
- private String bundleName = null;
- private String language = null;
- private String country = null;
- private String variant = null;
+ private String key = null;
+ private String bundleName = null;
+ private String language = null;
+ private String country = null;
+ private String variant = null;
- /**
- * Set the user preferred language
- */
- public void setLanguage(String lang) {
+ /**
+ * Set the user preferred language
+ */
+ public void setLanguage(String lang) {
this.language = lang;
- }
-
- /**
- * Get the user preferred language
- */
- public String getLanguage() {
- return language;
- }
-
- /**
- * Set the user preferred country
- */
- public void setCountry(String country) {
- this.country = country;
- }
-
- /**
- * Get the user preferred country
- */
- public String getCountry() {
- return country;
}
/**
- * Set the user preferred variant
- */
+ * Get the user preferred language
+ */
+ public String getLanguage() {
+ return language;
+ }
+
+ /**
+ * Set the user preferred country
+ */
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ /**
+ * Get the user preferred country
+ */
+ public String getCountry() {
+ return country;
+ }
+
+ /**
+ * Set the user preferred variant
+ */
public void setVariant(String variant) {
- this.variant = variant;
- }
-
- /**
- * Get the user preferred variant
- */
- public String getVariant() {
- return variant;
+ this.variant = variant;
}
/**
- * Set the user preferred resource bundle name
- */
- public void setName (String name) {
- this.bundleName = name;
- }
+ * Get the user preferred variant
+ */
+ public String getVariant() {
+ return variant;
+ }
/**
- * Set the message key required to retrieve message from the resource bundle
- */
+ * Set the user preferred resource bundle name
+ */
+ public void setName (String name) {
+ this.bundleName = name;
+ }
+
+ /**
+ * Set the message key required to retrieve message from the resource bundle
+ */
public void setKey(String key) {
this.key = key;
}
/**
- * Get the message key required to retrieve message from the resource bundle
- */
+ * Get the message key required to retrieve message from the resource bundle
+ */
public String getKey() {
return key;
}
/**
- * Gets the user preferred resource bundle name
- */
- public String getName() {
- return bundleName;
- }
+ * Gets the user preferred resource bundle name
+ */
+ public String getName() {
+ return bundleName;
+ }
/**
- * Will be called by the JSP Engine when it encounters the start of the tag
- */
+ * Will be called by the JSP Engine when it encounters the start of the tag
+ */
public int doStartTag() throws JspTagException {
return EVAL_BODY_INCLUDE;
}
/**
- * Will be called by the JSP Engine when it encounters the end of the tag
- */
+ * Will be called by the JSP Engine when it encounters the end of the tag
+ */
public int doEndTag() throws JspTagException {
try {
- if(language != null) {
- if( country == null)
- country = "";
- if(variant == null)
- variant = "";
- } else language = "en";
- java.util.Locale locale = new Locale(language, country, variant);
- ResourceBundle bundle = ResourceBundle.getBundle(bundleName, locale);
- String message = bundle.getString(key);
- pageContext.getOut().write("Message from resource bundle:" + message);
- } catch(Exception e) {
+ if(language != null) {
+ if( country == null)
+ country = "";
+ if(variant == null)
+ variant = "";
+ } else language = "en";
+ java.util.Locale locale = new Locale(language, country, variant);
+ ResourceBundle bundle = ResourceBundle.getBundle(bundleName, locale);
+ String message = bundle.getString(key);
+ pageContext.getOut().write("Message from resource bundle:" + message);
+ } catch(Exception e) {
throw new JspTagException("Error: " + e);
}
return EVAL_PAGE;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java
index 0840fc0..0ed6eaf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java
@@ -16,7 +16,7 @@
/**
* Servlet forwarded from SimpleI18nServlet
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class ForwardedServlet extends HttpServlet {
@@ -40,11 +40,11 @@
*/
protected void processRequest(HttpServletRequest req, HttpServletResponse res)
throws ServletException, java.io.IOException {
- String charsetval = req.getParameter("charsetval");
+ String charsetval = req.getParameter("charsetval");
req.setCharacterEncoding(charsetval);
res.setContentType("text/html;charset=" + charsetval + "");
- java.io.PrintWriter out = res.getWriter();
- String name = req.getParameter("name");
+ java.io.PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
out.println("<html>");
out.println("<head>");
out.println("<title>Servlet</title>");
@@ -52,8 +52,8 @@
out.println("<body>");
out.println("<H3> This is the name from forwarded servlet </H3>");
out.println("<H4> The name entered was:" + name + "</h4>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
out.println("</body>");
out.println("</html>");
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java
index c315b46..dc7f9e5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java
@@ -17,7 +17,7 @@
/**
* Servlet included in SimpleI18nServlet
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class IncludedServlet extends HttpServlet {
@@ -42,15 +42,15 @@
protected void processRequest(HttpServletRequest req, HttpServletResponse res)
throws ServletException, java.io.IOException {
try {
- java.io.PrintWriter out = res.getWriter();
- String name = req.getParameter("name");
+ java.io.PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
- out.println("<H3> This is the name from included servlet </H3>");
- out.println("<H4> The name entered was:" + name + "</h4>");
+ out.println("<H3> This is the name from included servlet </H3>");
+ out.println("<H4> The name entered was:" + name + "</h4>");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Handles the HTTP <code>GET</code> method.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java
index 4e78043..e014977 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java
@@ -30,7 +30,7 @@
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
@@ -52,15 +52,15 @@
- String name = req.getParameter("name");
+ String name = req.getParameter("name");
- String charsetval = req.getCharacterEncoding();
+ String charsetval = req.getCharacterEncoding();
if (charsetval != null) {
- res.setContentType("text/html;charset=" + charsetval + "");
+ res.setContentType("text/html;charset=" + charsetval + "");
- } else res.setContentType("text/html;charset=UTF-8");
+ } else res.setContentType("text/html;charset=UTF-8");
PrintWriter out = res.getWriter();
@@ -82,9 +82,9 @@
out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
+ out.println("</body></html>");
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java
index c4aa1d7..45cab0e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java
@@ -21,9 +21,9 @@
public class SimpleFilter implements Filter {
- private FilterConfig filterConfig = null;
- private boolean usefilter = false;
- private String encoding = null;
+ private FilterConfig filterConfig = null;
+ private boolean usefilter = false;
+ private String encoding = null;
/**
* Called by the web container to indicate to a filter that it is being placed into service
@@ -31,16 +31,16 @@
* @param filterConfig The filter configuration object
*/
public void init(FilterConfig filterConfig) throws ServletException {
- try {
- this.filterConfig = filterConfig;
- String param = filterConfig.getInitParameter("usefilter");
- this.encoding = filterConfig.getInitParameter("encoding");
- if (param.equals("true")) {
- this.usefilter = true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+ try {
+ this.filterConfig = filterConfig;
+ String param = filterConfig.getInitParameter("usefilter");
+ this.encoding = filterConfig.getInitParameter("encoding");
+ if (param.equals("true")) {
+ this.usefilter = true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -51,18 +51,18 @@
* @param chain The filter chain we are processing
*/
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
- throws IOException, ServletException {
- try {
- if (usefilter) {
- String encoding = getEncoding(req);
- if (encoding != null) {
- req.setCharacterEncoding(encoding);
- }
- }
- chain.doFilter(req, res);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ throws IOException, ServletException {
+ try {
+ if (usefilter) {
+ String encoding = getEncoding(req);
+ if (encoding != null) {
+ req.setCharacterEncoding(encoding);
+ }
+ }
+ chain.doFilter(req, res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -78,7 +78,7 @@
* Called by the web container to indicate to a filter that it is being taken out of service.
*/
public void destroy() {
- this.encoding = null;
- this.filterConfig = null;
+ this.encoding = null;
+ this.filterConfig = null;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java
index 4e62ed0..a6410af 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java
@@ -40,10 +40,10 @@
throws ServletException, java.io.IOException {
String charsetval = req.getCharacterEncoding();
if (charsetval != null) {
- res.setContentType("text/html;charset=" + charsetval + "");
- } else res.setContentType("text/html;charset=UTF-8");
- java.io.PrintWriter out = res.getWriter();
- String name = req.getParameter("name");
+ res.setContentType("text/html;charset=" + charsetval + "");
+ } else res.setContentType("text/html;charset=UTF-8");
+ java.io.PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
out.println("<html>");
out.println("<head>");
out.println("<title>Simple servlet to verify the filter</title>");
@@ -51,8 +51,8 @@
out.println("<body>");
out.println("<H3> This is the name you have entered " + name + "</H3>");
out.println("<H4> The character encoding set by the filter is: " + charsetval + "</h4>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
out.println("</body>");
out.println("</html>");
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java
index ba02a2c..113249b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java
@@ -20,7 +20,7 @@
* This is a simple servlet that demonstrates some of most commonly used i18n features of
* the Application Server's Java Servlet API Implementation
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class SimpleI18nServlet extends HttpServlet {
@@ -44,80 +44,80 @@
protected void processRequest(HttpServletRequest req, HttpServletResponse res)
throws ServletException, java.io.IOException {
try {
- HttpSession session = req.getSession(false);
- if(session != null) {
- String sessioncharset = (String)session.getAttribute("charset");
- try {
- req.setCharacterEncoding(sessioncharset);
- } catch (Exception e) {}
- }
- String func = req.getParameter("func");
- String action = req.getParameter("action");
+ HttpSession session = req.getSession(false);
+ if(session != null) {
+ String sessioncharset = (String)session.getAttribute("charset");
+ try {
+ req.setCharacterEncoding(sessioncharset);
+ } catch (Exception e) {}
+ }
+ String func = req.getParameter("func");
+ String action = req.getParameter("action");
- if(func.equals("sendInput")) {
- String charsetval = req.getParameter("charsetval");
- sendInput (req, res, charsetval, action);
- } else {
- if ( action.equals("formatDate") ) {
- formatDate (req, res);
- } else if ( action.equals("setCharEncoding") ) {
- setCharEncoding (req, res);
- } else if ( action.equals("includeServlet") ) {
- includeServlet (req, res);
- } else if ( action.equals("forwardServlet") ) {
- forwardServlet (req, res);
- } else if ( action.equals("sendErrorMessage") ) {
- sendErrorMessage (req, res);
- } else if ( action.equals("useResourceBundle") ) {
- useResourceBundle (req, res);
- } else if ( action.equals("forwardJsp") ) {
- forwardJsp (req, res);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- /** Sets the charset attribute to the session and generates an input form
- * @param request servlet request
- * @param response servlet response
+ if(func.equals("sendInput")) {
+ String charsetval = req.getParameter("charsetval");
+ sendInput (req, res, charsetval, action);
+ } else {
+ if ( action.equals("formatDate") ) {
+ formatDate (req, res);
+ } else if ( action.equals("setCharEncoding") ) {
+ setCharEncoding (req, res);
+ } else if ( action.equals("includeServlet") ) {
+ includeServlet (req, res);
+ } else if ( action.equals("forwardServlet") ) {
+ forwardServlet (req, res);
+ } else if ( action.equals("sendErrorMessage") ) {
+ sendErrorMessage (req, res);
+ } else if ( action.equals("useResourceBundle") ) {
+ useResourceBundle (req, res);
+ } else if ( action.equals("forwardJsp") ) {
+ forwardJsp (req, res);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ /** Sets the charset attribute to the session and generates an input form
+ * @param request servlet request
+ * @param response servlet response
*/
- protected void sendInput (HttpServletRequest req, HttpServletResponse res, String charsetval, String action)
+ protected void sendInput (HttpServletRequest req, HttpServletResponse res, String charsetval, String action)
throws ServletException, IOException {
- try {
- HttpSession session = req.getSession(true);
- session.setAttribute("charset", charsetval);
- res.setContentType("text/html; charset=" + charsetval);
- PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head>");
- out.println("<title>Servlet i18n samples</title></head>");
- out.println("<body><br>");
- out.println("<P><FONT FACE=\"Times New Roman\"><FONT SIZE=6><B>Servlet i18n samples</B></FONT></FONT></P>");
- out.println("<form name=\"i18n-simple\" method=\"post\" action=\"/i18n-simple/SimpleI18nServlet\">");
- out.println("<table>");
- out.println("<tr>");
- out.println("<td><H3>Please enter your name:</H3></td>");
- out.println("<td>");
- out.println("<input type=\"text\" name=\"name\" size=\"20\">");
- out.println("</td>");
- out.println("</tr>");
- out.println("</table>");
- out.println("<pre>");
- out.println("<input type=submit value=Submit>");
- out.println("</pre>");
- out.println("<input type=hidden name=charsetval value=" + charsetval + ">");
- out.println("<input type=hidden name=action value=" + action + ">");
- out.println("<input type=hidden name=func value=exec>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</form>");
- out.println("</body>");
- out.println("</html>");
- out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ try {
+ HttpSession session = req.getSession(true);
+ session.setAttribute("charset", charsetval);
+ res.setContentType("text/html; charset=" + charsetval);
+ PrintWriter out = res.getWriter();
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Servlet i18n samples</title></head>");
+ out.println("<body><br>");
+ out.println("<P><FONT FACE=\"Times New Roman\"><FONT SIZE=6><B>Servlet i18n samples</B></FONT></FONT></P>");
+ out.println("<form name=\"i18n-simple\" method=\"post\" action=\"/i18n-simple/SimpleI18nServlet\">");
+ out.println("<table>");
+ out.println("<tr>");
+ out.println("<td><H3>Please enter your name:</H3></td>");
+ out.println("<td>");
+ out.println("<input type=\"text\" name=\"name\" size=\"20\">");
+ out.println("</td>");
+ out.println("</tr>");
+ out.println("</table>");
+ out.println("<pre>");
+ out.println("<input type=submit value=Submit>");
+ out.println("</pre>");
+ out.println("<input type=hidden name=charsetval value=" + charsetval + ">");
+ out.println("<input type=hidden name=action value=" + action + ">");
+ out.println("<input type=hidden name=func value=exec>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</form>");
+ out.println("</body>");
+ out.println("</html>");
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Gets the locale information from browser settings and sets the locale to
@@ -129,25 +129,25 @@
protected void formatDate (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
// Get's the locale of the browser from the request object
- Locale browserLocale = req.getLocale();
+ Locale browserLocale = req.getLocale();
// Default locale of the response object
- Locale resLocale = res.getLocale();
- String resCharset = res.getCharacterEncoding();
+ Locale resLocale = res.getLocale();
+ String resCharset = res.getCharacterEncoding();
// Set's the browser's locale to the response object
res.setLocale(browserLocale);
- Locale resLocaleAfter = res.getLocale();
- String resCharsetAfter = res.getCharacterEncoding();
+ Locale resLocaleAfter = res.getLocale();
+ String resCharsetAfter = res.getCharacterEncoding();
res.setContentType("text/html; charset=" + resCharsetAfter);
// Output stream for the response
- java.io.PrintWriter out = res.getWriter();
+ java.io.PrintWriter out = res.getWriter();
out.println("<html>");
out.println("<head><title>Formatting date as per browser's locale</title></head>");
@@ -161,19 +161,19 @@
out.println("Response charset after setting it from request locale: " + resCharsetAfter + "<br>");
// Get today's date and formats it using the browser locale
- java.util.Date today = new java.util.Date();
- DateFormat formatter = DateFormat.getDateInstance(DateFormat.FULL, browserLocale);
- String formattedDate = formatter.format(today);
+ java.util.Date today = new java.util.Date();
+ DateFormat formatter = DateFormat.getDateInstance(DateFormat.FULL, browserLocale);
+ String formattedDate = formatter.format(today);
out.println("Today's date for " + resLocaleAfter + " is : " + formattedDate + "<br>");
out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
out.println("</body></html>");
out.close();
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }
/** Sets request's character encoding using setCharacterEncoding method of HttpServletRequest interface.
* The setCharacterEncoding method is used to inform the servlet container to read request parameters using specified encoding.
@@ -183,24 +183,24 @@
protected void setCharEncoding (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
- // Output stream for the response
- PrintWriter out = res.getWriter();
+ // Output stream for the response
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head><title>Setting request object's character encoding to " + charsetval + "</title></head>");
- out.println("<body>");
- out.println("<br><H3> The name entered was : " + name + " and the associated encoding was : " + charsetval + "</H3><br>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
- out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ out.println("<html>");
+ out.println("<head><title>Setting request object's character encoding to " + charsetval + "</title></head>");
+ out.println("<body>");
+ out.println("<br><H3> The name entered was : " + name + " and the associated encoding was : " + charsetval + "</H3><br>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</body></html>");
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Includes a servlet using RequestDispatcher's include method. Here the data display behaviour
@@ -212,30 +212,30 @@
protected void includeServlet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
- // Output stream for the response
- PrintWriter out = res.getWriter();
+ // Output stream for the response
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head><title>Including another servlet from a servlet</title></head>");
- out.println("<body>");
+ out.println("<html>");
+ out.println("<head><title>Including another servlet from a servlet</title></head>");
+ out.println("<body>");
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher("/IncludedServlet");
- dispatcher.include(req, res);
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher("/IncludedServlet");
+ dispatcher.include(req, res);
- out.println("<br>Name from the including servlet: " + name + "<br>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
- out.close();
+ out.println("<br>Name from the including servlet: " + name + "<br>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</body></html>");
+ out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Forwards a servlet using RequestDispatcher's forward method. Here the data display behaviour
@@ -248,24 +248,24 @@
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
- // Output stream for the response
- PrintWriter out = res.getWriter();
+ // Output stream for the response
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head><title>Including another servlet from a servlet</title></head>");
- out.println("<body>");
- out.println("<br>The name from forwarding servlet : " + name );
+ out.println("<html>");
+ out.println("<head><title>Including another servlet from a servlet</title></head>");
+ out.println("<body>");
+ out.println("<br>The name from forwarding servlet : " + name );
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher("/ForwardedServlet");
- dispatcher.forward(req, res);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher("/ForwardedServlet");
+ dispatcher.forward(req, res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Send error messages using response's sendError method. The sendError method sends multi byte error messages correctly
@@ -276,16 +276,16 @@
protected void sendErrorMessage (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
- res.sendError(404, "I18n error message from servlet "+ name);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
+ res.sendError(404, "I18n error message from servlet "+ name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- /** Load resource bundle based on client's locale. If there is no resource bundle available, the default resource bundle
+ /** Load resource bundle based on client's locale. If there is no resource bundle available, the default resource bundle
* will be picked up
* @param request servlet request
* @param response servlet response
@@ -293,43 +293,43 @@
protected void useResourceBundle (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
- ResourceBundle rb = null;
- rb = ResourceBundle.getBundle("LocalStrings",req.getLocale());
- String msg;
- PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
+ ResourceBundle rb = null;
+ rb = ResourceBundle.getBundle("LocalStrings",req.getLocale());
+ String msg;
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head>");
+ out.println("<html>");
+ out.println("<head>");
- try {
- msg = rb.getString ("title");
- out.println("<title>" + msg + "</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<br><H1> Hello " + name + ", the following messages are displayed from a resource bundle</H1>");
- msg = rb.getString ("msg");
- out.println("<br><br><H2>" + msg + "</H2>");
- msg = rb.getString ("thanks");
- out.println("<br><br><H3>" + msg + "</H3>");
+ try {
+ msg = rb.getString ("title");
+ out.println("<title>" + msg + "</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<br><H1> Hello " + name + ", the following messages are displayed from a resource bundle</H1>");
+ msg = rb.getString ("msg");
+ out.println("<br><br><H2>" + msg + "</H2>");
+ msg = rb.getString ("thanks");
+ out.println("<br><br><H3>" + msg + "</H3>");
- } catch (MissingResourceException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
- out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } catch (MissingResourceException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</body></html>");
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- /** Forwards request from servlet to jsp using RequestDispatcher's forward method. Here the data display behaviour
+ /** Forwards request from servlet to jsp using RequestDispatcher's forward method. Here the data display behaviour
* changes based on the content type set. If the forwarded jsp sets the content type to a different value then the new content type
* should be set for the output stream
* @param request servlet request
@@ -338,12 +338,12 @@
protected void forwardJsp (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher("/ForwardedJsp.jsp");
- dispatcher.forward(req, res);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher("/ForwardedJsp.jsp");
+ dispatcher.forward(req, res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Handles the HTTP <code>GET</code> method.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java
index c9857f9..78dc9ff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java
@@ -23,7 +23,7 @@
/**
* Simple Java Bean used to set/get name and greeting messages from a jsp
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class JavaUseBean {
@@ -40,7 +40,7 @@
this.name = name;
}
- /** Gets the name that was set using setName(String name) method of this class
+ /** Gets the name that was set using setName(String name) method of this class
*/
public String getName() {
return name;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/war/build.xml
index 80166dd..4f266c5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libClassPath/war/build.xml
@@ -23,30 +23,30 @@
<project name="i18n-simple" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
<target name="prepare" depends="init">
<mkdir dir="${build}" />
</target>
-
- <target name="compile" depends="prepare"/>
-
- <target name="assemble" depends="compile">
- <copy file="../descriptor/web.xml" todir="${build}/WEB-INF"/>
- <copy file="../descriptor/sun-web.xml" todir="${build}/WEB-INF"
+
+ <target name="compile" depends="prepare"/>
+
+ <target name="assemble" depends="compile">
+ <copy file="../descriptor/web.xml" todir="${build}/WEB-INF"/>
+ <copy file="../descriptor/sun-web.xml" todir="${build}/WEB-INF"
failonerror="false"/>
- <copy todir="${build}/WEB-INF/tlds">
+ <copy todir="${build}/WEB-INF/tlds">
<fileset dir="tlds"/>
</copy>
<copy todir="${build}">
<fileset dir="docroot" includes="*.jsp, *.html"/>
</copy>
- <jar destfile="${archivedir}/i18n-simple.war"
+ <jar destfile="${archivedir}/i18n-simple.war"
basedir="${build}"/>
- </target>
+ </target>
- <target name="private-all" depends="assemble">
- </target>
+ <target name="private-all" depends="assemble">
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ResourceHelper.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ResourceHelper.java
index 5e27548..449920a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ResourceHelper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ResourceHelper.java
@@ -32,10 +32,10 @@
* @author tjquinn
*/
public class ResourceHelper {
-
+
private static final String NO_RESOURCE = "NO_RESOURCE";
private static final String NO_PROPERTY = "NO_PROPERTY";
-
+
public static String find(String resourceName, String propertyName) throws IOException {
String result;
URL url = ResourceHelper.class.getResource(resourceName);
@@ -50,7 +50,7 @@
try {
URLConnection cnx = url.openConnection();
cnx.setUseCaches(false);
-
+
is = cnx.getInputStream();
Properties props = new Properties();
props.load(is);
@@ -68,14 +68,14 @@
}
return result;
}
-
+
/**
* Makes sure that each test of the form <resourceName>:<propertyName>=<expectedValue>
- * passes; that is, that the resource is found, that the property is
+ * passes; that is, that the resource is found, that the property is
* set by the properties file represented by that resource, and that the
* property value is the same as the expected value.
*@param tests 0 or more expressions <resourceName>:<propertyName>=<expectedValue>
- *@return Results object describing the results of the tests
+ *@return Results object describing the results of the tests
*/
public static Result checkAll(String[] tests, TestType callerTestType) throws IOException {
Result result = new Result();
@@ -93,7 +93,7 @@
}
continue;
}
-
+
if ( ! callerTestType.runs(currentArgumentTestType)) {
continue;
}
@@ -117,39 +117,39 @@
}
return result;
}
-
+
public static class Result implements Serializable {
private boolean result = true;
private StringBuilder results = new StringBuilder();
-
+
private void recordResult(boolean result, String note) {
this.result &= result;
results.append(note).append("@");
}
-
+
public boolean getResult() {
return result;
}
-
+
public StringBuilder getResults() {
return results;
}
}
-
+
public static enum TestType {
CLIENT("clientonly"),
SERVER("serveronly"),
BOTH("both");
-
+
private String name;
TestType(String name) {
this.name = name;
}
-
+
public String toString() {
return name;
}
-
+
public static TestType find(String type) {
for (TestType tt : values()) {
if (tt.toString().equals(type)) {
@@ -158,7 +158,7 @@
}
return null;
}
-
+
boolean runs(TestType argumentTestType) {
return argumentTestType.equals(BOTH) || (this.equals(argumentTestType));
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-defaultLibDir.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-defaultLibDir.xml
index ed98a2e..be1a82a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-defaultLibDir.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-defaultLibDir.xml
@@ -35,5 +35,5 @@
Omitting the <library-directory> element entirely should cause the app
server to add all jars in the default 'lib' subdirectory to the
runtime classpath.
--->
+-->
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-noLibDir.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-noLibDir.xml
index cfddd67..9ca5380 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-noLibDir.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-noLibDir.xml
@@ -31,5 +31,5 @@
<module>
<java>client/libdirtest-client.jar</java>
</module>
- <library-directory/> <!-- suppress library directory handling -->
+ <library-directory/> <!-- suppress library directory handling -->
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-xLibDir.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-xLibDir.xml
index c6d795f..c5c2dda 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-xLibDir.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/application-xLibDir.xml
@@ -31,5 +31,5 @@
<module>
<java>client/libdirtest-client.jar</java>
</module>
- <library-directory>x</library-directory>
+ <library-directory>x</library-directory>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/build.xml
index 510880c..80cc8d7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/build.xml
@@ -27,113 +27,113 @@
This set of tests make sure that the handling of <library-directory> is
done properly, that the server-side and client-side class paths are set
correctly, and that the generated client JAR contains what it should.
-
-
+
+
**** THE APP CLIENT ****
-
+
The app client that drives the tests invokes an EJB method to make sure the
server-side class path is correct, then checks for the very same resources
itself on the client side to make sure that its class path and the generated
app client JAR file are both correct.
-
+
The appclient's output servers are property definitions that are written to
- the client run's log file. The log file is then used by the ant task to
+ the client run's log file. The log file is then used by the ant task to
define run-specific properties for checking the results and displaying any
test failures.
-
-
+
+
**** THE EARS ****
-
+
The tests use a single EAR structure. The <library-directory> setting
in application.xml changes to affect the outcome of the tests.
-
+
Here is the EAR structure:
-
+
topLevel.jar - always included due to backward compatibility with the legacy feature
that includes all top-level JARs in the class path
-
+
topLevel.properties
-
+
lib/lib.jar - accessible when <library-directory> element is omitted
- because the default is lib (there are no tests in this project that explicitly
+ because the default is lib (there are no tests in this project that explicitly
specify <library-directory>lib</library-directory>)
-
- lib.properties
+
+ lib.properties
lib/sub/lib_sub.jar - should not be accessible because JARs in subdirectories of the
library directory should not be accessible
-
+
lib_sub.properties
-
+
x/x.jar - accessible when lib dir is "x" - The manifest of x.jar specifies Class-Path: xExtra/xExtra.jar xMore/sub
-
+
x.properties - accessible (since x.jar contains it and is in the lib directory)
-
+
x/xExtra/xExtra.jar - accessible when lib dir is "x" since the manifest of x.jar includes xExtra/xExtra.jar
-
- x_xExtra.properties
-
+
+ x_xExtra.properties
+
xExtra/xExtra.jar - never accessible. Here to make sure that the Class-Path handling
- of xExtra/xExtra.jar in /x/x.jar's manifest correctly resolves relative to the x directory
+ of xExtra/xExtra.jar in /x/x.jar's manifest correctly resolves relative to the x directory
where x.jar resides and not relative to the top-level of the EAR
-
+
xExtra.properties
-
+
x/xMore - never accessible because even when the lib-dir is x (and
x.jar's manifest Class-Path specifies xMore/sub), only xMore/sub should be added to the
class path, not its parent directory.
-
- x_xMore.properties
-
+
+ x_xMore.properties
+
x/xMore/sub - accessible when lib-dir is x
-
- x_xMore_sub.properties
-
- xExtra/xExtra.jar - neve accessible because the manifest Class-Path entries in x/x.jar should be relative to
+
+ x_xMore_sub.properties
+
+ xExtra/xExtra.jar - neve accessible because the manifest Class-Path entries in x/x.jar should be relative to
the URI of the JAR itself, and so should resolve to x/xExtra/xExtra.jar, not xExtra/xExtra.jar
-
- xExtra_xExtra.properties
-
- xMore/sub/ - never accessible (again because x/x.jar's Class-Path entry for xMore/sub
+
+ xExtra_xExtra.properties
+
+ xMore/sub/ - never accessible (again because x/x.jar's Class-Path entry for xMore/sub
should be resolved relative to x/x.jar's location which is /x and should therefore resovle to x/xMore/sub
within the JAR rather than xMore/sub
-
- xMore_sub.properties
+
+ xMore_sub.properties
y/y.jar - always accessible to the client (appears in the Class-Path of the app client JAR's manifest)
-
+
y.properties
-
-
+
+
There are three different versions of the EAR created, each of which uses a
different <library-directory> setting:
-
+
default.ear - omits <library-directory>, so the default of lib should be used
none.ear - specifies <library-directory/> (empty); no library directory should be used
x.ear - specifies <library-directory> as x
-
- Each EAR should give somewhat different results in trying to locate various
+
+ Each EAR should give somewhat different results in trying to locate various
properties files and properties within them.
-
-
+
+
**** SPECIFYING TESTS ****
-
+
The app client driver accepts command-line arguments that specify a path for a resource,
a property name expected to be found in the resource, and the value expected for that
property in that resource. The format of each test expression is
-
+
{resource-path}:{property-name}={expected-value}
-
- The client- and server-side tests use the same common logic in ResourceHelper
+
+ The client- and server-side tests use the same common logic in ResourceHelper
to parse the test expressions, to search for a
- resource, to load a Properties object using the resource, and to get the value
+ resource, to load a Properties object using the resource, and to get the value
of a requested property and comparing it to the expected value.
-->
&commonBuild;
<property name="testName" value="libClassPath2"/>
<property name="archivedir" value="${build}/archives"/>
-
+
<property name="x.ear" value="${archivedir}/${testName}x-App.ear"/>
<property name="default.ear" value="${archivedir}/${testName}default-App.ear"/>
<property name="none.ear" value="${archivedir}/${testName}none-App.ear"/>
@@ -166,7 +166,7 @@
EARs but not others; some should work in all EARs; some should work
in no EARs.
-->
-
+
<!--
The test for the top-level JAR should always be positive, unless
and until we retire that legacy feature.
@@ -180,7 +180,7 @@
<property name="test.x" value="/x.properties:lib.path="/>
<property name="test.x.pos" value="${test.x}x"/>
<property name="test.x.neg" value="${test.x}NO_RESOURCE"/>
-
+
<!--
xExtra.properties is never accessible
-->
@@ -193,7 +193,7 @@
<property name="test.x.xExtra" value="/x_xExtra.properties:x_xExtra="/>
<property name="test.x.xExtra.pos" value="${test.x.xExtra}x_xExtra"/>
<property name="test.x.xExtra.neg" value="${test.x.xExtra}NO_RESOURCE"/>
-
+
<!--
lib.properties is accessible only using default.ear
-->
@@ -215,8 +215,8 @@
<property name="test.x.xMore.neg" value="${test.x.xMore}NO_RESOURCE"/>
<!--
- xMore_sub.properties is never accessible (because the xMore/sub
- Class-Path entry in x.jar's manifest must be resolved within the /x
+ xMore_sub.properties is never accessible (because the xMore/sub
+ Class-Path entry in x.jar's manifest must be resolved within the /x
directory where x.jar is found, not from the top-level of the EAR
-->
<property name="test.xMore.sub" value="/xMore_sub.properties:xMore_sub="/>
@@ -230,13 +230,13 @@
<property name="test.x.xMore.sub.neg" value="${test.x.xMore.sub}NO_RESOURCE"/>
<!--
- z.properties is always accessible to the client (it appears in the Class-Path
+ z.properties is always accessible to the client (it appears in the Class-Path
in the app client JAR's manifest) but never to the server
-->
<property name="test.z" value="/z.properties:value="/>
<property name="test.z.pos" value="${test.z}z"/>
<property name="test.z.neg" value="${test.z}NO_RESOURCE"/>
-
+
<!--
y.properties should always be accessible because the
app client JAR manifest used for the app client JAR shared by all
@@ -245,21 +245,21 @@
<property name="test.y" value="/y.properties:value="/>
<property name="test.y.pos" value="${test.y}y"/>
<property name="test.y.neg" value="${test.y}NO_RESOURCE"/>
-
+
<!--
The following properties define the expected results for each test run.
-->
-
+
<!-- library-directory specified as empty, meaning no lib dir should be used -->
- <property name="noLib.expected.results"
+ <property name="noLib.expected.results"
value="${test.tl.pos} ${test.x.neg} ${test.xExtra.neg} ${test.lib.neg} ${test.lib.sub.neg} ${test.x.xExtra.neg} ${test.xMore.sub.neg} ${test.x.xMore.neg} ${test.x.xMore.sub.neg} -clientonly ${test.z.pos} -serveronly ${test.z.neg} ${test.y.neg}"/>
-
+
<!-- library-directory not specified; default of lib used -->
- <property name="defaultLib.expected.results"
+ <property name="defaultLib.expected.results"
value="${test.tl.pos} ${test.x.neg} ${test.xExtra.neg} ${test.lib.pos} ${test.lib.sub.neg} ${test.x.xExtra.neg} ${test.xMore.sub.neg} ${test.x.xMore.neg} ${test.x.xMore.sub.neg} -clientonly ${test.z.pos} -serveronly ${test.z.neg} ${test.y.neg}"/>
<!-- library-directory specified as x; x.jar and its Class-Path entries xExtra/xExtra.jar and xMore/sub used -->
- <property name="explicitLibWithDir.expected.results"
+ <property name="explicitLibWithDir.expected.results"
value="${test.tl.pos} ${test.x.pos} ${test.xExtra.neg} ${test.lib.neg} ${test.lib.sub.neg} ${test.x.xExtra.pos} ${test.xMore.sub.neg} ${test.x.xMore.neg} -clientonly ${test.z.pos} -serveronly ${test.z.neg} ${test.y.neg}"/>
@@ -269,9 +269,9 @@
<mkdir dir="${build}/client"/>
<mkdir dir="${build}/client/y"/>
<mkdir dir="${build}/client/z"/>
-
+
<mkdir dir="${archivedir}"/>
-
+
<!-- The following directories will hold different files so they will
appear in the EAR in the right places.
-->
@@ -279,15 +279,15 @@
<mkdir dir="${build}/x/xExtra"/> <!-- holds xExtra.jar -->
<mkdir dir="${build}/x/xMore"/> <!-- holds x_xMore.properties (should not be accessible) -->
<mkdir dir="${build}/x/xMore/sub"/> <!-- holds x_xMore_sub.properties -->
-
+
<mkdir dir="${build}/xMore/"/>
<mkdir dir="${build}/xMore/sub"/> <!-- holds xMore_sub.properties (should not be accessible) -->
-
+
<mkdir dir="${build}/lib"/> <!-- holds lib.jar -->
<mkdir dir="${build}/lib/sub"/> <!-- holds lib_sub.jar (should not be accessible) -->
-
- <mkdir dir="${build}/xExtra"/> <!-- holds xExtra.jar (should not be accessible) -->
-
+
+ <mkdir dir="${build}/xExtra"/> <!-- holds xExtra.jar (should not be accessible) -->
+
</target>
<target name="compile" depends="prepare">
@@ -299,11 +299,11 @@
<target name="assemble" depends="makeEars"/>
<target name="makeJars" depends="compile">
-
+
<!--
Build the various jars used in the different tests.
-->
-
+
<!--
The x/x.jar will have the Class-Path setting in its manifest, so
specify the manifest rather than letting ant create it.
@@ -311,15 +311,15 @@
<jar destfile="${x.jar}" manifest="x/MANIFEST.MF">
<fileset dir="x" includes="*.properties"/>
</jar>
-
+
<jar destfile="${x_xExtra.jar}">
<fileset dir="x/xExtra" includes="*.properties"/>
</jar>
-
+
<jar destfile="${xExtra.jar}">
<fileset dir="xExtra" includes="*.properties"/>
</jar>
-
+
<jar destfile="${lib.jar}">
<fileset dir="lib" includes="*.properties"/>
</jar>
@@ -331,7 +331,7 @@
<jar destfile="${topLevel.jar}">
<fileset dir="topLevel" includes="**/*.properties"/>
</jar>
-
+
<jar destfile="${z.jar}">
<fileset dir="client/z" includes="*.properties"/>
</jar>
@@ -343,9 +343,9 @@
<copy file="x/xMore/x_xMore.properties" todir="${x.xMore.dir}"/>
<copy file="x/xMore/sub/x_xMore_sub.properties" todir="${x.xMore.sub.dir}"/>
<copy file="xMore/sub/xMore_sub.properties" todir="${xMore.sub.dir}"/>
-
+
<copy file="client/y/y.properties" todir="${y.dir}"/>
-
+
<!--
Build the EJB and client jars. The ResourceHelper class is used from
the EJB and also from the client, so include it in both submodules.
@@ -356,24 +356,24 @@
<fileset dir="${build}" includes="**/ejb/**/*.class"/>
<fileset refid="resourceHelperClass"/>
</jar>
-
+
<jar destfile="${client.jar}" manifest="client/MANIFEST.MF">
<fileset dir="${build}" includes="**/client/**/*.class"/>
<fileset dir="${build}" includes="**/ejb/LookupSBRemote.class"/>
<fileset refid="resourceHelperClass"/>
</jar>
</target>
-
+
<target name="makeEars" depends="makeJars">
<!--
All the EARs are populated with exactly the same content EXCEPT for
- the application.xml, which differs for each. The earIncludes property
+ the application.xml, which differs for each. The earIncludes property
defined next spells out all the JARs and directories included in all
the EARs.
-->
<property name="earIncludes" value="libdirtest-EJBModule.jar,client/libdirtest-client.jar,client/z/z.jar,client/y/y.properties,topLevel.jar,lib/lib.jar,lib/sub/lib_sub.jar,x/x.jar,xExtra/xExtra.jar,x/xExtra/xExtra.jar,x/xMore/**,xMore/**"/>
-
+
<ear destfile="${none.ear}" basedir="${build}"
appxml="application-noLibDir.xml" includes="${earIncludes}"/>
@@ -438,7 +438,7 @@
</target>
-
+
<macrodef name="deploy">
<attribute name="moduleName"/>
<attribute name="earFile" default="${archivedir}/@{moduleName}.ear"/>
@@ -458,19 +458,19 @@
</antcall>
</sequential>
</macrodef>
-
+
<macrodef name="run-test">
<attribute name="tests"/>
<attribute name="logID"/>
<attribute name="moduleName"/>
<attribute name="clientFile" default="${archivedir}/@{moduleName}Client.jar"/>
<attribute name="testLogTitle" default="@{expectedResult}"/>
-
+
<sequential>
<antcall target="declare-test">
<param name="description" value="ear/libclasspath2 Testing for @{testLogTitle}"/>
</antcall>
-
+
<echo message="${APPCLIENT} -client @{clientFile} @{tests}"/>
<exec executable="${APPCLIENT}" resultproperty="result" output="${build}/@{logID}.output.log" failonerror="false">
<arg value="-client"/>
@@ -478,10 +478,10 @@
<arg line="@{tests}"/>
</exec>
<checkResult logID="@{logID}"/>
-
+
</sequential>
- </macrodef>
-<!--
+ </macrodef>
+<!--
<macrodef name="run-test-only">
<attribute name="expectedResult"/>
<attribute name="logID"/>
@@ -494,16 +494,16 @@
<arg value="-client"/>
<arg value="@{clientFile}"/>
<arg value="@{expectedResult}"/>
- </exec>
- </sequential>
- </macrodef>
-
+ </exec>
+ </sequential>
+ </macrodef>
+
<target name="run-only" depends="init">
<run-test-only expectedResult="${expectedResult}" logID="${logID}"/>
</target>
-->
<!--
- Convenience target for deploying and running a single test. Hand-edit the
+ Convenience target for deploying and running a single test. Hand-edit the
expectedResult property (and the logID if you feel like it) so it is
one of the test apps build by the assemble task.
-->
@@ -519,7 +519,7 @@
<attribute name="logFile" default="${build}/@{logID}.output.log"/>
<sequential>
<property file="@{logFile}" prefix="x@{logID}"/>
-
+
<concat>
<fileset file="@{logFile}"/>
</concat>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
index a5cb29f..d520957 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
@@ -28,11 +28,11 @@
public class LibDirTestClient {
private static @EJB() LookupSBRemote lookup;
-
+
/** Creates a new instance of LibDirTestClient */
public LibDirTestClient() {
}
-
+
/**
* @param args the command line arguments
*/
@@ -44,7 +44,7 @@
System.exit(-1);
}
}
-
+
private void run(String[] args) throws IOException {
if (args.length == 0) {
System.out.println("result=-1");
@@ -57,13 +57,13 @@
*Ask the EJB to find the required resources and property values.
*/
ResourceHelper.Result serverResult = lookup.runTests(args, ResourceHelper.TestType.SERVER);
-
+
/*
*Now try to get the same results on the client side.
*/
StringBuilder clientResults = new StringBuilder();
ResourceHelper.Result clientResult = ResourceHelper.checkAll(args, ResourceHelper.TestType.CLIENT);
-
+
if (serverResult.getResult() && clientResult.getResult()) {
System.out.println("result=0");
System.out.println("note=Received expected results");
@@ -83,6 +83,6 @@
}
System.out.println("note=");
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
index 87afb58..b9df84b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
@@ -31,7 +31,7 @@
*/
@Stateless()
public class LookupSBBean implements LookupSBRemote {
-
+
public ResourceHelper.Result runTests(String[] tests, ResourceHelper.TestType testType) throws IOException {
return ResourceHelper.checkAll(tests, testType);
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
index 2f77f2b..0e52381 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
@@ -27,5 +27,5 @@
@Remote
public interface LookupSBRemote {
public ResourceHelper.Result runTests(String[] tests, ResourceHelper.TestType testType) throws IOException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/lib/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/lib/application.xml
index a61a090..1417f4e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/lib/application.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/lib/application.xml
@@ -40,5 +40,5 @@
Omitting the <library-directory> element entirely should cause the app
server to add all jars in the default 'lib' subdirectory to the
runtime classpath.
--->
+-->
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/none/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/none/application.xml
index 24a7552..e76d6d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/none/application.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/none/application.xml
@@ -36,5 +36,5 @@
<module>
<java>libdirtest-client.jar</java>
</module>
- <library-directory/> <!-- suppress library directory handling -->
+ <library-directory/> <!-- suppress library directory handling -->
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/x/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/x/application.xml
index fa80a12..35f6682 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/x/application.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/x/application.xml
@@ -36,5 +36,5 @@
<module>
<java>libdirtest-client.jar</java>
</module>
- <library-directory>x</library-directory>
+ <library-directory>x</library-directory>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/y/application.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/y/application.xml
index c647cd2..d3aee0c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/y/application.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/y/application.xml
@@ -36,5 +36,5 @@
<module>
<java>libdirtest-client.jar</java>
</module>
- <library-directory>y</library-directory>
+ <library-directory>y</library-directory>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/client/i18n/simple/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/client/i18n/simple/TestClient.java
index 4232902..04f101a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/client/i18n/simple/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/client/i18n/simple/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/descriptor/sun-web.xml
index f7f8627..c908797 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/descriptor/sun-web.xml
@@ -22,8 +22,8 @@
<sun-web-app>
<session-config>
<session-manager/>
- </session-config>
- <jsp-config/>
+ </session-config>
+ <jsp-config/>
<locale-charset-info default-locale="ja">
<locale-charset-map charset="EUC-JP" locale="ja" agent="Mozilla/4.7 [en] (X11; I; SunOS 5.8 sun4u)">
<description>Charset mapping for Japanese locale</description>
@@ -36,11 +36,11 @@
</locale-charset-map>
<locale-charset-map charset="Shift_JIS" locale="ja" agent="Mozilla/4.79 [en] (Windows NT 5.0; U)">
<description>Charset mapping for Japanese locale</description>
- </locale-charset-map>
+ </locale-charset-map>
<locale-charset-map charset="ISO-8859-1" locale="de_DE">
<description>Charset mapping for German locale</description>
</locale-charset-map>
<parameter-encoding form-hint-field="charsetval" />
- </locale-charset-info>
+ </locale-charset-info>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml
index 8767c14..8403de1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/build.xml
@@ -23,30 +23,30 @@
<project name="i18n-simple" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
+ <target name="prepare" depends="init">
<mkdir dir="${build}" />
</target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="samples" destdir="${build}">
- <classpath>
- <pathelement location="${inst}/lib/j2ee.jar"/>
- <pathelement location="${inst}/lib/appserv-rt.jar"/>
- <pathelement location="${build}/WEB-INF/lib/library.jar"/>
- </classpath>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <jar destfile="${archivedir}/a/b/i18n-simple.jar"
- basedir="${build}"/>
- </target>
- <target name="private-all" depends="assemble">
- </target>
+ <target name="compile" depends="prepare">
+ <javac srcdir="samples" destdir="${build}">
+ <classpath>
+ <pathelement location="${inst}/lib/j2ee.jar"/>
+ <pathelement location="${inst}/lib/appserv-rt.jar"/>
+ <pathelement location="${build}/WEB-INF/lib/library.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="assemble" depends="compile">
+ <jar destfile="${archivedir}/a/b/i18n-simple.jar"
+ basedir="${build}"/>
+ </target>
+
+ <target name="private-all" depends="assemble">
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java
index 56d16f2..b84b14c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/i18ntag/MessageTag.java
@@ -26,110 +26,110 @@
/**
* A simple message taghandler to display localized message from a resource bundle based on jsp request
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class MessageTag extends TagSupport {
- private String key = null;
- private String bundleName = null;
- private String language = null;
- private String country = null;
- private String variant = null;
+ private String key = null;
+ private String bundleName = null;
+ private String language = null;
+ private String country = null;
+ private String variant = null;
- /**
- * Set the user preferred language
- */
- public void setLanguage(String lang) {
+ /**
+ * Set the user preferred language
+ */
+ public void setLanguage(String lang) {
this.language = lang;
- }
-
- /**
- * Get the user preferred language
- */
- public String getLanguage() {
- return language;
- }
-
- /**
- * Set the user preferred country
- */
- public void setCountry(String country) {
- this.country = country;
- }
-
- /**
- * Get the user preferred country
- */
- public String getCountry() {
- return country;
}
/**
- * Set the user preferred variant
- */
+ * Get the user preferred language
+ */
+ public String getLanguage() {
+ return language;
+ }
+
+ /**
+ * Set the user preferred country
+ */
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ /**
+ * Get the user preferred country
+ */
+ public String getCountry() {
+ return country;
+ }
+
+ /**
+ * Set the user preferred variant
+ */
public void setVariant(String variant) {
- this.variant = variant;
- }
-
- /**
- * Get the user preferred variant
- */
- public String getVariant() {
- return variant;
+ this.variant = variant;
}
/**
- * Set the user preferred resource bundle name
- */
- public void setName (String name) {
- this.bundleName = name;
- }
+ * Get the user preferred variant
+ */
+ public String getVariant() {
+ return variant;
+ }
/**
- * Set the message key required to retrieve message from the resource bundle
- */
+ * Set the user preferred resource bundle name
+ */
+ public void setName (String name) {
+ this.bundleName = name;
+ }
+
+ /**
+ * Set the message key required to retrieve message from the resource bundle
+ */
public void setKey(String key) {
this.key = key;
}
/**
- * Get the message key required to retrieve message from the resource bundle
- */
+ * Get the message key required to retrieve message from the resource bundle
+ */
public String getKey() {
return key;
}
/**
- * Gets the user preferred resource bundle name
- */
- public String getName() {
- return bundleName;
- }
+ * Gets the user preferred resource bundle name
+ */
+ public String getName() {
+ return bundleName;
+ }
/**
- * Will be called by the JSP Engine when it encounters the start of the tag
- */
+ * Will be called by the JSP Engine when it encounters the start of the tag
+ */
public int doStartTag() throws JspTagException {
return EVAL_BODY_INCLUDE;
}
/**
- * Will be called by the JSP Engine when it encounters the end of the tag
- */
+ * Will be called by the JSP Engine when it encounters the end of the tag
+ */
public int doEndTag() throws JspTagException {
try {
- if(language != null) {
- if( country == null)
- country = "";
- if(variant == null)
- variant = "";
- } else language = "en";
- java.util.Locale locale = new Locale(language, country, variant);
- ResourceBundle bundle = ResourceBundle.getBundle(bundleName, locale);
- String message = bundle.getString(key);
- pageContext.getOut().write("Message from resource bundle:" + message);
- } catch(Exception e) {
+ if(language != null) {
+ if( country == null)
+ country = "";
+ if(variant == null)
+ variant = "";
+ } else language = "en";
+ java.util.Locale locale = new Locale(language, country, variant);
+ ResourceBundle bundle = ResourceBundle.getBundle(bundleName, locale);
+ String message = bundle.getString(key);
+ pageContext.getOut().write("Message from resource bundle:" + message);
+ } catch(Exception e) {
throw new JspTagException("Error: " + e);
}
return EVAL_PAGE;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java
index 0840fc0..0ed6eaf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/ForwardedServlet.java
@@ -16,7 +16,7 @@
/**
* Servlet forwarded from SimpleI18nServlet
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class ForwardedServlet extends HttpServlet {
@@ -40,11 +40,11 @@
*/
protected void processRequest(HttpServletRequest req, HttpServletResponse res)
throws ServletException, java.io.IOException {
- String charsetval = req.getParameter("charsetval");
+ String charsetval = req.getParameter("charsetval");
req.setCharacterEncoding(charsetval);
res.setContentType("text/html;charset=" + charsetval + "");
- java.io.PrintWriter out = res.getWriter();
- String name = req.getParameter("name");
+ java.io.PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
out.println("<html>");
out.println("<head>");
out.println("<title>Servlet</title>");
@@ -52,8 +52,8 @@
out.println("<body>");
out.println("<H3> This is the name from forwarded servlet </H3>");
out.println("<H4> The name entered was:" + name + "</h4>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
out.println("</body>");
out.println("</html>");
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java
index c315b46..dc7f9e5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/IncludedServlet.java
@@ -17,7 +17,7 @@
/**
* Servlet included in SimpleI18nServlet
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class IncludedServlet extends HttpServlet {
@@ -42,15 +42,15 @@
protected void processRequest(HttpServletRequest req, HttpServletResponse res)
throws ServletException, java.io.IOException {
try {
- java.io.PrintWriter out = res.getWriter();
- String name = req.getParameter("name");
+ java.io.PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
- out.println("<H3> This is the name from included servlet </H3>");
- out.println("<H4> The name entered was:" + name + "</h4>");
+ out.println("<H3> This is the name from included servlet </H3>");
+ out.println("<H4> The name entered was:" + name + "</h4>");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Handles the HTTP <code>GET</code> method.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java
index 4e78043..e014977 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/LocaleCharsetServlet.java
@@ -30,7 +30,7 @@
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
@@ -52,15 +52,15 @@
- String name = req.getParameter("name");
+ String name = req.getParameter("name");
- String charsetval = req.getCharacterEncoding();
+ String charsetval = req.getCharacterEncoding();
if (charsetval != null) {
- res.setContentType("text/html;charset=" + charsetval + "");
+ res.setContentType("text/html;charset=" + charsetval + "");
- } else res.setContentType("text/html;charset=UTF-8");
+ } else res.setContentType("text/html;charset=UTF-8");
PrintWriter out = res.getWriter();
@@ -82,9 +82,9 @@
out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
+ out.println("</body></html>");
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java
index c4aa1d7..45cab0e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilter.java
@@ -21,9 +21,9 @@
public class SimpleFilter implements Filter {
- private FilterConfig filterConfig = null;
- private boolean usefilter = false;
- private String encoding = null;
+ private FilterConfig filterConfig = null;
+ private boolean usefilter = false;
+ private String encoding = null;
/**
* Called by the web container to indicate to a filter that it is being placed into service
@@ -31,16 +31,16 @@
* @param filterConfig The filter configuration object
*/
public void init(FilterConfig filterConfig) throws ServletException {
- try {
- this.filterConfig = filterConfig;
- String param = filterConfig.getInitParameter("usefilter");
- this.encoding = filterConfig.getInitParameter("encoding");
- if (param.equals("true")) {
- this.usefilter = true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+ try {
+ this.filterConfig = filterConfig;
+ String param = filterConfig.getInitParameter("usefilter");
+ this.encoding = filterConfig.getInitParameter("encoding");
+ if (param.equals("true")) {
+ this.usefilter = true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -51,18 +51,18 @@
* @param chain The filter chain we are processing
*/
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
- throws IOException, ServletException {
- try {
- if (usefilter) {
- String encoding = getEncoding(req);
- if (encoding != null) {
- req.setCharacterEncoding(encoding);
- }
- }
- chain.doFilter(req, res);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ throws IOException, ServletException {
+ try {
+ if (usefilter) {
+ String encoding = getEncoding(req);
+ if (encoding != null) {
+ req.setCharacterEncoding(encoding);
+ }
+ }
+ chain.doFilter(req, res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -78,7 +78,7 @@
* Called by the web container to indicate to a filter that it is being taken out of service.
*/
public void destroy() {
- this.encoding = null;
- this.filterConfig = null;
+ this.encoding = null;
+ this.filterConfig = null;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java
index 4e62ed0..a6410af 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleFilterServlet.java
@@ -40,10 +40,10 @@
throws ServletException, java.io.IOException {
String charsetval = req.getCharacterEncoding();
if (charsetval != null) {
- res.setContentType("text/html;charset=" + charsetval + "");
- } else res.setContentType("text/html;charset=UTF-8");
- java.io.PrintWriter out = res.getWriter();
- String name = req.getParameter("name");
+ res.setContentType("text/html;charset=" + charsetval + "");
+ } else res.setContentType("text/html;charset=UTF-8");
+ java.io.PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
out.println("<html>");
out.println("<head>");
out.println("<title>Simple servlet to verify the filter</title>");
@@ -51,8 +51,8 @@
out.println("<body>");
out.println("<H3> This is the name you have entered " + name + "</H3>");
out.println("<H4> The character encoding set by the filter is: " + charsetval + "</h4>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
out.println("</body>");
out.println("</html>");
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java
index ba02a2c..113249b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/SimpleI18nServlet.java
@@ -20,7 +20,7 @@
* This is a simple servlet that demonstrates some of most commonly used i18n features of
* the Application Server's Java Servlet API Implementation
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class SimpleI18nServlet extends HttpServlet {
@@ -44,80 +44,80 @@
protected void processRequest(HttpServletRequest req, HttpServletResponse res)
throws ServletException, java.io.IOException {
try {
- HttpSession session = req.getSession(false);
- if(session != null) {
- String sessioncharset = (String)session.getAttribute("charset");
- try {
- req.setCharacterEncoding(sessioncharset);
- } catch (Exception e) {}
- }
- String func = req.getParameter("func");
- String action = req.getParameter("action");
+ HttpSession session = req.getSession(false);
+ if(session != null) {
+ String sessioncharset = (String)session.getAttribute("charset");
+ try {
+ req.setCharacterEncoding(sessioncharset);
+ } catch (Exception e) {}
+ }
+ String func = req.getParameter("func");
+ String action = req.getParameter("action");
- if(func.equals("sendInput")) {
- String charsetval = req.getParameter("charsetval");
- sendInput (req, res, charsetval, action);
- } else {
- if ( action.equals("formatDate") ) {
- formatDate (req, res);
- } else if ( action.equals("setCharEncoding") ) {
- setCharEncoding (req, res);
- } else if ( action.equals("includeServlet") ) {
- includeServlet (req, res);
- } else if ( action.equals("forwardServlet") ) {
- forwardServlet (req, res);
- } else if ( action.equals("sendErrorMessage") ) {
- sendErrorMessage (req, res);
- } else if ( action.equals("useResourceBundle") ) {
- useResourceBundle (req, res);
- } else if ( action.equals("forwardJsp") ) {
- forwardJsp (req, res);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- /** Sets the charset attribute to the session and generates an input form
- * @param request servlet request
- * @param response servlet response
+ if(func.equals("sendInput")) {
+ String charsetval = req.getParameter("charsetval");
+ sendInput (req, res, charsetval, action);
+ } else {
+ if ( action.equals("formatDate") ) {
+ formatDate (req, res);
+ } else if ( action.equals("setCharEncoding") ) {
+ setCharEncoding (req, res);
+ } else if ( action.equals("includeServlet") ) {
+ includeServlet (req, res);
+ } else if ( action.equals("forwardServlet") ) {
+ forwardServlet (req, res);
+ } else if ( action.equals("sendErrorMessage") ) {
+ sendErrorMessage (req, res);
+ } else if ( action.equals("useResourceBundle") ) {
+ useResourceBundle (req, res);
+ } else if ( action.equals("forwardJsp") ) {
+ forwardJsp (req, res);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ /** Sets the charset attribute to the session and generates an input form
+ * @param request servlet request
+ * @param response servlet response
*/
- protected void sendInput (HttpServletRequest req, HttpServletResponse res, String charsetval, String action)
+ protected void sendInput (HttpServletRequest req, HttpServletResponse res, String charsetval, String action)
throws ServletException, IOException {
- try {
- HttpSession session = req.getSession(true);
- session.setAttribute("charset", charsetval);
- res.setContentType("text/html; charset=" + charsetval);
- PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head>");
- out.println("<title>Servlet i18n samples</title></head>");
- out.println("<body><br>");
- out.println("<P><FONT FACE=\"Times New Roman\"><FONT SIZE=6><B>Servlet i18n samples</B></FONT></FONT></P>");
- out.println("<form name=\"i18n-simple\" method=\"post\" action=\"/i18n-simple/SimpleI18nServlet\">");
- out.println("<table>");
- out.println("<tr>");
- out.println("<td><H3>Please enter your name:</H3></td>");
- out.println("<td>");
- out.println("<input type=\"text\" name=\"name\" size=\"20\">");
- out.println("</td>");
- out.println("</tr>");
- out.println("</table>");
- out.println("<pre>");
- out.println("<input type=submit value=Submit>");
- out.println("</pre>");
- out.println("<input type=hidden name=charsetval value=" + charsetval + ">");
- out.println("<input type=hidden name=action value=" + action + ">");
- out.println("<input type=hidden name=func value=exec>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</form>");
- out.println("</body>");
- out.println("</html>");
- out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ try {
+ HttpSession session = req.getSession(true);
+ session.setAttribute("charset", charsetval);
+ res.setContentType("text/html; charset=" + charsetval);
+ PrintWriter out = res.getWriter();
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Servlet i18n samples</title></head>");
+ out.println("<body><br>");
+ out.println("<P><FONT FACE=\"Times New Roman\"><FONT SIZE=6><B>Servlet i18n samples</B></FONT></FONT></P>");
+ out.println("<form name=\"i18n-simple\" method=\"post\" action=\"/i18n-simple/SimpleI18nServlet\">");
+ out.println("<table>");
+ out.println("<tr>");
+ out.println("<td><H3>Please enter your name:</H3></td>");
+ out.println("<td>");
+ out.println("<input type=\"text\" name=\"name\" size=\"20\">");
+ out.println("</td>");
+ out.println("</tr>");
+ out.println("</table>");
+ out.println("<pre>");
+ out.println("<input type=submit value=Submit>");
+ out.println("</pre>");
+ out.println("<input type=hidden name=charsetval value=" + charsetval + ">");
+ out.println("<input type=hidden name=action value=" + action + ">");
+ out.println("<input type=hidden name=func value=exec>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</form>");
+ out.println("</body>");
+ out.println("</html>");
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Gets the locale information from browser settings and sets the locale to
@@ -129,25 +129,25 @@
protected void formatDate (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
// Get's the locale of the browser from the request object
- Locale browserLocale = req.getLocale();
+ Locale browserLocale = req.getLocale();
// Default locale of the response object
- Locale resLocale = res.getLocale();
- String resCharset = res.getCharacterEncoding();
+ Locale resLocale = res.getLocale();
+ String resCharset = res.getCharacterEncoding();
// Set's the browser's locale to the response object
res.setLocale(browserLocale);
- Locale resLocaleAfter = res.getLocale();
- String resCharsetAfter = res.getCharacterEncoding();
+ Locale resLocaleAfter = res.getLocale();
+ String resCharsetAfter = res.getCharacterEncoding();
res.setContentType("text/html; charset=" + resCharsetAfter);
// Output stream for the response
- java.io.PrintWriter out = res.getWriter();
+ java.io.PrintWriter out = res.getWriter();
out.println("<html>");
out.println("<head><title>Formatting date as per browser's locale</title></head>");
@@ -161,19 +161,19 @@
out.println("Response charset after setting it from request locale: " + resCharsetAfter + "<br>");
// Get today's date and formats it using the browser locale
- java.util.Date today = new java.util.Date();
- DateFormat formatter = DateFormat.getDateInstance(DateFormat.FULL, browserLocale);
- String formattedDate = formatter.format(today);
+ java.util.Date today = new java.util.Date();
+ DateFormat formatter = DateFormat.getDateInstance(DateFormat.FULL, browserLocale);
+ String formattedDate = formatter.format(today);
out.println("Today's date for " + resLocaleAfter + " is : " + formattedDate + "<br>");
out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
out.println("</body></html>");
out.close();
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }
/** Sets request's character encoding using setCharacterEncoding method of HttpServletRequest interface.
* The setCharacterEncoding method is used to inform the servlet container to read request parameters using specified encoding.
@@ -183,24 +183,24 @@
protected void setCharEncoding (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
- // Output stream for the response
- PrintWriter out = res.getWriter();
+ // Output stream for the response
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head><title>Setting request object's character encoding to " + charsetval + "</title></head>");
- out.println("<body>");
- out.println("<br><H3> The name entered was : " + name + " and the associated encoding was : " + charsetval + "</H3><br>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
- out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ out.println("<html>");
+ out.println("<head><title>Setting request object's character encoding to " + charsetval + "</title></head>");
+ out.println("<body>");
+ out.println("<br><H3> The name entered was : " + name + " and the associated encoding was : " + charsetval + "</H3><br>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</body></html>");
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Includes a servlet using RequestDispatcher's include method. Here the data display behaviour
@@ -212,30 +212,30 @@
protected void includeServlet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
- // Output stream for the response
- PrintWriter out = res.getWriter();
+ // Output stream for the response
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head><title>Including another servlet from a servlet</title></head>");
- out.println("<body>");
+ out.println("<html>");
+ out.println("<head><title>Including another servlet from a servlet</title></head>");
+ out.println("<body>");
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher("/IncludedServlet");
- dispatcher.include(req, res);
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher("/IncludedServlet");
+ dispatcher.include(req, res);
- out.println("<br>Name from the including servlet: " + name + "<br>");
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
- out.close();
+ out.println("<br>Name from the including servlet: " + name + "<br>");
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</body></html>");
+ out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Forwards a servlet using RequestDispatcher's forward method. Here the data display behaviour
@@ -248,24 +248,24 @@
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
- // Output stream for the response
- PrintWriter out = res.getWriter();
+ // Output stream for the response
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head><title>Including another servlet from a servlet</title></head>");
- out.println("<body>");
- out.println("<br>The name from forwarding servlet : " + name );
+ out.println("<html>");
+ out.println("<head><title>Including another servlet from a servlet</title></head>");
+ out.println("<body>");
+ out.println("<br>The name from forwarding servlet : " + name );
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher("/ForwardedServlet");
- dispatcher.forward(req, res);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher("/ForwardedServlet");
+ dispatcher.forward(req, res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Send error messages using response's sendError method. The sendError method sends multi byte error messages correctly
@@ -276,16 +276,16 @@
protected void sendErrorMessage (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
- res.sendError(404, "I18n error message from servlet "+ name);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
+ res.sendError(404, "I18n error message from servlet "+ name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- /** Load resource bundle based on client's locale. If there is no resource bundle available, the default resource bundle
+ /** Load resource bundle based on client's locale. If there is no resource bundle available, the default resource bundle
* will be picked up
* @param request servlet request
* @param response servlet response
@@ -293,43 +293,43 @@
protected void useResourceBundle (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- String name = req.getParameter("name");
- String charsetval = req.getParameter("charsetval");
- res.setContentType("text/html; charset=" + charsetval);
- ResourceBundle rb = null;
- rb = ResourceBundle.getBundle("LocalStrings",req.getLocale());
- String msg;
- PrintWriter out = res.getWriter();
+ String name = req.getParameter("name");
+ String charsetval = req.getParameter("charsetval");
+ res.setContentType("text/html; charset=" + charsetval);
+ ResourceBundle rb = null;
+ rb = ResourceBundle.getBundle("LocalStrings",req.getLocale());
+ String msg;
+ PrintWriter out = res.getWriter();
- out.println("<html>");
- out.println("<head>");
+ out.println("<html>");
+ out.println("<head>");
- try {
- msg = rb.getString ("title");
- out.println("<title>" + msg + "</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<br><H1> Hello " + name + ", the following messages are displayed from a resource bundle</H1>");
- msg = rb.getString ("msg");
- out.println("<br><br><H2>" + msg + "</H2>");
- msg = rb.getString ("thanks");
- out.println("<br><br><H3>" + msg + "</H3>");
+ try {
+ msg = rb.getString ("title");
+ out.println("<title>" + msg + "</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<br><H1> Hello " + name + ", the following messages are displayed from a resource bundle</H1>");
+ msg = rb.getString ("msg");
+ out.println("<br><br><H2>" + msg + "</H2>");
+ msg = rb.getString ("thanks");
+ out.println("<br><br><H3>" + msg + "</H3>");
- } catch (MissingResourceException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- out.println("<br>");
- out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
- out.println("</body></html>");
- out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } catch (MissingResourceException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ out.println("<br>");
+ out.println("<P><BR><A HREF=\"/i18n-simple\">Back to sample home</A></P>");
+ out.println("</body></html>");
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- /** Forwards request from servlet to jsp using RequestDispatcher's forward method. Here the data display behaviour
+ /** Forwards request from servlet to jsp using RequestDispatcher's forward method. Here the data display behaviour
* changes based on the content type set. If the forwarded jsp sets the content type to a different value then the new content type
* should be set for the output stream
* @param request servlet request
@@ -338,12 +338,12 @@
protected void forwardJsp (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
try {
- RequestDispatcher dispatcher;
- dispatcher = getServletContext().getRequestDispatcher("/ForwardedJsp.jsp");
- dispatcher.forward(req, res);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ RequestDispatcher dispatcher;
+ dispatcher = getServletContext().getRequestDispatcher("/ForwardedJsp.jsp");
+ dispatcher.forward(req, res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/** Handles the HTTP <code>GET</code> method.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java
index c9857f9..78dc9ff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/misc/samples/i18n/simple/servlet/samplebean/JavaUseBean.java
@@ -23,7 +23,7 @@
/**
* Simple Java Bean used to set/get name and greeting messages from a jsp
* @author Chand Basha
- * @version 1.0
+ * @version 1.0
*/
public class JavaUseBean {
@@ -40,7 +40,7 @@
this.name = name;
}
- /** Gets the name that was set using setName(String name) method of this class
+ /** Gets the name that was set using setName(String name) method of this class
*/
public String getName() {
return name;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/war/build.xml
index daa98b6..85ce827 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/manifestClassPath/war/build.xml
@@ -23,31 +23,31 @@
<project name="i18n-simple" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
<target name="prepare" depends="init">
<mkdir dir="${build}" />
</target>
-
- <target name="compile" depends="prepare"/>
-
- <target name="assemble" depends="compile">
- <copy file="../descriptor/web.xml" todir="${build}/WEB-INF"/>
- <copy file="../descriptor/sun-web.xml" todir="${build}/WEB-INF"
+
+ <target name="compile" depends="prepare"/>
+
+ <target name="assemble" depends="compile">
+ <copy file="../descriptor/web.xml" todir="${build}/WEB-INF"/>
+ <copy file="../descriptor/sun-web.xml" todir="${build}/WEB-INF"
failonerror="false"/>
- <copy todir="${build}/WEB-INF/tlds">
+ <copy todir="${build}/WEB-INF/tlds">
<fileset dir="tlds"/>
</copy>
<copy todir="${build}">
<fileset dir="docroot" includes="*.jsp, *.html"/>
</copy>
- <jar destfile="${archivedir}/i18n-simple.war"
+ <jar destfile="${archivedir}/i18n-simple.war"
manifest="../manifest/MANIFEST.MF"
basedir="${build}"/>
- </target>
+ </target>
- <target name="private-all" depends="assemble">
- </target>
+ <target name="private-all" depends="assemble">
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml
index cc350ae..51e28bf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml
@@ -133,7 +133,7 @@
<!-- create-app-ref to cluster -->
<antcall target="common.run.asadmin">
<param name="arg.list"
- value="create-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${testName2}"/>
+ value="create-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${testName2}"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml
index 64fc7ea..90454e3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml
@@ -20,29 +20,29 @@
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
]>
-
+
<project name="wstoejb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
+ <target name="prepare" depends="init">
<mkdir dir="${build}" />
<mkdir dir="${archivedir}" />
<copy file="WebServiceToEjb.wsdl" todir="${build}/META-INF/wsdl"/>
<exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-import -d ${build} -classpath ${build} -mapping ${build}/mapping.xml wscompile_config.xml"/>
+ <arg line="-import -d ${build} -classpath ${build} -mapping ${build}/mapping.xml wscompile_config.xml"/>
</exec>
- </target>
+ </target>
- <target name="compile" depends="prepare">
- <javac srcdir="wstoejb" destdir="${build}">
+ <target name="compile" depends="prepare">
+ <javac srcdir="wstoejb" destdir="${build}">
<classpath refid="gfv3.classpath"/>
</javac>
- </target>
+ </target>
- <target name="assemble" depends="compile,setHttpPort">
+ <target name="assemble" depends="compile,setHttpPort">
<mkdir dir="${build}/META-INF"/>
<copy file="application-client.xml" todir="${build}/META-INF"/>
<jar destfile="${archivedir}/appclient-portable.jar" basedir="${build}">
@@ -60,8 +60,8 @@
<attribute name="main-class" value="wstoejb.Client"/>
</manifest>
</jar>
- </target>
-
- <target name="private-all" depends="assemble"/>
+ </target>
+
+ <target name="private-all" depends="assemble"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml
index b20fa00..faf43de 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml
@@ -21,6 +21,6 @@
<sun-application-client>
<service-ref>
<service-ref-name>service/WstoEjbService</service-ref-name>
- <wsdl-override>http://HTTP_HOST:HTTP_PORT/wstoejb/wstoejb?WSDL</wsdl-override>
+ <wsdl-override>http://HTTP_HOST:HTTP_PORT/wstoejb/wstoejb?WSDL</wsdl-override>
</service-ref>
</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml
index 5a5b9f5..e781eb3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="WebServiceToEjb.wsdl"
packageName="wstoejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java
index a48a277..5a6a35b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wstoejb/Client.java
@@ -29,26 +29,26 @@
* This is a appclient test
*/
public class Client {
-
+
public static void main(String args[]) {
-
+
boolean testPositive = (Boolean.valueOf(args[0])).booleanValue();
try {
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
Service myWebService = (Service)
- ic.lookup("java:comp/env/service/WstoEjbService");
+ ic.lookup("java:comp/env/service/WstoEjbService");
WebServiceToEjbSEI port = (WebServiceToEjbSEI) myWebService.getPort(WebServiceToEjbSEI.class);
System.out.println(port.payload("APPCLIENT as client"));
} catch(Throwable t) {
- if(testPositive) {
- t.printStackTrace();
- System.exit(-1);
- } else {
- System.out.println("Recd exception as expected");
- }
+ if(testPositive) {
+ t.printStackTrace();
+ System.exit(-1);
+ } else {
+ System.out.println("Recd exception as expected");
+ }
}
- System.exit(0);
+ System.exit(0);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml
index 85827b7..364a7ba 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml
@@ -23,9 +23,9 @@
<project name="wstoejb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
-
+
<property name="testName" value="wstoejb"/>
<target name="prepare" depends="init">
<property name="portable.ear" value="${build}/wstoejb-portable.ear"/>
@@ -45,10 +45,10 @@
<property name="build" value="${build}/war"/>
</ant>
- <copy file="${build}/war/WEB-INF/wsdl/WebServiceToEjb.wsdl" todir="appclient"/>
+ <copy file="${build}/war/WEB-INF/wsdl/WebServiceToEjb.wsdl" todir="appclient"/>
<ant dir="appclient" target="private-all">
<property name="build" value="${build}/appclient"/>
- </ant>
+ </ant>
<delete file="appclient/WebServiceToEjb.wsdl"/>
<mkdir dir="${build}/ear/META-INF"/>
@@ -146,11 +146,11 @@
<target name="runclient" depends="prepare">
<exec executable="${APPCLIENT}" resultproperty="result" output="${build}/${log.id}.output.log">
<arg line="-client ${build}/wstoejbClient.jar ${arg.list}"/>
- </exec>
+ </exec>
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
<target name="private-all" unless="EE">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml
index a0ca180..4882f10 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml
@@ -20,33 +20,33 @@
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
]>
-
+
<project name="wstoejb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="wstoejb" destdir="${build}">
+ <target name="prepare" depends="init">
+ <mkdir dir="${build}" />
+ <mkdir dir="${archivedir}" />
+ </target>
+
+ <target name="compile" depends="prepare">
+ <javac srcdir="wstoejb" destdir="${build}">
<classpath refid="gfv3.classpath"/>
</javac>
- </target>
-
- <target name="assemble" depends="compile">
- <mkdir dir="${build}/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <jar destfile="${archivedir}/wstoejb-portable.jar" basedir="${build}"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${archivedir}/wstoejb.jar" basedir="${build}"/>
- </target>
-
- <target name="private-all" depends="assemble">
- </target>
+ </target>
+
+ <target name="assemble" depends="compile">
+ <mkdir dir="${build}/META-INF"/>
+ <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
+ <jar destfile="${archivedir}/wstoejb-portable.jar" basedir="${build}"/>
+ <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
+ <jar destfile="${archivedir}/wstoejb.jar" basedir="${build}"/>
+ </target>
+
+ <target name="private-all" depends="assemble">
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
index 75e9120..96ac675 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
@@ -21,16 +21,16 @@
/**
* Simple interface for a statefull session bean.
- *
+ *
* @author Jerome Dochez
*/
public interface StatefulSessionBean extends EJBObject {
- /**
- * perform some kind of processing
- * @param payload is the request info
- * @return the processed info
- * @throws RemoteException
- */
- public String payLoad(String payload) throws RemoteException;
+ /**
+ * perform some kind of processing
+ * @param payload is the request info
+ * @return the processed info
+ * @throws RemoteException
+ */
+ public String payLoad(String payload) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
index eb720f0..ccbcbb1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
@@ -21,36 +21,36 @@
/**
* Simple interface for a statefull session bean.
- *
+ *
* @author Jerome Dochez
*/
public class StatefulSessionBeanEJB implements SessionBean {
- private SessionContext sc;
-
- public StatefulSessionBeanEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In ejbCreate !!");
- }
+ private SessionContext sc;
- public void setSessionContext(SessionContext sc) {
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-
- /**
- * perform some kind of processing
- * @param payload is the request info
- * @return the processed info
- * @throws RemoteException
- */
- public String payLoad(String payload) throws RemoteException {
- return "Hey " + payload + ", I am such a dummy ejb, don't bother !";
- }
+ public StatefulSessionBeanEJB(){}
+
+ public void ejbCreate() throws RemoteException {
+ System.out.println("In ejbCreate !!");
+ }
+
+ public void setSessionContext(SessionContext sc) {
+ this.sc = sc;
+ }
+
+ public void ejbRemove() throws RemoteException {}
+
+ public void ejbActivate() {}
+
+ public void ejbPassivate() {}
+
+ /**
+ * perform some kind of processing
+ * @param payload is the request info
+ * @return the processed info
+ * @throws RemoteException
+ */
+ public String payLoad(String payload) throws RemoteException {
+ return "Hey " + payload + ", I am such a dummy ejb, don't bother !";
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
index f0761c5..62bee76 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
@@ -22,11 +22,11 @@
/**
* Simple interface to create a statefull session bean
- *
+ *
* @author Jerome Dochez
*/
public interface StatefulSessionBeanHome extends EJBHome {
- public StatefulSessionBean create () throws RemoteException, CreateException;
+ public StatefulSessionBean create () throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml
index 7dd5728..1ee39d8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml
@@ -23,47 +23,47 @@
<project name="WebServiceToEjb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
- <property name="binary" value="${build}/WEB-INF/classes"/>
- <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
- <mkdir dir="${binary}" />
- <mkdir dir="${wsdl}"/>
- <mkdir dir="${archivedir}" />
- </target>
-
- <target name="compile" depends="prepare, import-dep">
- <javac srcdir="wstoejb" destdir="${binary}">
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${build}/WEB-INF/lib/library.jar"/>
- </classpath>
- </javac>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
- </exec>
- </target>
-
- <target name="import-dep">
- <mkdir dir="${build}/WEB-INF/lib" />
- <mkdir dir="${build}/tmp/wstoejb" />
- <copy file="${build}/../ejb/wstoejb/StatefulSessionBean.class" todir="${build}/tmp/wstoejb"/>
- <copy file="${build}/../ejb/wstoejb/StatefulSessionBeanHome.class" todir="${build}/tmp/wstoejb"/>
- <jar destfile="${build}/WEB-INF/lib/library.jar" basedir="${build}/tmp"/>
- <delete dir="${build}/tmp"/>
- </target>
-
- <target name="assemble" depends="compile">
- <copy file="web.xml" todir="${build}/WEB-INF"/>
- <copy file="webservices.xml" todir="${build}/WEB-INF"/>
- <jar destfile="${archivedir}/sayhello-portable.war" basedir="${build}"/>
- <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
- <jar destfile="${archivedir}/sayhello.war" basedir="${build}"/>
- </target>
+ <target name="prepare" depends="init">
+ <property name="binary" value="${build}/WEB-INF/classes"/>
+ <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
+ <mkdir dir="${binary}" />
+ <mkdir dir="${wsdl}"/>
+ <mkdir dir="${archivedir}" />
+ </target>
- <target name="private-all" depends="assemble"/>
+ <target name="compile" depends="prepare, import-dep">
+ <javac srcdir="wstoejb" destdir="${binary}">
+ <classpath>
+ <path refid="gfv3.classpath"/>
+ <path location="${build}/WEB-INF/lib/library.jar"/>
+ </classpath>
+ </javac>
+ <echo message="invoking wscompile to generate wsdl file"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
+ </exec>
+ </target>
+
+ <target name="import-dep">
+ <mkdir dir="${build}/WEB-INF/lib" />
+ <mkdir dir="${build}/tmp/wstoejb" />
+ <copy file="${build}/../ejb/wstoejb/StatefulSessionBean.class" todir="${build}/tmp/wstoejb"/>
+ <copy file="${build}/../ejb/wstoejb/StatefulSessionBeanHome.class" todir="${build}/tmp/wstoejb"/>
+ <jar destfile="${build}/WEB-INF/lib/library.jar" basedir="${build}/tmp"/>
+ <delete dir="${build}/tmp"/>
+ </target>
+
+ <target name="assemble" depends="compile">
+ <copy file="web.xml" todir="${build}/WEB-INF"/>
+ <copy file="webservices.xml" todir="${build}/WEB-INF"/>
+ <jar destfile="${archivedir}/sayhello-portable.war" basedir="${build}"/>
+ <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
+ <jar destfile="${archivedir}/sayhello.war" basedir="${build}"/>
+ </target>
+
+ <target name="private-all" depends="assemble"/>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml
index 44c72d8..4db777f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="WebServiceToEjb"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
+ <service
+ name="WebServiceToEjb"
+ targetNamespace="urn:DeploymentWebServiceTest"
+ typeNamespace="urn:DeploymentWebServiceTest"
packageName="wstoejb">
<interface name="wstoejb.WebServiceToEjbSEI"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java
index ca88821..aafc9a6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbSEI.java
@@ -15,21 +15,21 @@
*/
package wstoejb;
-
+
import java.rmi.Remote;
import java.rmi.RemoteException;
-
+
/*
- * This interface is the service endpoint interface for a simple webservices
+ * This interface is the service endpoint interface for a simple webservices
* interfacing a simple EJB
- *
+ *
* @author Jerome Dochez
*/
public interface WebServiceToEjbSEI extends Remote {
-
- /*
- * Invoke the ejb
- */
- public String payload(String requestInfo) throws RemoteException;
-
+
+ /*
+ * Invoke the ejb
+ */
+ public String payload(String requestInfo) throws RemoteException;
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java
index 47d2432..f759331 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/wstoejb/WebServiceToEjbServlet.java
@@ -15,51 +15,51 @@
*/
package wstoejb;
-
+
import java.rmi.*;
import javax.rmi.*;
import javax.naming.*;
-
+
/**
* Simple servlet implementation of the SEI
- *
+ *
* @author Jerome Dochez
*/
public class WebServiceToEjbServlet implements WebServiceToEjbSEI {
-
- /**
- * Implementation of the SEI's methods
- */
- public String payload(String requestInfo) throws RemoteException {
- try {
- if (bean==null) {
- bean = createEJB();
- }
- return(getMsg(requestInfo) + "; and dont bother this dummy servlet also");
- } catch(Exception e) {
- throw new RemoteException(e.getMessage());
- }
- }
- /**
- * Creates the ejb object from it's home interface
- */
- private StatefulSessionBean createEJB() throws Exception {
- // connect to the EJB
- Context ctxt = new InitialContext();
- java.lang.Object objref = ctxt.lookup("java:comp/env/MyEjbReference");
- StatefulSessionBeanHome homeIntf = (StatefulSessionBeanHome) PortableRemoteObject.narrow(objref, StatefulSessionBeanHome.class);
- return homeIntf.create();
- }
-
- public String getMsg(String info) throws Exception {
- if (bean == null) {
- return "could not talk to the EJB : java:comp/env/MyEjbReference";
- } else {
- return bean.payLoad(info);
- }
- }
-
- private StatefulSessionBean bean;
+ /**
+ * Implementation of the SEI's methods
+ */
+ public String payload(String requestInfo) throws RemoteException {
+ try {
+ if (bean==null) {
+ bean = createEJB();
+ }
+ return(getMsg(requestInfo) + "; and dont bother this dummy servlet also");
+ } catch(Exception e) {
+ throw new RemoteException(e.getMessage());
+ }
+ }
+
+ /**
+ * Creates the ejb object from it's home interface
+ */
+ private StatefulSessionBean createEJB() throws Exception {
+ // connect to the EJB
+ Context ctxt = new InitialContext();
+ java.lang.Object objref = ctxt.lookup("java:comp/env/MyEjbReference");
+ StatefulSessionBeanHome homeIntf = (StatefulSessionBeanHome) PortableRemoteObject.narrow(objref, StatefulSessionBeanHome.class);
+ return homeIntf.create();
+ }
+
+ public String getMsg(String info) throws Exception {
+ if (bean == null) {
+ return "could not talk to the EJB : java:comp/env/MyEjbReference";
+ } else {
+ return bean.payLoad(info);
+ }
+ }
+
+ private StatefulSessionBean bean;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml
index 01da7fd..c3e6fe1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml
@@ -23,14 +23,14 @@
<project name="ejb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="statelesshello" target="private-all">
- <property name="build" value="${build}/statelesshello"/>
- </ant>
- <!--ant dir="webservice" target="private-all">
- <property name="build" value="${build}/webservice"/>
- </ant-->
- </target>
+ <target name="private-all">
+ <ant dir="statelesshello" target="private-all">
+ <property name="build" value="${build}/statelesshello"/>
+ </ant>
+ <!--ant dir="webservice" target="private-all">
+ <property name="build" value="${build}/webservice"/>
+ </ant-->
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java
index bff3903..ce61b3c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/StatelessHelloTest.java
@@ -38,17 +38,17 @@
* undeploy the app using JSR-88
*
* @author: tjquinn
- *
+ *
*/
public class StatelessHelloTest extends DeploymentTest {
-
+
private int nextLogID = 0;
-
+
/** Creates a new instance of ExampleTest */
public StatelessHelloTest() {
}
-
+
/**
*Deploy the app using asadmin and run it, expecting a positive result.
*/
@@ -57,16 +57,16 @@
deploy();
runPositive("ejb/statelessejb Test asadmin deploy");
}
-
+
/**
- *Redeploy and run after first test.
+ *Redeploy and run after first test.
*/
@Test(dependsOnMethods={"deployWithAsadminAndRun"})
public void redeployWithAsadminAndRun() {
redeploy();
runPositive("ejb/statelessejb Test asadmin redeploy");
}
-
+
/**
*Undeploy using asadmin after first deployment and redeployment.
*/
@@ -74,7 +74,7 @@
public void undeployAfterAsadminRuns() {
undeploy();
}
-
+
/**
*Deploy with JSR-88 and run.
*/
@@ -83,7 +83,7 @@
deployWithJSR88();
runPositive("ejb/statelessejb Test jsr88 deploy");
}
-
+
/**
*Stop using JSR-88 and attempt to run.
*/
@@ -92,7 +92,7 @@
stopWithJSR88();
runNegative("ejb/statelessejb Test jsr88 stopped state");
}
-
+
/**
*Start with JSR-88 and attempt to run.
*/
@@ -101,7 +101,7 @@
startWithJSR88();
runPositive("ejb/statelessejb Test jsr88 started state");
}
-
+
/**
*Stop, redeploy, and attempt to run (should fail).
*/
@@ -116,39 +116,39 @@
public void unsetup() {
undeployAtEnd();
}
-
+
public void undeployAtEnd() {
undeployWithJSR88();
}
-
+
protected void deployWithJSR88() {
project.executeTarget("deploy.jsr88");
}
-
+
protected void startWithJSR88() {
project.executeTarget("start.jsr88");
}
-
+
protected void stopWithJSR88() {
project.executeTarget("stop.jsr88");
}
-
+
protected void redeployWithJSR88() {
project.executeTarget("redeploy.jsr88");
}
-
+
protected void undeployWithJSR88() {
project.executeTarget("undeploy.jsr88");
}
-
+
protected void runPositive(String testTitle) {
run(testTitle, "run.positive");
}
-
+
protected void runNegative(String testTitle) {
run(testTitle, "run.negative");
}
-
+
protected void run(String testTitle, String runTarget) {
CallTarget target = new CallTarget();
target.setProject(project);
@@ -160,7 +160,7 @@
logID.setValue(String.valueOf(nextLogID++));
description.setName("description");
description.setValue(testTitle);
-
+
target.execute();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml
index 4c073e7..0acade4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml
@@ -20,38 +20,38 @@
<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
]>
-
+
<project name="statelesshello" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
<property name="testName" value="StatelessHelloEjb"/>
- <target name="prepare" depends="init">
- <property name="portable.jar" value="${archivedir}/statelesshelloejb-portable.jar"/>
- <property name="all.jar" value="${archivedir}/statelesshelloejb.jar"/>
- <property name="deployplan.jar" value="${archivedir}/statelesshelloejb-plan.jar"/>
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="statelesshello" destdir="${build}">
+ <target name="prepare" depends="init">
+ <property name="portable.jar" value="${archivedir}/statelesshelloejb-portable.jar"/>
+ <property name="all.jar" value="${archivedir}/statelesshelloejb.jar"/>
+ <property name="deployplan.jar" value="${archivedir}/statelesshelloejb-plan.jar"/>
+ <mkdir dir="${build}" />
+ <mkdir dir="${archivedir}" />
+ </target>
+
+ <target name="compile" depends="prepare">
+ <javac srcdir="statelesshello" destdir="${build}">
<classpath refid="gfv3.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <mkdir dir="${build}/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <jar destfile="${portable.jar}" basedir="${build}" excludes="**/archives/**"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}" basedir="${build}" excludes="**/archives/**"/>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-ejb-jar.xml" excludes="**/archives/**"/>
- </jar>
- </target>
-
+ </javac>
+ </target>
+
+ <target name="assemble" depends="compile">
+ <mkdir dir="${build}/META-INF"/>
+ <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
+ <jar destfile="${portable.jar}" basedir="${build}" excludes="**/archives/**"/>
+ <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
+ <jar destfile="${all.jar}" basedir="${build}" excludes="**/archives/**"/>
+ <jar destfile="${deployplan.jar}">
+ <fileset dir="${basedir}" includes="sun-ejb-jar.xml" excludes="**/archives/**"/>
+ </jar>
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.jar}"/>
@@ -160,7 +160,7 @@
<javaWithResult
fork="true"
failonerror="false"
- jvm="${JAVA}"
+ jvm="${JAVA}"
classname="standaloneclient.HelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
@@ -171,7 +171,7 @@
<classpath>
<path refid="gfv3.classpath"/>
<path location="${build}"/>
- <path location="${archivedir}/StatelessHelloEjbClient.jar"/>
+ <path location="${archivedir}/StatelessHelloEjbClient.jar"/>
</classpath>
<arg line="${arg.list}"/>
@@ -181,8 +181,8 @@
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
- </target>
-
+ </target>
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="deploy.asadmin"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
index 982e81f..5ac3650 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
@@ -28,11 +28,11 @@
public static void main(String[] args) {
- boolean testPositive = (Boolean.valueOf(args[0])).booleanValue();
- if(testPositive)
- System.out.println("Test expects successful result");
- else
- System.out.println("Test expected to fail");
+ boolean testPositive = (Boolean.valueOf(args[0])).booleanValue();
+ if(testPositive)
+ System.out.println("Test expects successful result");
+ else
+ System.out.println("Test expected to fail");
try {
Context ic = new InitialContext();
@@ -75,29 +75,29 @@
} else {
System.out.println("Failure! Caught unasked for Exception");
- System.exit(-1);
+ System.exit(-1);
}
}
System.out.println(
"Client is now trying to remove the session bean\n");
hr.remove();
} catch (NamingException ne) {
- if(testPositive) {
- System.out.println("Caught exception while initializing context : " +
- ne.getMessage() + " \n");
- System.exit(-1);
- } else {
- System.out.println("Recd exception as expected");
- }
+ if(testPositive) {
+ System.out.println("Caught exception while initializing context : " +
+ ne.getMessage() + " \n");
+ System.exit(-1);
+ } else {
+ System.out.println("Recd exception as expected");
+ }
} catch (Exception re) {
- if(testPositive) {
- re.printStackTrace();
- System.out.println( "Session beans could not be removed by the client.\n");
- System.exit(-1);
- } else {
- System.out.println("Recd exception as expected");
- }
- }
+ if(testPositive) {
+ re.printStackTrace();
+ System.out.println( "Session beans could not be removed by the client.\n");
+ System.exit(-1);
+ } else {
+ System.out.println("Recd exception as expected");
+ }
+ }
System.out.println(
"Session bean was successfully removed by the client.\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
index f4b611d..ec3f69a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
import java.io.InputStream;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class StatelesshelloEJB implements SessionBean {
private SessionContext sc;
-
+
public StatelesshelloEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
}
public boolean isStatelesshello() throws EJBException {
@@ -52,47 +52,47 @@
- Double d = null;
- String name = null;
- StringBuffer buffer = new StringBuffer("Statelesshello EJB - checked environment properties for user ");
- System.out.println("StatelesshelloEJB is saying hello to user\n");
- System.out.println("Now going forward with reading the environment properties\n");
+ Double d = null;
+ String name = null;
+ StringBuffer buffer = new StringBuffer("Statelesshello EJB - checked environment properties for user ");
+ System.out.println("StatelesshelloEJB is saying hello to user\n");
+ System.out.println("Now going forward with reading the environment properties\n");
- try {
- InitialContext ic = new InitialContext();
- name = (String) ic.lookup("java:comp/env/user");
- buffer.append(name);
- buffer.append("\nand for number which is = ");
- d = (Double) ic.lookup("java:comp/env/number");
- buffer.append(d);
- buffer.append("\n");
- } catch(NamingException e) {
+ try {
+ InitialContext ic = new InitialContext();
+ name = (String) ic.lookup("java:comp/env/user");
+ buffer.append(name);
+ buffer.append("\nand for number which is = ");
+ d = (Double) ic.lookup("java:comp/env/number");
+ buffer.append(d);
+ buffer.append("\n");
+ } catch(NamingException e) {
e.printStackTrace();
throw new EJBException(e.getMessage());
- }
- if(d == null) {
- throw new EJBException("Wrong value for environment property");
- }
- System.out.println(buffer);
+ }
+ if(d == null) {
+ throw new EJBException("Wrong value for environment property");
+ }
+ System.out.println(buffer);
return new String(buffer);
}
-
+
public String getUserDefinedException() throws RemoteException, StatelesshelloException {
-
+
System.out.println("Throwing a User Defined Exception");
throw new StatelesshelloException("test exception");
-
+
}
-
-
+
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java
index 943eb39..b88257d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloException.java
@@ -19,9 +19,9 @@
import java.rmi.RemoteException;
public class StatelesshelloException extends Exception {
-
+
public StatelesshelloException(String str) {
- super(str);
+ super(str);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml
index 55018c7..b9f0519 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml
@@ -25,36 +25,36 @@
&commonBuild;
<property name="archivedir" value="${build}/archives"/>
-
+
<property name="testName" value="SayHelloWS"/>
<target name="prepare" depends="init">
- <property name="wsdl" value="${build}/META-INF/wsdl"/>
- <mkdir dir="${build}" />
- <mkdir dir="${wsdl}"/>
- <property name="portable.jar" value="${archivedir}/sayhello-portable.jar"/>
- <property name="all.jar" value="${archivedir}/sayhello.jar"/>
- <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
+ <property name="wsdl" value="${build}/META-INF/wsdl"/>
+ <mkdir dir="${build}" />
+ <mkdir dir="${wsdl}"/>
+ <property name="portable.jar" value="${archivedir}/sayhello-portable.jar"/>
+ <property name="all.jar" value="${archivedir}/sayhello.jar"/>
+ <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
</target>
-
+
<target name="compile" depends="prepare">
- <javac srcdir="helloservice" destdir="${build}">
+ <javac srcdir="helloservice" destdir="${build}">
<classpath refid="gfv3.classpath"/>
</javac>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${build} -nd ${wsdl} -classpath ${build} -mapping ${build}/mapping.xml"/>
- </exec>
+ <echo message="invoking wscompile to generate wsdl file"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-define config-interface.xml -d ${build} -nd ${wsdl} -classpath ${build} -mapping ${build}/mapping.xml"/>
+ </exec>
</target>
-
+
<target name="assemble" depends="compile">
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <copy file="webservices.xml" todir="${build}/META-INF"/>
- <jar destfile="${portable.jar}" basedir="${build}"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}" basedir="${build}"/>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-ejb-jar.xml"/>
- </jar>
+ <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
+ <copy file="webservices.xml" todir="${build}/META-INF"/>
+ <jar destfile="${portable.jar}" basedir="${build}"/>
+ <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
+ <jar destfile="${all.jar}" basedir="${build}"/>
+ <jar destfile="${deployplan.jar}">
+ <fileset dir="${basedir}" includes="sun-ejb-jar.xml"/>
+ </jar>
</target>
<target name="deploy.asadmin" depends="prepare">
@@ -62,10 +62,10 @@
<param name="arg.list" value="--name ${testName} ${all.jar}"/>
<param name="testName" value="${testName}"/>
</antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${build} -classpath ${build} config-interface.xml"/>
- </exec>
+ <echo message="Create client webservices artifacts"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-gen:client -keep -d ${build} -classpath ${build} config-interface.xml"/>
+ </exec>
</target>
<target name="redeploy.asadmin" depends="prepare">
@@ -73,10 +73,10 @@
<param name="arg.list" value="--name ${testName} ${all.jar}"/>
<param name="testName" value="${testName}"/>
</antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${build} -classpath ${build} config-interface.xml"/>
- </exec>
+ <echo message="Create client webservices artifacts"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-gen:client -keep -d ${build} -classpath ${build} config-interface.xml"/>
+ </exec>
</target>
<target name="undeploy.asadmin">
@@ -149,7 +149,7 @@
<javaWithResult
fork="true"
failonerror="false"
- jvm="${JAVA}"
+ jvm="${JAVA}"
classname="staticstubclient.SayHelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml
index a99d9c0..894789a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
+ <service
+ name="SayHelloService"
+ targetNamespace="urn:DeploymentWebServiceTest"
+ typeNamespace="urn:DeploymentWebServiceTest"
packageName="helloservice">
<interface name="helloservice.SayHello"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml
index fa18ede..f2f15ca 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml
@@ -19,14 +19,14 @@
<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>SayHelloJAR</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SayHelloEJB</ejb-name>
- <service-endpoint>helloservice.SayHello</service-endpoint>
- <ejb-class>helloservice.SayHelloEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
+ <display-name>SayHelloJAR</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>SayHelloEJB</ejb-name>
+ <service-endpoint>helloservice.SayHello</service-endpoint>
+ <ejb-class>helloservice.SayHelloEJB</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java
index 34d0b9a..b82c913 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHello.java
@@ -15,11 +15,11 @@
*/
package helloservice;
-
+
import java.rmi.Remote;
import java.rmi.RemoteException;
public interface SayHello extends Remote {
- public String sayHello(String name) throws RemoteException;
+ public String sayHello(String name) throws RemoteException;
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
index 46e08dc..2cebc88 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
@@ -21,21 +21,21 @@
public class SayHelloEJB implements SessionBean {
- private SessionContext sc;
+ private SessionContext sc;
- public SayHelloEJB() {}
+ public SayHelloEJB() {}
- public void ejbCreate() throws CreateException {}
+ public void ejbCreate() throws CreateException {}
- public String sayHello(String s) throws RemoteException {
- return "Hello EJB returns your Hello : " + s;
- }
+ public String sayHello(String s) throws RemoteException {
+ return "Hello EJB returns your Hello : " + s;
+ }
- public void setSessionContext(SessionContext sc) {
- this.sc = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ this.sc = sc;
+ }
- public void ejbRemove() throws RemoteException {}
- public void ejbActivate() {}
- public void ejbPassivate() {}
-}
+ public void ejbRemove() throws RemoteException {}
+ public void ejbActivate() {}
+ public void ejbPassivate() {}
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java
index 46c472a..55601fa 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/staticstubclient/SayHelloClient.java
@@ -24,25 +24,25 @@
public static void main(String[] args) {
System.out.println("Endpoint address = " + args[0]);
- boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
+ boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
try {
Stub stub = createProxy();
stub._setProperty
- (javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, args[0]);
- SayHello hello = (SayHello)stub;
+ (javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY, args[0]);
+ SayHello hello = (SayHello)stub;
System.out.println(hello.sayHello("Hi There ejb endpoint !!!"));
} catch (Exception ex) {
- if(testPositive) {
- ex.printStackTrace();
- System.exit(-1);
- } else {
- System.out.println("Exception recd as expected");
- }
- }
- System.exit(0);
- }
+ if(testPositive) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } else {
+ System.out.println("Exception recd as expected");
+ }
+ }
+ System.exit(0);
+ }
private static Stub createProxy() {
return (Stub) (new SayHelloService_Impl().getSayHelloPort());
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml
index 250fd61..2ff8aba 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml
@@ -19,15 +19,15 @@
-->
<sun-ejb-jar>
- <enterprise-beans>
- <name>SayHelloJAR</name>
- <ejb>
- <ejb-name>SayHelloEJB</ejb-name>
- <jndi-name>SayHelloEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SayHelloPort</port-component-name>
- <endpoint-address-uri>ejb/sayhello</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
+ <enterprise-beans>
+ <name>SayHelloJAR</name>
+ <ejb>
+ <ejb-name>SayHelloEJB</ejb-name>
+ <jndi-name>SayHelloEJB</jndi-name>
+ <webservice-endpoint>
+ <port-component-name>SayHelloPort</port-component-name>
+ <endpoint-address-uri>ejb/sayhello</endpoint-address-uri>
+ </webservice-endpoint>
+ </ejb>
+ </enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/build.xml
index eb68a9a..982ae4b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/build.xml
@@ -23,14 +23,14 @@
<project name="ejb30" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="ear" target="private-all">
- <property name="build" value="${build}/ear"/>
- </ant>
- <ant dir="war" target="private-all">
- <property name="build" value="${build}/war"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="ear" target="private-all">
+ <property name="build" value="${build}/ear"/>
+ </ant>
+ <ant dir="war" target="private-all">
+ <property name="build" value="${build}/war"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/build.xml
index 97f9115..37ee07a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/build.xml
@@ -23,28 +23,28 @@
<project name="ejb30" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="session" target="private-all">
- <property name="build" value="${build}/session"/>
- </ant>
- <ant dir="session2" target="private-all">
- <property name="build" value="${build}/session2"/>
- </ant>
- <ant dir="mdb" target="private-all">
- <property name="build" value="${build}/mdb"/>
- </ant>
+ <target name="private-all">
+ <ant dir="session" target="private-all">
+ <property name="build" value="${build}/session"/>
+ </ant>
+ <ant dir="session2" target="private-all">
+ <property name="build" value="${build}/session2"/>
+ </ant>
+ <ant dir="mdb" target="private-all">
+ <property name="build" value="${build}/mdb"/>
+ </ant>
<!--
- <ant dir="session3" target="private-all">
- <property name="build" value="${build}/session3"/>
- </ant>
+ <ant dir="session3" target="private-all">
+ <property name="build" value="${build}/session3"/>
+ </ant>
-->
- <ant dir="security" target="private-all">
- <property name="build" value="${build}/security"/>
- </ant>
- <ant dir="xmloverride" target="private-all">
- <property name="build" value="${build}/xmloverride"/>
- </ant>
- </target>
+ <ant dir="security" target="private-all">
+ <property name="build" value="${build}/security"/>
+ </ant>
+ <ant dir="xmloverride" target="private-all">
+ <property name="build" value="${build}/xmloverride"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/build.xml
index 428683c..bb19b88 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/build.xml
@@ -23,11 +23,11 @@
<project name="mdb" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all" if="PE">
- <ant dir="webclient" target="private-all">
- <property name="build" value="${build}/webclient"/>
- </ant>
- </target>
+ <target name="private-all" if="PE">
+ <ant dir="webclient" target="private-all">
+ <property name="build" value="${build}/webclient"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml
index 80c8b05..76a2c05 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/build.xml
@@ -50,7 +50,7 @@
<target name="assemble" depends="compile">
<jar destfile="${ejb.jar}">
<metainf file="descriptor/sun-ejb-jar.xml"/>
- <fileset dir="${build}" excludes="**/Servlet.class, **/TestClient.class"/>
+ <fileset dir="${build}" excludes="**/Servlet.class, **/TestClient.class"/>
</jar>
<war destfile="${web.war}" webxml="descriptor/web.xml">
@@ -129,19 +129,19 @@
<target name="deploy.jms.queues" depends="prepare">
<antcall target="common.create.jms.connection">
<param name="jms.factory.type" value="jakarta.jms.QueueConnectionFactory"/>
- <param name="jms.factory.name" value="jms/ejb_ejb30_hello_mdb_QCF"/>
+ <param name="jms.factory.name" value="jms/ejb_ejb30_hello_mdb_QCF"/>
</antcall>
<antcall target="common.create.jms.resource">
<param name="dest.type" value="queue"/>
<param name="dest.name" value="ejb_ejb30_hello_mdb_InQueue"/>
<param name="res.type" value="jakarta.jms.Queue"/>
- <param name="jms.resource.name" value="jms/ejb_ejb30_hello_mdb_InQueue"/>
+ <param name="jms.resource.name" value="jms/ejb_ejb30_hello_mdb_InQueue"/>
</antcall>
<antcall target="common.create.jms.resource">
<param name="dest.type" value="queue"/>
<param name="dest.name" value="ejb_ejb30_hello_mdb_OutQueue"/>
<param name="res.type" value="jakarta.jms.Queue"/>
- <param name="jms.resource.name" value="jms/ejb_ejb30_hello_mdb_OutQueue"/>
+ <param name="jms.resource.name" value="jms/ejb_ejb30_hello_mdb_OutQueue"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/Hello1.java
index 861518b..fccbaed 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
index 62b18c5..cdd33fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
@@ -37,7 +37,7 @@
msg);
}
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
index c7189ff..2a7e35e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
@@ -42,7 +42,7 @@
@EJB private Hello1 hello1;
@EJB private Hello2 hello2;
- @Resource(name="jms/MyQueueConnectionFactory")
+ @Resource(name="jms/MyQueueConnectionFactory")
QueueConnectionFactory qcFactory;
@Resource Queue clientQueue;
@@ -52,7 +52,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/deployment/ejb30/ear/mdb/webclient/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/Servlet.java
index 96b06ad..d3bba13 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/Servlet.java
@@ -26,26 +26,26 @@
@Resource(name="FooCF")
private QueueConnectionFactory queueConFactory;
-
- @Resource(name="MsgBeanQueue")
+
+ @Resource(name="MsgBeanQueue")
private jakarta.jms.Queue msgBeanQueue;
-
+
@Resource(name="ClientQueue")
private jakarta.jms.Queue clientQueue;
-
+
private QueueConnection queueCon;
private QueueSession queueSession;
private QueueSender queueSender;
private QueueReceiver queueReceiver;
- private int numMessages = 1;
+ private int numMessages = 1;
// in milli-seconds
private static long TIMEOUT = 90000;
public void init() throws ServletException {
-
+
super.init();
log("init()...");
}
@@ -60,9 +60,9 @@
}
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
log("service()...");
try {
@@ -76,15 +76,15 @@
out.println("<p>");
queueCon = queueConFactory.createQueueConnection();
-
+
queueSession = queueCon.createQueueSession
(false, Session.AUTO_ACKNOWLEDGE);
-
+
// Producer will be specified when actual msg is sent.
queueSender = queueSession.createSender(null);
-
+
queueReceiver = queueSession.createReceiver(clientQueue);
-
+
queueCon.start();
@@ -116,10 +116,10 @@
throw new ServletException(ex);
} finally {
cleanup();
- }
+ }
}
-
+
public void cleanup() {
try {
if( queueCon != null ) {
@@ -133,8 +133,8 @@
public void destroy() {
log("destroy()...");
}
-
+
public void log (String message) {
System.out.println("[webclient Servlet]:: " + message);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/TestClient.java
index fdc2788..2f5a914 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/servlet/TestClient.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-package com.sun.s1asdev.ejb.ejb30.hello.mdb;
+package com.sun.s1asdev.ejb.ejb30.hello.mdb;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/build.xml
index 92a3634..d5d779e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/build.xml
@@ -27,7 +27,7 @@
<property name="testName" value="deployment-ejb30-ear-security"/>
<property name="archivedir" value="${build}/archives"/>
-
+
<target name="prepare" depends="init">
<mkdir dir="${build}"/>
<mkdir dir="${archivedir}"/>
@@ -48,7 +48,7 @@
<classpath refid="gfv3.classpath"/>
</javac>
</target>
-
+
<target name="create.user" depends="setAsadminArgsWithoutPassword">
<antcall target="common.createuser.asadmin">
<param name="arg.list"
@@ -78,7 +78,7 @@
excludes="**/Client.class,**/ClientSuper.class,**/Servlet.class, **/MyFilter.class"/>
<war destfile="${web.war}" webxml="descriptor/web.xml">
- <classes dir="${build}"
+ <classes dir="${build}"
excludes="**/Client.class, **/*EJB.class, **/*.jar"/>
</war>
@@ -92,8 +92,8 @@
<include name="sun-application.xml"/>
</metainf>
</ear>
- </target>
-
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.ear}"/>
@@ -113,7 +113,7 @@
<param name="arg.list" value="${testName}"/>
<param name="testName" value="${testName}"/>
</antcall>
- </target>
+ </target>
<target name="runclient" depends="prepare,setOrbPort2,setHttpPort2">
<exec executable="${APPCLIENT}" resultproperty="result" failonerror="false" output="${build}/${log.id}.output.log">
@@ -129,9 +129,9 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="private-all">
<antcall target="create.user"/>
<antcall target="assemble"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
index 20b9149..c21f8d6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
@@ -31,13 +31,13 @@
System.out.println("deployment-ejb30-ear-security");
Client client = new Client(args);
client.doTest();
- }
-
+ }
+
public Client (String[] args) {
host = (args.length > 0) ? args[0] : "localhost";
port = (args.length > 1) ? Integer.parseInt(args[1]) : 8080;
}
-
+
private static @EJB Sless sless;
private static @EJB Sful sful;
@@ -86,7 +86,7 @@
System.exit(-1);
}
- return;
+ return;
}
private static int goGet(String host, int port, String contextPath)
@@ -109,7 +109,7 @@
System.out.println(lineNum + ": " + line);
int index = line.indexOf("=");
if (index != -1) {
- String info = line.substring(index + 1);
+ String info = line.substring(index + 1);
if (info.startsWith("hello")) {
count++;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
index f33d2d2..bb19491 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.deployment.ejb30.ear.security;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
index a86666f..9b51155 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
@@ -51,12 +51,12 @@
} catch(EJBException ex) {
System.out.println("Expected failure from slessLocal.goodBye()");
}
-
+
System.out.println(slessLocal.hello());
return sless.hello();
}
- @RolesAllowed({"j2ee"})
+ @RolesAllowed({"j2ee"})
public String goodAfternoon() {
if (!sc.isCallerInRole("j2ee") || sc.isCallerInRole("sunuser")) {
throw new RuntimeException("not of role j2ee or of role sunuser");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java
index e83a782..38c4db5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/MyFilter.java
@@ -39,7 +39,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
ServletContext sc = filterConfig.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/SessionTest.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/SessionTest.java
index 4c3fc8b..460eec0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/SessionTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/SessionTest.java
@@ -24,15 +24,15 @@
* in DeploymentTest.
*
* @author: tjquinn
- *
+ *
*/
public class SessionTest extends DeploymentTest {
-
+
/** Creates a new instance of ExampleTest */
public SessionTest() {
}
-
+
/**
*Runs the first step of the test: deploying and running the client.
*/
@@ -41,7 +41,7 @@
deploy();
runClient();
}
-
+
/**
*Runs the second step of the test, only after the first has run and
*succeeded: redeploy the app and run the client again.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/build.xml
index 44aa991..49639e9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/build.xml
@@ -58,8 +58,8 @@
<ear destfile="${all.ear}" basedir="${archivedir}"
appxml="descriptor/application.xml" includes="*.jar">
</ear>
- </target>
-
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.ear}"/>
@@ -82,15 +82,15 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="undeploy.asadmin" depends="prepare">
<antcall target="common.undeploy.asadmin">
<param name="arg.list" value="${testName}"/>
<param name="testName" value="${testName}"/>
</antcall>
- </target>
+ </target>
<target name="private-all">
<antcall target="assemble"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
index f0a0087..cc95244 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
@@ -30,11 +30,11 @@
System.out.println("ejb-ejb30-hello-session");
Client client = new Client(args);
client.doTest();
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sful sful;
private static @EJB Sless sless;
@@ -60,8 +60,8 @@
e.printStackTrace();
System.exit(-1);
}
-
- return;
+
+ return;
}
@PostConstruct
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/sun-acc-no-log-service.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/sun-acc-no-log-service.xml
index 47e3d3e..2623f17 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/sun-acc-no-log-service.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/sun-acc-no-log-service.xml
@@ -18,8 +18,8 @@
-->
<!--
- Please remember to customize this file for your environment. The defaults for
- following fields may not be appropriate.
+ Please remember to customize this file for your environment. The defaults for
+ following fields may not be appropriate.
- target-server name, address and port
- Property security.config in message-security-config
-->
@@ -31,7 +31,7 @@
<!-- <log-service file="" level="WARNING"/> -->
<message-security-config auth-layer="SOAP">
<!-- turned off by default -->
- <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="XWS_ClientProvider" provider-type="client">
+ <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="XWS_ClientProvider" provider-type="client">
<request-policy auth-source="content"/>
<response-policy auth-source="content"/>
<property name="encryption.key.alias" value="s1as"/>
@@ -39,7 +39,7 @@
<property name="dynamic.username.password" value="false"/>
<property name="debug" value="false"/>
</provider-config>
- <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="ClientProvider" provider-type="client">
+ <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="ClientProvider" provider-type="client">
<request-policy auth-source="content"/>
<response-policy auth-source="content"/>
<property name="encryption.key.alias" value="s1as"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
index 80af5ba..dda9587 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/build.xml
index 6a9d4fb..8ddbcf1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/build.xml
@@ -46,7 +46,7 @@
</target>
<target name="assemble" depends="compile">
- <jar destfile="${ejb.jar}" basedir="${build}"
+ <jar destfile="${ejb.jar}" basedir="${build}"
excludes="**/ClientSuper.class,**/Client.class">
<metainf file="descriptor/sun-ejb-jar.xml"/>
</jar>
@@ -62,8 +62,8 @@
<ear destfile="${all.ear}" basedir="${archivedir}"
appxml="descriptor/application.xml" includes="*.jar, session2appclient.xml, sun-session2appclient.xml">
</ear>
- </target>
-
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.ear}"/>
@@ -85,15 +85,15 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="undeploy.asadmin" depends="prepare">
<antcall target="common.undeploy.asadmin">
<param name="arg.list" value="${testName}"/>
<param name="testName" value="${testName}"/>
</antcall>
- </target>
+ </target>
<target name="private-all">
<antcall target="assemble"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
index 888af7c..be7df34 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
@@ -28,10 +28,10 @@
import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
-@EJBs(
- { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
+@EJBs(
+ { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
beanInterface=Sless.class),
- @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
+ @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
beanInterface=Sless.class)
})
@EJB(name="ejb/TypeLevelSless3", beanInterface=SlessSub.class)
@@ -41,7 +41,7 @@
Client client = new Client(args);
client.doTest();
- }
+ }
private static @EJB Sful sful1;
private static @EJB Sful sful2;
@@ -51,7 +51,7 @@
private static @EJB(beanName="SlessEJB") Sless sless1;
- // linked to SlessEJB2 via sun-application-client.xml
+ // linked to SlessEJB2 via sun-application-client.xml
// so no beanName disambiguation is needed
private static @EJB Sless sless2;
@@ -61,11 +61,11 @@
public Client (String[] args) {
}
-
+
public void doTest() {
try {
-
+
System.out.println("Calling superSless1");
Sless superSlessLookup = (Sless) new javax.naming.InitialContext().lookup("java:comp/env/com.sun.s1asdev.ejb.ejb30.hello.session2.client.ClientSuper/superSless1");
@@ -89,7 +89,7 @@
}
sful1.doRemoveMethodSessionSyncTests();
-
+
// Call application-defined @Remove method. This method has
// no relationship to EJBObject.remove(). It's a coincidence
// that it has the same name.
@@ -230,7 +230,7 @@
if( r1.getId().equals(r2.getId()) ) {
throw new Exception("remote param passing getId() test failed");
}
-
+
sless3.hello();
sless3.hello3();
@@ -257,8 +257,8 @@
e.printStackTrace();
System.exit(1);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
index d89469d..39669b4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
@@ -25,7 +25,7 @@
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java
index 29fecba..e1fe349 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java
@@ -21,10 +21,10 @@
public class MyCallbackHandler {
- @PreDestroy
+ @PreDestroy
public void myPreDestMethod(InvocationContext invCtx) {
System.out.println("In MyCallbackHandler::myPreDestMethod ");
-
+
try {
invCtx.proceed();
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful.java
index 182bda6..68f57b4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful.java
@@ -37,17 +37,17 @@
// for a method that has @Remove behavior so it needs to work.
public void remove();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
// Associated with an @Remove method that has retainIfException=true
@@ -55,7 +55,7 @@
// retainIfException only applies to application exceptions, so
// this bean should always be removed.
public void removeMethodThrowSysException(boolean throwException);
-
+
public void doRemoveMethodSessionSyncTests();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
index a42c24c..a86e33c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
@@ -23,17 +23,17 @@
{
public String hello();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
// Associated with an @Remove method that has retainIfException=true
@@ -41,5 +41,5 @@
// retainIfException only applies to application exceptions, so
// this bean should always be removed.
public void removeMethodThrowSysException(boolean throwException);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
index 39e46d0..d61d0c3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
@@ -39,10 +39,10 @@
@Stateful
@TransactionManagement(TransactionManagementType.BEAN)
-@EJBs(
- { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
+@EJBs(
+ { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
beanInterface=Sless.class),
- @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
+ @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
beanInterface=Sless.class) ,
@EJB(name="ejb/SfulEJB2", beanInterface=Sful2.class)
})
@@ -51,7 +51,7 @@
@EJB(name="ejb/TypeLevelSless3", beanInterface=SlessSub.class)
@Remote({Sful.class})
// ejb is not required to put business interface in implements clause
-public class SfulEJB
+public class SfulEJB
{
private @Resource SessionContext sc;
@@ -64,7 +64,7 @@
private @EJB(beanName="SlessEJB") void setSless4(Sless sless) {
sless4 = sless;
}
-
+
private Sless sless5;
@EJB(beanName="SlessEJB2") void setSless5(Sless sless) {
sless5 = sless;
@@ -173,7 +173,7 @@
public void foo(int a, String b) {
}
- private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
+ private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
throws Exception {
String sless1Id = s1.getId();
@@ -223,7 +223,7 @@
s3.roundTrip2(c);
s3.hello3();
-
+
}
@PostConstruct
@@ -247,7 +247,7 @@
}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB " + state + " removeRetainIfException");
@@ -258,10 +258,10 @@
}
@Remove
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeNotRetainIfException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -272,7 +272,7 @@
@Remove
public void removeMethodThrowSysException(boolean throwException) {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeMethodThrowSysException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -299,7 +299,7 @@
SfulEJB2.beforeCompletionCalled &&
SfulEJB2.afterCompletionCalled ) {
System.out.println("Got expected SessionSynch behavior for " +
- "removeRetainIfException(true)");
+ "removeRetainIfException(true)");
} else {
throw new EJBException("SessionSynch failure for " +
"removeRetainIfException(true)");
@@ -320,13 +320,13 @@
!SfulEJB2.beforeCompletionCalled &&
!SfulEJB2.afterCompletionCalled ) {
System.out.println("Got expected SessionSynch behavior for " +
- "removeRetainIfException(false)");
+ "removeRetainIfException(false)");
} else {
throw new EJBException("SessionSynch failure for " +
"removeRetainIfException(true)");
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
index b2f9ddf..6b93ed5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
@@ -43,10 +43,10 @@
// use some package-local mutable static state to check whether
// session synch callbacks are called correctly for @Remove methods.
- // This provides a simple way to check the results since the bean
+ // This provides a simple way to check the results since the bean
// instance is no longer available to the caller. The caller must
// always at most one SFSBs of this bean type at a time for this
- // to work.
+ // to work.
static boolean afterBeginCalled = false;
static boolean beforeCompletionCalled = false;
static boolean afterCompletionCalled = false;
@@ -60,7 +60,7 @@
}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB2 " +
@@ -72,7 +72,7 @@
}
@Remove
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB2 " +
@@ -86,7 +86,7 @@
@Remove
public void removeMethodThrowSysException(boolean throwException) {
- System.out.println("In SfulEJB2 " +
+ System.out.println("In SfulEJB2 " +
"removeMethodThrowSysException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -100,7 +100,7 @@
afterBeginCalled = true;
beforeCompletionCalled = false;
afterCompletionCalled = false;
-
+
System.out.println("In SfulEJB2::afterBegin()");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
index d2a5539..eda0b28 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
@@ -28,7 +28,7 @@
@Stateless
@Remote({Sless.class})
-public class SlessEJB
+public class SlessEJB
{
@@ -52,11 +52,11 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB::roundTrip2 " +
+ System.out.println("In SlessEJB::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
index 5d81de3..1e5a85f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
@@ -43,7 +43,7 @@
@PostConstruct
public void ejbCreate() {
- System.out.println("In SlessEJB2::ejbCreate()");
+ System.out.println("In SlessEJB2::ejbCreate()");
postConstructCalled = true;
}
@@ -72,7 +72,7 @@
public String getId() {
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -94,7 +94,7 @@
return "SlessEJB2";
}
-
+
public Sless roundTrip(Sless s) {
System.out.println("In SlessEJB2::roundTrip " + s);
System.out.println("input Sless.getId() = " + s.getId());
@@ -102,12 +102,12 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB2::roundTrip2 " +
+ System.out.println("In SlessEJB2::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
@@ -118,10 +118,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
index 09811f3..40c6af9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
@@ -39,7 +39,7 @@
private @Resource SessionContext ejbContext2;
- @Resource(type=jakarta.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private EJBContext ejbContext3;
private EJBContext ejbContext4;
@@ -78,7 +78,7 @@
private void setEJBContext6(EJBContext context) {
ejbContext6 = context;
}
-
+
@PostConstruct
public void afterCreate() {
System.out.println("In SlessEJB3::afterCreate() marked as PostConstruct");
@@ -136,13 +136,13 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB3::roundTrip2 " +
+ System.out.println("In SlessEJB3::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/build.xml
index a704a6a..4eef139 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/build.xml
@@ -55,13 +55,13 @@
<param name="sql.file" value="sql/create.sql"/>
</antcall>
</target>
-
+
<target name="unsetup_sql" depends="init">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop.sql"/>
</antcall>
</target>
-
+
<target name="compile" depends="prepare">
<javac srcdir="ejb" destdir="${ejb.build.dir}">
<classpath refid="gfv3.classpath"/>
@@ -110,11 +110,11 @@
failonerror="false"/>
<copy file="client/MANIFEST.MF"
todir="${client.build.dir}/META-INF"/>
-
+
<copy file="descriptor/application.xml"
- todir="${ear.build.dir}/META-INF"/>
- </target>
-
+ todir="${ear.build.dir}/META-INF"/>
+ </target>
+
<target name="deploydir.asadmin" depends="prepare">
<antcall target="common.deploydir.asadmin">
<param name="arg.list"
@@ -129,7 +129,7 @@
</antcall>
</target>
-
+
<target name="undeploy.asadmin">
<antcall target="common.undeploy.asadmin">
<param name="arg.list"
@@ -144,9 +144,9 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="private-all">
<!--
<antcall target="startDerby"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java
index e4ffd48..a7a0c1c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java
@@ -29,28 +29,28 @@
import jakarta.persistence.EntityManager;
public class Client {
-
+
private String host;
private String port;
- @PersistenceUnit
+ @PersistenceUnit
private static EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private static EntityManagerFactory emf2;
public Client (String[] args) {
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
Client client = new Client(args);
client.doTest();
}
-
+
public void doTest() {
-
+
String env = null;
try {
@@ -74,11 +74,11 @@
}
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-ejb30-hello-session3/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
} else {
@@ -88,15 +88,15 @@
System.out.println("Jms web test failed.");
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -109,6 +109,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/Hello.java
index a5d933f..54bcca0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/Hello.java
@@ -19,5 +19,5 @@
public interface Hello {
public void hello();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
index f77af03..1408d60 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
@@ -28,16 +28,16 @@
@Stateless public class HelloEJB implements Hello {
- @PersistenceUnit
+ @PersistenceUnit
private EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private EntityManagerFactory emf2;
@PersistenceContext
private EntityManager em1;
- @PersistenceContext(name="myem",
+ @PersistenceContext(name="myem",
unitName="foo", type=PersistenceContextType.EXTENDED)
private EntityManager em2;
@@ -60,11 +60,11 @@
EntityManager lookupem2 = (EntityManager)
ic.lookup("java:comp/env/myem");
-
+
} catch(Exception e) {
throw new jakarta.ejb.EJBException(e);
}
-
+
System.out.println("HelloEJB successful injection of EMF/EM references!");
} else {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStateful.java
index d85568a..45b0d10 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStateful.java
@@ -19,7 +19,7 @@
public interface HelloStateful {
public void hello();
-
+
public void sleepFor(int sec);
public void ping();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
index 4441bb8..99bec30 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
@@ -21,7 +21,7 @@
@Stateful public class HelloStatefulEJB implements HelloStateful {
-
+
@PostConstruct public void postConstruction() {
System.out.println("In HelloStatefulEJB::postConstruction()");
}
@@ -31,12 +31,12 @@
}
public void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
}
public void ping() {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java
index f0f17b0..f7168c7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java
@@ -30,10 +30,10 @@
public Person(String name){
this.name = name;
}
-
+
@Override public String toString(){
return "Person: {"+"(name = "+name+")}";
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Hello.java
index a5d933f..54bcca0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Hello.java
@@ -19,5 +19,5 @@
public interface Hello {
public void hello();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/HelloStateful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/HelloStateful.java
index d85568a..45b0d10 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/HelloStateful.java
@@ -19,7 +19,7 @@
public interface HelloStateful {
public void hello();
-
+
public void sleepFor(int sec);
public void ping();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
index e835fbb..3a51e84 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
@@ -80,30 +80,30 @@
}
- @PersistenceUnit
+ @PersistenceUnit
private EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private EntityManagerFactory emf2;
@PersistenceContext
private EntityManager em1;
- @PersistenceContext(name="myem",
+ @PersistenceContext(name="myem",
unitName="foo", type=PersistenceContextType.TRANSACTION)
private EntityManager em2;
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In webclient::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
@@ -122,7 +122,7 @@
EntityManager lookupem2 = (EntityManager)
ic.lookup("java:comp/env/myem");
-
+
System.out.println("Servlet successful injection of EMF/EM references!");
} else {
throw new Exception("One or more EMF/EM references" +
@@ -151,17 +151,17 @@
helloStateful.hello();
helloStateful2.hello();
- Hello helloStateless3 = (Hello)
+ Hello helloStateless3 = (Hello)
ic.lookup("java:comp/env/helloStateless3");
helloStateless3.hello();
- Hello helloStateless4 = (Hello)
+ Hello helloStateless4 = (Hello)
ic.lookup("java:comp/env/helloStateless4");
helloStateless4.hello();
- HelloStateful helloStateful3 = (HelloStateful)
+ HelloStateful helloStateful3 = (HelloStateful)
ic.lookup("java:comp/env/helloStateful3");
helloStateful3.hello();
@@ -193,66 +193,66 @@
System.out.println("ds6 login timeout = " + loginTimeout);
- try {
- MyThread thread = new MyThread(helloStateful2);
- thread.start();
+ try {
+ MyThread thread = new MyThread(helloStateful2);
+ thread.start();
- sleepFor(10);
- helloStateful2.ping();
- throw new EJBException("Did not get ConcurrentAccessException");
- } catch (jakarta.ejb.ConcurrentAccessException conEx) {
- ; //Everything is fine
- } catch (Throwable th) {
- throw new EJBException("Got some wierd exception: " + th);
- }
+ sleepFor(10);
+ helloStateful2.ping();
+ throw new EJBException("Did not get ConcurrentAccessException");
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
+ ; //Everything is fine
+ } catch (Throwable th) {
+ throw new EJBException("Got some wierd exception: " + th);
+ }
System.out.println("successfully accessed connections");
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
class MyThread extends Thread {
- HelloStateful ref;
+ HelloStateful ref;
- MyThread(HelloStateful ref) {
- this.ref = ref;
- }
+ MyThread(HelloStateful ref) {
+ this.ref = ref;
+ }
- public void run() {
- try {
- ref.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ ref.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
private void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- System.out.println("[" + i + "/" + sec + "]: Sleeping....");
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ System.out.println("[" + i + "/" + sec + "]: Sleeping....");
+ }
+ } catch (Exception ex) {
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/build.xml
index bc8db5a..9ab9e6f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/build.xml
@@ -44,7 +44,7 @@
<classpath refid="gfv3.classpath"/>
</javac>
</target>
-
+
<target name="create.user" depends="setAsadminArgsWithoutPassword">
<antcall target="common.createuser.asadmin">
<param name="arg.list"
@@ -87,8 +87,8 @@
<include name="sun-application.xml"/>
</metainf>
</ear>
- </target>
-
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.ear}"/>
@@ -108,7 +108,7 @@
<param name="arg.list" value="${testName}"/>
<param name="testName" value="${testName}"/>
</antcall>
- </target>
+ </target>
<target name="runclient" depends="prepare,setOrbPort2">
<exec executable="${APPCLIENT}" resultproperty="result" failonerror="false" output="${build}/${log.id}.output.log">
@@ -122,9 +122,9 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="private-all">
<antcall target="create.user"/>
<antcall target="assemble"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
index b43e380..ddf00c4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
@@ -28,8 +28,8 @@
System.out.println("deployment-ejb30-ear-xmloverride");
Client client = new Client();
client.doTest();
- }
-
+ }
+
private static @EJB Sless sless;
private static @EJB Sful sful;
@@ -73,6 +73,6 @@
System.exit(-1);
}
- return;
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
index 7f96125..6599c02 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.deployment.ejb30.ear.xmloverride;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
index 96e8069..3497a9c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
@@ -114,7 +114,7 @@
} catch(Exception ex) {
throw new IllegalStateException("Cannot get expected value: " + ex);
- }
+ }
return "goodNight";
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/build.xml
index 432c5ab..babfe4c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/build.xml
@@ -23,14 +23,14 @@
<project name="ejb30" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="jsp" target="private-all">
- <property name="build" value="${build}/jsp"/>
- </ant>
- <ant dir="servlet" target="private-all">
- <property name="build" value="${build}/servlet"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="jsp" target="private-all">
+ <property name="build" value="${build}/jsp"/>
+ </ant>
+ <ant dir="servlet" target="private-all">
+ <property name="build" value="${build}/servlet"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/WebTest.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/WebTest.java
index 4ebe0ad..a974086 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/WebTest.java
@@ -31,7 +31,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
@@ -44,14 +44,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/"
+ contextRoot + "/index.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
System.exit(-1);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/build.xml
index f37b551..56a6bf9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/build.xml
@@ -46,7 +46,7 @@
<classpath refid="gfv3.classpath"/>
</javac>
</target>
-
+
<target name="assemble" depends="compile">
<war destfile="${web.war}" webxml="descriptor/web.xml">
<classes dir="${build}" excludes="WebTest.class"/>
@@ -56,8 +56,8 @@
<include name="my.tld"/>
</webinf>
</war>
- </target>
-
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--name ${testName} ${web.war}"/>
@@ -77,7 +77,7 @@
<param name="arg.list" value="${testName}"/>
<param name="testName" value="${testName}"/>
</antcall>
- </target>
+ </target>
<target name="runweb" depends="prepare,setHttpPort2">
<javaWithResult fork="true" failonerror="false" jvm="${JAVA}"
@@ -94,9 +94,9 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="private-all">
<antcall target="assemble"/>
<antcall target="declare-test">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java
index 439a868..a625be7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyFilter.java
@@ -45,7 +45,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
ServletContext sc = filterConfig.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyTag.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyTag.java
index fad0f39..d497a07 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/MyTag.java
@@ -45,7 +45,7 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
return SKIP_BODY;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/WebTest.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/WebTest.java
index 993cf3a..3ca636e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/WebTest.java
@@ -31,7 +31,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
@@ -44,12 +44,12 @@
}
public void doTest() throws Exception {
-
+
String contextPath = "/" + contextRoot + "/servlet";
Socket s = new Socket(host, port);
OutputStream os = s.getOutputStream();
-
+
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("Authorization: Basic ajJlZTpqMmVl\n".getBytes());
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/build.xml
index 42639b1..a34fabd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/build.xml
@@ -62,7 +62,7 @@
value="delete-file-user ${ASADMIN-ARGS} --authrealmname file j2ee"/>
</antcall>
</target>
-
+
<target name="assemble" depends="compile">
<war destfile="${web.war}" webxml="descriptor/web.xml">
<classes dir="${build}" excludes="WebTest.class"/>
@@ -70,8 +70,8 @@
<include name="sun-web.xml"/>
</webinf>
</war>
- </target>
-
+ </target>
+
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--name ${testName} ${web.war}"/>
@@ -91,7 +91,7 @@
<param name="arg.list" value="${testName}"/>
<param name="testName" value="${testName}"/>
</antcall>
- </target>
+ </target>
<target name="runweb" depends="prepare,setHttpPort2">
<javaWithResult fork="true" failonerror="false" jvm="${JAVA}"
@@ -108,9 +108,9 @@
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="private-all">
<antcall target="create.user"/>
<antcall target="assemble"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java
index 8ce6c9e..1aa3295 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/MyFilter.java
@@ -39,7 +39,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
ServletContext sc = filterConfig.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/Servlet.java
index 7cd73b8..74bed86 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/servlet/web/Servlet.java
@@ -50,7 +50,7 @@
if (req.isUserInRole("j2ee") && !req.isUserInRole("guest")) {
out.println("Hello World");
if (req.getSession(false) != null &&
- Boolean.TRUE.equals(pconstruct.get())) {
+ Boolean.TRUE.equals(pconstruct.get())) {
out.println(req.getSession(false).getAttribute(
"deployment.ejb30.war.servlet"));
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/build.xml
index 0aabad0..34e74f4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/build.xml
@@ -23,15 +23,15 @@
<project name="ejb31" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<!-- Only run the tests in PE mode till all tests pass in EE -->
- <target name="private-all">
- <ant dir="ejblite" target="private-all">
- <property name="build" value="${build}/ejblite"/>
- </ant>
- <ant dir="jndivalidation" target="private-all">
- <property name="build" value="${build}/jndivalidation"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="ejblite" target="private-all">
+ <property name="build" value="${build}/ejblite"/>
+ </ant>
+ <ant dir="jndivalidation" target="private-all">
+ <property name="build" value="${build}/jndivalidation"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/build.xml
index 60cb1f7..f979093 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/build.xml
@@ -23,11 +23,11 @@
<project name="ejblite" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="javamodule" target="private-all">
- <property name="build" value="${build}/javamodule"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="javamodule" target="private-all">
+ <property name="build" value="${build}/javamodule"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/client/Client.java
index 897355c..2ef8736 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/client/Client.java
@@ -30,43 +30,43 @@
public static void main(String args[]) {
System.out.println("ejb31-ejblite-javamodule");
- appName = args[0];
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ Client client = new Client(args);
+ client.doTest();
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
+ URL u = new URL(url);
+
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
System.out.println("test complete");
-
- } catch(Exception e) {
- e.printStackTrace();
+
+ } catch(Exception e) {
+ e.printStackTrace();
System.exit(-1);
- }
+ }
return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
index d1df3f6..4ae7129 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -29,7 +29,7 @@
@PostConstruct
private void init() {
- System.out.println("In BarManagedBean::init() ");
+ System.out.println("In BarManagedBean::init() ");
}
public void bar() {
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("In BarManagedBean::destroy() ");
+ System.out.println("In BarManagedBean::destroy() ");
}
public String toString() {
- return "BarManagedBean this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "BarManagedBean this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
index ea60a8e..083a980 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -38,20 +38,20 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean::init() ");
+ System.out.println("In FooManagedBean::init() ");
}
public void foo() {
- System.out.println("In FooManagedBean::foo() ");
- bmb.bar();
+ System.out.println("In FooManagedBean::foo() ");
+ bmb.bar();
}
public void foobar(String s) {
- System.out.println("foobar::s = " + s);
+ System.out.println("foobar::s = " + s);
}
public Object getThis() {
- return this;
+ return this;
}
public int returnIntNoExceptions() { return 1; }
@@ -70,20 +70,20 @@
@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;
}
@AroundInvoke
public Object around(InvocationContext c) throws Exception {
- System.out.println("In FooManagedBean::around() ");
- return c.proceed();
+ System.out.println("In FooManagedBean::around() ");
+ return c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
index 78277d2..8d27af0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -73,91 +73,91 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
- try {
- InitialContext ic = new InitialContext();
- sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
- sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
+ try {
+ InitialContext ic = new InitialContext();
+ sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
+ sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
- sb4 = (SingletonBean) ic.lookup("java:module/ES1");
- sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
+ sb4 = (SingletonBean) ic.lookup("java:module/ES1");
+ sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
- slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
- slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
- slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
+ slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
+ slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
+ slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
- slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
- slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
+ slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
+ slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
- foo4 = (FooManagedBean)
- ic.lookup("java:module/foomanagedbean");
+ foo4 = (FooManagedBean)
+ ic.lookup("java:module/foomanagedbean");
- foo5 = (FooManagedBean)
- ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/foomanagedbean");
+ foo5 = (FooManagedBean)
+ ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/foomanagedbean");
- foo6 = (FooManagedBean)
- ic.lookup("java:comp/env/foo2ref");
+ foo6 = (FooManagedBean)
+ ic.lookup("java:comp/env/foo2ref");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
- } catch(Exception e) {
- e.printStackTrace();
- throw new ServletException(e);
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new ServletException(e);
+ }
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- foo.foobar("foobar");
+ foo.foobar("foobar");
- simpleSingleton.hello();
+ simpleSingleton.hello();
- simpleStateless.hello();
- simpleStateless2.hello();
+ simpleStateless.hello();
+ simpleStateless2.hello();
- sb2.hello();
+ sb2.hello();
- sb3.hello();
+ sb3.hello();
- sb4.hello();
+ sb4.hello();
- sb5.hello();
+ sb5.hello();
- slsb.hello();
+ slsb.hello();
- slsb2.hello();
+ slsb2.hello();
- slsb3.hello();
+ slsb3.hello();
- slsb4.hello();
+ slsb4.hello();
- slsb5.hello();
+ slsb5.hello();
- foo.foo();
- foo.foobar("foobar");
- foo2.foo();
- foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
+ foo.foo();
+ foo.foobar("foobar");
+ foo2.foo();
+ foo3.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
index 1003600..cb3e88a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -35,24 +35,24 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
public Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::roundInvoke() ");
- if( c.getParameters().length > 0 ) {
- System.out.println("param 1 = " + c.getParameters()[0]);
- }
- return c.proceed();
+ System.out.println("In InterceptorA::roundInvoke() ");
+ if( c.getParameters().length > 0 ) {
+ System.out.println("param 1 = " + c.getParameters()[0]);
+ }
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In Interceptor::destroy() ");
- c.proceed();
+ System.out.println("In Interceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
index c643637..55e03fd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -28,36 +28,36 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::init() ");
- c.proceed();
+ System.out.println("In InterceptorB::init() ");
+ c.proceed();
}
@Override
- public Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ public Object roundInvoke(InvocationContext c) throws Exception {
+ throw new RuntimeException("Should not reach here");
}
@AroundInvoke
private Object aroundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::aroundInvoke() ");
- c.getContextData().put("foo", "bar");
- Object returnValue = c.proceed();
-
- String foobar = (String) c.getContextData().get("foobar");
- System.out.println("foobar from context data = " + foobar);
- if( foobar == null ) {
- throw new EJBException("invalid context data");
- }
-
- c.getContextData().clear();
-
- return returnValue;
+ System.out.println("In InterceptorB::aroundInvoke() ");
+ c.getContextData().put("foo", "bar");
+ Object returnValue = c.proceed();
+
+ String foobar = (String) c.getContextData().get("foobar");
+ System.out.println("foobar from context data = " + foobar);
+ if( foobar == null ) {
+ throw new EJBException("invalid context data");
+ }
+
+ c.getContextData().clear();
+
+ return returnValue;
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorB::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java
index 4adbd03..1b9325f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java
@@ -24,7 +24,7 @@
@AroundInvoke
protected Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ throw new RuntimeException("Should not reach here");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 5b0df58..113b283 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -30,24 +30,24 @@
@PostConstruct
private void init() {
- System.out.println("In ManagedSuper::init() ");
+ System.out.println("In ManagedSuper::init() ");
}
@PreDestroy
private void destroy() {
- System.out.println("In ManagedSuper::destroy() ");
+ System.out.println("In ManagedSuper::destroy() ");
}
public String toString() {
- return "ManagedSuper this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "ManagedSuper this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
@AroundInvoke
public Object aroundSuper(InvocationContext c) throws Exception {
- System.out.println("In ManagedSuper::aroundSuper() ");
- return c.proceed();
+ System.out.println("In ManagedSuper::aroundSuper() ");
+ return c.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
index 394ffce..9ac5bf2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -34,7 +34,7 @@
@Singleton
@LocalBean
public class SingletonBean implements java.util.Observer {
-
+
@EJB private SingletonBean me;
@@ -51,71 +51,71 @@
private StatelessBean slsb3;
private StatelessBean slsb4;
private StatelessBean slsb5;
-
+
public void update(java.util.Observable a,java.lang.Object b) {}
@PostConstruct
private void init() {
- System.out.println("In SingletonBean:init() me = " + me);
-
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:init() me = " + me);
- try {
- InitialContext ic = new InitialContext();
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
- // Lookup simple form of portable JNDI name
- StatelessBean stateless = (StatelessBean)
- ic.lookup("java:module/StatelessBean");
+ try {
+ InitialContext ic = new InitialContext();
- stateless.hello();
+ // Lookup simple form of portable JNDI name
+ StatelessBean stateless = (StatelessBean)
+ ic.lookup("java:module/StatelessBean");
- // Lookup fully-qualified form of portable JNDI name
- StatelessBean stateless2 = (StatelessBean)
- ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
+ stateless.hello();
- stateless2.hello();
+ // Lookup fully-qualified form of portable JNDI name
+ StatelessBean stateless2 = (StatelessBean)
+ ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
- sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
- sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
+ stateless2.hello();
- sb4 = (SingletonBean) ic.lookup("java:module/ES1");
- sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
+ sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
+ sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
- slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
- slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
- slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
+ sb4 = (SingletonBean) ic.lookup("java:module/ES1");
+ sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
- slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
- slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
+ slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
+ slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
+ slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
+ slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- } catch(NamingException ne) {
- throw new EJBException(ne);
- }
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
+
+ } catch(NamingException ne) {
+ throw new EJBException(ne);
+ }
}
public void hello() {
- System.out.println("In SingletonBean:hello()");
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:hello()");
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean:destroy()");
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:destroy()");
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
index 9dcf979..f91e919 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -29,21 +29,21 @@
@PostConstruct
private void init() {
- System.out.println("In StatefulBean:init()");
+ System.out.println("In StatefulBean:init()");
}
@PrePassivate
private void prePass() {
- System.out.println("In StatefulBean:prePassivate()");
+ System.out.println("In StatefulBean:prePassivate()");
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In StatefulBean:destroy()");
+ System.out.println("In StatefulBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
index f6148a5..e59a38a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -29,8 +29,8 @@
@Stateless
@Interceptors(InterceptorB.class)
public class StatelessBean {
-
- @Resource
+
+ @Resource
private SessionContext sessionCtx;
@Resource(mappedName="java:module/foomanagedbean")
@@ -44,64 +44,64 @@
@PostConstruct
private void init() {
- System.out.println("In StatelessBean:init()");
+ System.out.println("In StatelessBean:init()");
}
public void hello() {
- System.out.println("In StatelessBean::hello()");
+ System.out.println("In StatelessBean::hello()");
- Map<String, Object> ctxData = sessionCtx.getContextData();
- String fooctx = (String) ctxData.get("foo");
- System.out.println("foo from context data = " + fooctx);
- if( fooctx == null ) {
- throw new EJBException("invalid context data");
- }
- ctxData.put("foobar", "foobar");
+ Map<String, Object> ctxData = sessionCtx.getContextData();
+ String fooctx = (String) ctxData.get("foo");
+ System.out.println("foo from context data = " + fooctx);
+ if( fooctx == null ) {
+ throw new EJBException("invalid context data");
+ }
+ ctxData.put("foobar", "foobar");
- FooManagedBean fmb = (FooManagedBean)
- sessionCtx.lookup("java:module/foomanagedbean");
+ FooManagedBean fmb = (FooManagedBean)
+ sessionCtx.lookup("java:module/foomanagedbean");
- // Make sure dependencies declared in java:comp are visible
- // via equivalent java:module entries since this is a
- // .war
- SessionContext sessionCtx2 = (SessionContext)
- sessionCtx.lookup("java:module/env/com.acme.StatelessBean/sessionCtx");
+ // Make sure dependencies declared in java:comp are visible
+ // via equivalent java:module entries since this is a
+ // .war
+ SessionContext sessionCtx2 = (SessionContext)
+ sessionCtx.lookup("java:module/env/com.acme.StatelessBean/sessionCtx");
- SingletonBean singleton2 = (SingletonBean)
- sessionCtx2.lookup("java:module/env/stateless/singletonref");
+ SingletonBean singleton2 = (SingletonBean)
+ sessionCtx2.lookup("java:module/env/stateless/singletonref");
- // Lookup a comp env dependency declared by another ejb in the .war
- SingletonBean singleton3 = (SingletonBean)
- sessionCtx2.lookup("java:comp/env/com.acme.SingletonBean/me");
+ // Lookup a comp env dependency declared by another ejb in the .war
+ SingletonBean singleton3 = (SingletonBean)
+ sessionCtx2.lookup("java:comp/env/com.acme.SingletonBean/me");
- // Lookup a comp env dependency declared by a servlet
- FooManagedBean fmbServlet = (FooManagedBean)
- sessionCtx.lookup("java:comp/env/foo2ref");
- FooManagedBean fmbServlet2 = (FooManagedBean)
- sessionCtx.lookup("java:module/env/foo2ref");
+ // Lookup a comp env dependency declared by a servlet
+ FooManagedBean fmbServlet = (FooManagedBean)
+ sessionCtx.lookup("java:comp/env/foo2ref");
+ FooManagedBean fmbServlet2 = (FooManagedBean)
+ sessionCtx.lookup("java:module/env/foo2ref");
- // Ensure that each injected or looked up managed bean
- // instance is unique
- Object fooThis = foo.getThis();
- Object foo2This = foo2.getThis();
- Object fmbThis = fmb.getThis();
+ // Ensure that each injected or looked up managed bean
+ // instance is unique
+ Object fooThis = foo.getThis();
+ Object foo2This = foo2.getThis();
+ Object fmbThis = fmb.getThis();
- System.out.println("fooThis = " + fooThis);
- System.out.println("foo2This = " + foo2This);
- System.out.println("fmbThis = " + fmbThis);
- System.out.println("fmbServlet = " + fmbServlet);
- System.out.println("fmbServlet2 = " + fmbServlet2);
+ System.out.println("fooThis = " + fooThis);
+ System.out.println("foo2This = " + foo2This);
+ System.out.println("fmbThis = " + fmbThis);
+ System.out.println("fmbServlet = " + fmbServlet);
+ System.out.println("fmbServlet2 = " + fmbServlet2);
- if( ( fooThis == foo2This ) || ( fooThis == fmbThis ) ||
- ( foo2This == fmbThis ) ) {
- throw new EJBException("Managed bean instances not unique");
- }
+ if( ( fooThis == foo2This ) || ( fooThis == fmbThis ) ||
+ ( foo2This == fmbThis ) ) {
+ throw new EJBException("Managed bean instances not unique");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In StatelessBean:destroy()");
+ System.out.println("In StatelessBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
index bcac37b..a447f3c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
@@ -23,7 +23,7 @@
@Stateless
public class Invoker1 {
- @EJB(name="java:module/env/DuplicateEntry",beanName="ejb/myslsb")
- private MySLSB mySLSB;
+ @EJB(name="java:module/env/DuplicateEntry",beanName="ejb/myslsb")
+ private MySLSB mySLSB;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
index c7f5e33..2dc9cd1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
@@ -23,7 +23,7 @@
@Stateless
public class Invoker2 {
- @EJB(name="java:module/env/DuplicateEntry",beanName="ejb/myslsb2")
- private MySLSB mySLSB;
+ @EJB(name="java:module/env/DuplicateEntry",beanName="ejb/myslsb2")
+ private MySLSB mySLSB;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
index c8aec0d..6b66cdb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
@@ -22,6 +22,6 @@
@Stateless(name="ejb/myslsb")
public class MySLSB {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
index 4c96f15..2a5ea91 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
@@ -22,6 +22,6 @@
@Stateless(name="ejb/myslsb2")
public class MySLSB2 {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/META-INF/ejb-jar.xml
index 203540a..1c277a4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/META-INF/ejb-jar.xml
@@ -18,32 +18,32 @@
-->
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- version="3.1">
- <enterprise-beans>
- <session>
- <ejb-name>Invoker1</ejb-name>
- <ejb-class>gf.Invoker1</ejb-class>
- <session-type>Stateless</session-type>
- <env-entry>
- <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>From Invoker1</env-entry-value>
- </env-entry>
- </session>
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Invoker1</ejb-name>
+ <ejb-class>gf.Invoker1</ejb-class>
+ <session-type>Stateless</session-type>
+ <env-entry>
+ <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>From Invoker1</env-entry-value>
+ </env-entry>
+ </session>
- <session>
- <ejb-name>Invoker2</ejb-name>
- <ejb-class>gf.Invoker2</ejb-class>
- <session-type>Stateless</session-type>
- <env-entry>
- <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>From Invoker2</env-entry-value>
- </env-entry>
- </session>
- </enterprise-beans>
+ <session>
+ <ejb-name>Invoker2</ejb-name>
+ <ejb-class>gf.Invoker2</ejb-class>
+ <session-type>Stateless</session-type>
+ <env-entry>
+ <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>From Invoker2</env-entry-value>
+ </env-entry>
+ </session>
+ </enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
index cdd64fe..9796d74 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
@@ -23,5 +23,5 @@
@Stateless
public class Invoker1 {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/META-INF/ejb-jar.xml
index 58d4616..6f97c8a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/META-INF/ejb-jar.xml
@@ -18,31 +18,31 @@
-->
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- version="3.1">
- <enterprise-beans>
- <session>
- <ejb-name>Invoker1</ejb-name>
- <ejb-class>gf.Invoker1</ejb-class>
- <session-type>Stateless</session-type>
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Invoker1</ejb-name>
+ <ejb-class>gf.Invoker1</ejb-class>
+ <session-type>Stateless</session-type>
- <resource-env-ref>
- <resource-env-ref-name>java:module/env/DupResourceEnvRef</resource-env-ref-name>
- <resource-env-ref-type>jakarta.jms.Topic</resource-env-ref-type>
- </resource-env-ref>
- </session>
-
- <session>
- <ejb-name>Invoker2</ejb-name>
- <ejb-class>gf.Invoker2</ejb-class>
- <session-type>Stateless</session-type>
- <resource-env-ref>
- <resource-env-ref-name>java:module/env/DupResourceEnvRef</resource-env-ref-name>
- <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
- </resource-env-ref>
- </session>
- </enterprise-beans>
+ <resource-env-ref>
+ <resource-env-ref-name>java:module/env/DupResourceEnvRef</resource-env-ref-name>
+ <resource-env-ref-type>jakarta.jms.Topic</resource-env-ref-type>
+ </resource-env-ref>
+ </session>
+
+ <session>
+ <ejb-name>Invoker2</ejb-name>
+ <ejb-class>gf.Invoker2</ejb-class>
+ <session-type>Stateless</session-type>
+ <resource-env-ref>
+ <resource-env-ref-name>java:module/env/DupResourceEnvRef</resource-env-ref-name>
+ <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
+ </resource-env-ref>
+ </session>
+ </enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
index cdd64fe..9796d74 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
@@ -23,5 +23,5 @@
@Stateless
public class Invoker1 {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
index 40f8a1f..08de097 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
@@ -24,7 +24,7 @@
@Stateless
public class Invoker3 {
- @Resource(name="java:module/env/DupResourceRef",lookup="jdbc/__default")
- private javax.sql.DataSource customerAppDB;
-
+ @Resource(name="java:module/env/DupResourceRef",lookup="jdbc/__default")
+ private javax.sql.DataSource customerAppDB;
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
index f64f516..c7d2fac 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
@@ -23,8 +23,8 @@
@Stateless
public class Invoker4 {
- @Resource(name="java:module/env/DupResourceRef",lookup="jdbc/__TimerPool")
- private javax.sql.DataSource customerAppDB;
-
+ @Resource(name="java:module/env/DupResourceRef",lookup="jdbc/__TimerPool")
+ private javax.sql.DataSource customerAppDB;
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml
index fb97c87..d47780d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml
@@ -18,28 +18,28 @@
-->
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- version="3.1">
- <enterprise-beans>
- <session>
- <ejb-name>Invoker1</ejb-name>
- <ejb-class>gf.Invoker1</ejb-class>
- <session-type>Stateless</session-type>
- <env-entry>
- <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>from ejb</env-entry-value>
- </env-entry>
-
- <env-entry>
- <env-entry-name>java:comp/env/DuplicateEnvEntry</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>from ejb</env-entry-value>
- </env-entry>
- </session>
-
- </enterprise-beans>
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Invoker1</ejb-name>
+ <ejb-class>gf.Invoker1</ejb-class>
+ <session-type>Stateless</session-type>
+ <env-entry>
+ <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>from ejb</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>java:comp/env/DuplicateEnvEntry</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>from ejb</env-entry-value>
+ </env-entry>
+ </session>
+
+ </enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
index cdd64fe..9796d74 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
@@ -23,5 +23,5 @@
@Stateless
public class Invoker1 {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml
index 91304e3..0d89995 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/WebContent/WEB-INF/ejb-jar.xml
@@ -18,29 +18,29 @@
-->
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- version="3.1">
- <enterprise-beans>
- <session>
- <ejb-name>Invoker1</ejb-name>
- <ejb-class>gf.Invoker1</ejb-class>
- <session-type>Stateless</session-type>
- <env-entry>
- <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>from module</env-entry-value>
- </env-entry>
-
- <env-entry>
- <env-entry-name>java:comp/env/DuplicateEnvEntry</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>From comp</env-entry-value>
- </env-entry>
- </session>
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Invoker1</ejb-name>
+ <ejb-class>gf.Invoker1</ejb-class>
+ <session-type>Stateless</session-type>
+ <env-entry>
+ <env-entry-name>java:module/env/DuplicateEnvEntry</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>from module</env-entry-value>
+ </env-entry>
-
- </enterprise-beans>
+ <env-entry>
+ <env-entry-name>java:comp/env/DuplicateEnvEntry</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>From comp</env-entry-value>
+ </env-entry>
+ </session>
+
+
+ </enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
index cdd64fe..9796d74 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
@@ -23,5 +23,5 @@
@Stateless
public class Invoker1 {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/ejb-jar.xml
index 61d0fac..9bc4886 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/ejb-jar.xml
@@ -18,25 +18,25 @@
-->
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
- version="3.1">
- <enterprise-beans>
- <session>
- <ejb-name>Invoker</ejb-name>
- <ejb-class>gf.Invoker</ejb-class>
- <session-type>Stateless</session-type>
- <message-destination-ref>
- <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
- <message-destination-type>jakarta.jms.Queue</message-destination-type>
- <message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>MyQueueLink</message-destination-link>
- </message-destination-ref>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <message-destination>
- <message-destination-name>MyQueueLink</message-destination-name>
- </message-destination>
- </assembly-descriptor>
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Invoker</ejb-name>
+ <ejb-class>gf.Invoker</ejb-class>
+ <session-type>Stateless</session-type>
+ <message-destination-ref>
+ <message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
+ <message-destination-type>jakarta.jms.Queue</message-destination-type>
+ <message-destination-usage>Produces</message-destination-usage>
+ <message-destination-link>MyQueueLink</message-destination-link>
+ </message-destination-ref>
+ </session>
+ </enterprise-beans>
+ <assembly-descriptor>
+ <message-destination>
+ <message-destination-name>MyQueueLink</message-destination-name>
+ </message-destination>
+ </assembly-descriptor>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/sun-ejb-jar.xml
index 4bab1e7..021bd57 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/META-INF/sun-ejb-jar.xml
@@ -19,10 +19,10 @@
-->
<sun-ejb-jar>
- <enterprise-beans>
- <message-destination>
- <message-destination-name>MyQueueLink</message-destination-name>
- <jndi-name>jms/deployment_jndivalidation_queue</jndi-name>
- </message-destination>
- </enterprise-beans>
+ <enterprise-beans>
+ <message-destination>
+ <message-destination-name>MyQueueLink</message-destination-name>
+ <jndi-name>jms/deployment_jndivalidation_queue</jndi-name>
+ </message-destination>
+ </enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/javaee8/ear/client/META-INF/application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/javaee8/ear/client/META-INF/application-client.xml
index d34559d..8dfa84e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/javaee8/ear/client/META-INF/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/javaee8/ear/client/META-INF/application-client.xml
@@ -21,5 +21,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd">
<display-name>testapp</display-name>
-
+
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java
index de02b4d..eac1fed 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestClient.java
@@ -54,7 +54,7 @@
log("All expected applications have been reported");
return(true);
}
-
+
private boolean checkReportedApps(String[] args, Boolean state)
throws Exception {
log("Checking if application names reported are valid");
@@ -135,7 +135,7 @@
/*
*We expect two events, one corresponding to the start operation entering the "running" state and
- *one for the operation completing. If the race condition has occurred, then we won't see both of
+ *one for the operation completing. If the race condition has occurred, then we won't see both of
*the events. We're going to look at the first one, expecting it to be the "running" event.
*/
if (receivedEvents.length < 2) {
@@ -170,7 +170,7 @@
}
}
}
-
+
private int testStartStop(String[] args) {
try {
log("Stopping all Applications");
@@ -209,7 +209,7 @@
HashMap set = new HashMap();
set.put(args[4], "app");
-
+
boolean ret = checkIfAppsArePresent(apps, set);
if(!ret)
return(-1);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java
index 44455ff..c046f47 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java
@@ -49,11 +49,11 @@
*JVMs but synchronized.
*<p>
*arguments:
- * --host <host>
- * --port <port>
- * --username <username>
- * --password <password>
- * --operation <operation>[*<n>]
+ * --host <host>
+ * --port <port>
+ * --username <username>
+ * --password <password>
+ * --operation <operation>[*<n>]
* --startTime <testStartTime> (as H:mm:ss)
* --delay <delayTime) (in ms)
* --secure <true or false>
@@ -64,10 +64,10 @@
*<p>
*The getTargets and getApps tasks invoke the corresponding back-end method only
*once in each thread. The loopGetTargets is more likely to induce problems if
- *there are race conditions somewhere in the code path, since it invokes the
- *getTargets method multiple times from each thread.
+ *there are race conditions somewhere in the code path, since it invokes the
+ *getTargets method multiple times from each thread.
*<p>
- *The system property sleep.time, if set, is used as the delay between when
+ *The system property sleep.time, if set, is used as the delay between when
*multiple threads are started. This is normally not needed but could be used
*to stagger the requests from the threads that are started to see if doing
*so avoids any race conditon that is revealed by starting the threads
@@ -81,11 +81,11 @@
* @author tjquinn
*/
public class TestJSR88Concurrency {
-
+
private DeploymentFactory factory;
-
+
private DeploymentManager manager;
-
+
private static final String HOST = "--host";
private static final String PORT = "--port";
private static final String USERNAME = "--username";
@@ -95,9 +95,9 @@
private static final String DELAY = "--delay";
private static final String SECURE = "--secure";
private static final String TIMEOUT = "--timeout";
-
+
/** initialization info for the command-line option names and defaults, if any */
- private static final String[][] optionsAndDefaults = new String[][]
+ private static final String[][] optionsAndDefaults = new String[][]
{ {HOST, "localhost"},
{PORT, "4848"},
{USERNAME, "admin"},
@@ -108,19 +108,19 @@
{SECURE, "false"},
{TIMEOUT, "10000"} // 10 seconds
};
-
+
/* command-line option names and values */
private HashMap<String,String> options;
-
+
/* used to control how many iterations of the loopGetTargets will run */
private static final int LOOP_MAX = 100;
-
+
/**
* Creates a new instance of TestJSR88Concurrency
*/
public TestJSR88Concurrency() {
}
-
+
/**
* @param args the command line arguments
*/
@@ -132,16 +132,16 @@
System.exit(1);
}
}
-
+
private void run(String[] args) throws DeploymentManagerCreationException, TargetException, InterruptedException, ParseException, UserException {
try {
prepareArgs(args);
factory = initFactory();
manager = initManager(
- getHost(),
- getPort(),
- getUsername(),
- getPassword(),
+ getHost(),
+ getPort(),
+ getUsername(),
+ getPassword(),
options.get(SECURE).equalsIgnoreCase("true"));
waitForTargetTime();
@@ -151,9 +151,9 @@
System.err.println("User error: " + ue.getMessage());
System.exit(1);
}
-
+
}
-
+
private void waitForTargetTime() throws ParseException, InterruptedException {
if (getTargetTimeText() == null) {
System.out.println("No start delay specified; continuing immediately");
@@ -162,7 +162,7 @@
SimpleDateFormat targetTimeFormat = new SimpleDateFormat("H:mm:ss");
Calendar targetTime = Calendar.getInstance();
targetTime.setTime(targetTimeFormat.parse(getTargetTimeText()));
-
+
Calendar now = Calendar.getInstance();
targetTime.set(now.get(Calendar.YEAR), now.get(Calendar.MONTH), now.get(Calendar.DAY_OF_MONTH));
System.out.println("Currently it is " + now.getTime().toString());
@@ -170,10 +170,10 @@
Thread.sleep(targetTime.getTimeInMillis() - System.currentTimeMillis());
System.out.println("Proceeding");
}
-
+
private void prepareArgs(String[] args) throws UserException {
options = initOptionsMap();
-
+
int i = 0;
while (i < args.length) {
if (options.containsKey(args[i])) {
@@ -183,16 +183,16 @@
}
i++;
}
-
+
ensureRequiredInfoSupplied();
}
-
+
private void ensureRequiredInfoSupplied() throws UserException {
if (getOperation() == null) {
throw new UserException("Expected --operation <operation[*n]> but none was found");
}
}
-
+
private HashMap<String,String> initOptionsMap() {
HashMap<String,String> result = new HashMap<String,String>();
for (String[] optionAndValue : optionsAndDefaults) {
@@ -200,14 +200,14 @@
}
return result;
}
-
+
private String getRequiredOptionValue(String[] args, int valuePosition) throws UserException {
if ((valuePosition >= args.length) || (args[valuePosition].startsWith("--"))) {
throw new UserException("No value available for " + args[valuePosition - 1]);
}
return args[valuePosition];
}
-
+
private void usage() {
System.out.println("devtests.deployment.jsr88.apitests.TestJSR88Concurrency --host <host> --port <port> --username <username> --password <password> --operation <operation>[*<n>] --startTime testStartTime (as H:mm:ss) --delay <delay-in-ms> --secure true/false");
System.out.println(" where <operation> can be getTargets, getApps, loopGetTargets");
@@ -215,18 +215,18 @@
System.out.println(" testStartTime is a time in the current day, specified as [H]H:mm:ss default is to start immediately");
System.out.println(" delay is the number of milliseconds to wait between starting threads");
}
-
+
private DeploymentFactory initFactory() {
/*
*We know we are testing our factory, so just instantiate it.
*/
return new SunDeploymentFactory();
}
-
+
private DeploymentManager initManager(
- String host,
- String port,
- String username,
+ String host,
+ String port,
+ String username,
String password,
boolean secure) throws DeploymentManagerCreationException {
String url = "deployer:Sun:AppServer::" + host + ":" + port + getConnectionStringSuffix(secure);
@@ -266,26 +266,26 @@
t.join(getTimeout());
allThreadsOK &= threadOK[i].get();
}
-
+
if ( ! allThreadsOK) {
throw new RuntimeException("At least one thread failed");
}
}
}
-
+
private void printTargets(int threadID) {
-
+
System.out.println("[" + threadID + "]Targets:");
for (Target t : getTargets()) {
System.out.println("[" + threadID + "] " + t.getName());
}
System.out.println();
}
-
+
private Target[] getTargets() {
return manager.getTargets();
}
-
+
private TargetModuleID[] getApps() throws TargetException {
Target[] targets = getTargets();
ModuleType[] types = new ModuleType[] {ModuleType.EJB, ModuleType.EAR, ModuleType.CAR, ModuleType.RAR};
@@ -295,7 +295,7 @@
}
return result.toArray(new TargetModuleID[result.size()]);
}
-
+
private void printApps(int threadID) throws TargetException {
System.out.println("[" + threadID + "]Applications:");
for (TargetModuleID id : getApps()) {
@@ -303,7 +303,7 @@
}
System.out.println("[" + threadID + "]");
}
-
+
private void loopGetTargets() {
getTargets(); // to warm up the connection
long startTime = System.currentTimeMillis();
@@ -312,23 +312,23 @@
}
System.out.println((System.currentTimeMillis() - startTime));
}
-
+
private void performFunction(String function, int threadID) throws TargetException {
if (function.equals("getTargets")) {
printTargets(threadID);
} else if (function.equals("getApps")) {
printApps(threadID);
} else if (function.equals("loopGetTargets")) {
- loopGetTargets();
+ loopGetTargets();
} else {
System.err.println("No recognized function in thread " + threadID);
}
}
-
+
private void multiGetApps() {
-
+
}
-
+
private String getStartTimeText() {
return options.get(START_TIME);
}
@@ -360,7 +360,7 @@
private long getDelay() {
return Long.parseLong(options.get(DELAY));
}
-
+
private String getConnectionStringSuffix(boolean secure) {
return secure ? ":https" : "";
}
@@ -368,19 +368,19 @@
private long getTimeout() {
return Long.parseLong(options.get(TIMEOUT));
}
-
+
private class Runner implements Runnable {
-
+
private String function;
private int threadID;
private AtomicBoolean result;
-
+
public Runner(String function, int threadID, AtomicBoolean result) {
Runner.this.function = function;
this.threadID = threadID;
this.result = result;
}
-
+
public void run() {
try {
performFunction(function, threadID);
@@ -392,10 +392,10 @@
thr.printStackTrace();
}
}
-
+
}
}
-
+
/**
*Indicates a user error, such as a missing command-line value, that should
*be displayed without a stack trace.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml
index 9f9663f..c64b3d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml
@@ -42,18 +42,18 @@
</path>
<target name="deployApps">
- <delete dir="${testsRoot}/build/war/servletonly"/>
- <delete dir="${testsRoot}/build/ejb/statelesshello"/>
- <delete dir="${testsRoot}/build/ear/wstoejb"/>
+ <delete dir="${testsRoot}/build/war/servletonly"/>
+ <delete dir="${testsRoot}/build/ejb/statelesshello"/>
+ <delete dir="${testsRoot}/build/ear/wstoejb"/>
<ant dir="../../war/servletonly" target="assemble">
<property name="build" value="${testsRoot}/build/war/servletonly"/>
</ant>
<ant dir="../../ejb/statelesshello" target="assemble">
<property name="build" value="${testsRoot}/build/ejb/statelesshello"/>
- </ant>
+ </ant>
<ant dir="../../ear/wstoejb" target="build">
<property name="build" value="${testsRoot}/build/ear/wstoejb"/>
- </ant>
+ </ant>
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="${testsRoot}/build/war/servletonly/servletonly.war"/>
<param name="testName" value="servletonly"/>
@@ -126,7 +126,7 @@
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
</target>
-
+
<target name="runConcurrencyClient" depends="compile">
<echo message="ConcurrencyClient ${arg.list}"/>
<java
@@ -198,7 +198,7 @@
<antcall target="undeployApps" />
</target>
-
+
<target name="runConcurrencyTest" depends="init">
<antcall target="declare-test">
<param name="description" value="jsr88/apitests Test JSR-88 concurrent usage"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml
index 669a02b..5debba1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml
@@ -23,7 +23,7 @@
<project name="jsr88" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<target name="private-all">
<ant dir="war" target="private-all">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml
index 0f0a967..24a812e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml
@@ -23,16 +23,16 @@
<project name="deploymentmanager" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="private-all">
- <ant dir="distribute" target="private-all">
- <property name="build" value="${build}/distribute"/>
- </ant>
- <ant dir="getXModules" target="private-all">
- <property name="build" value="${build}/getXModules"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="distribute" target="private-all">
+ <property name="build" value="${build}/distribute"/>
+ </ant>
+ <ant dir="getXModules" target="private-all">
+ <property name="build" value="${build}/getXModules"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml
index f591190..ba62777 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml
@@ -23,19 +23,19 @@
<project name="distribute" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="childtargetmoduleid" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
- <ant dir="getweburl" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
- <ant dir="clientconfiguration" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
+ <target name="private-all">
+ <ant dir="childtargetmoduleid" target="private-all">
+ <property name="build" value="${build}"/>
+ </ant>
+ <ant dir="getweburl" target="private-all">
+ <property name="build" value="${build}"/>
+ </ant>
+ <ant dir="clientconfiguration" target="private-all">
+ <property name="build" value="${build}"/>
+ </ant>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java
index dd174b1..028de29 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/DeployTargetModuleIDTester.java
@@ -40,17 +40,17 @@
* @author Jerome Dochez
*/
public class DeployTargetModuleIDTester extends JSR88Deployer {
-
+
/** Creates a new instance of DeployTargetModuleIDTester */
- public DeployTargetModuleIDTester(String host, String port, String user, String password) {
+ public DeployTargetModuleIDTester(String host, String port, String user, String password) {
super(host, port, user, password);
}
-
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
-
+
try {
DeployTargetModuleIDTester deployer = getDeployer(args);
TargetModuleID[] ids = deployer.deploy(args);
@@ -59,23 +59,23 @@
System.exit(0);
} else {
log("Test FAILED");
- deployer.dumpModulesIDs("", ids);
+ deployer.dumpModulesIDs("", ids);
System.exit(1);
}
-
+
} catch(Exception e) {
e.printStackTrace();
System.exit(1);
}
- }
-
- protected static DeployTargetModuleIDTester getDeployer(String[] args) {
- return new DeployTargetModuleIDTester(args[1], args[2], args[3], args[4]);
}
-
-
- protected TargetModuleID[] deploy(String[] args) throws Exception {
-
+
+ protected static DeployTargetModuleIDTester getDeployer(String[] args) {
+ return new DeployTargetModuleIDTester(args[1], args[2], args[3], args[4]);
+ }
+
+
+ protected TargetModuleID[] deploy(String[] args) throws Exception {
+
File inputFile = new File(args[6]);
if (!inputFile.exists()) {
error("File not found : " + inputFile.getPath());
@@ -91,29 +91,29 @@
}
}
}
-
+
log("Deploying " + inputFile + " plan: " + deploymentFile);
ProgressObject po = deploy(inputFile, deploymentFile, false);
return po.getResultTargetModuleIDs();
}
-
+
protected boolean test(TargetModuleID[] moduleIDs, String path)
throws Exception
{
-
+
if (moduleIDs.length==0) {
// deployment failed ?
log("Deployment failed, got zero TargetModuleID");
System.exit(1);
}
-
+
// we are loading the deployed file and checking that the moduleIDs are
// correct
Application app = ApplicationArchivist.openArchive(new File(path));
-
+
if (app.isVirtual()) {
BundleDescriptor bd = app.getStandaloneBundleDescriptor();
-
+
// standalone module, should be fast.
if (moduleIDs.length!=1) {
// wrong number...
@@ -122,41 +122,41 @@
return false;
}
} else {
- for (int i=0;i<moduleIDs.length;i++) {
+ for (int i=0;i<moduleIDs.length;i++) {
TargetModuleID parent = moduleIDs[i];
Target target = parent.getTarget();
log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
+
// now look at all the children
TargetModuleID[] children = parent.getChildTargetModuleID();
if (children==null) {
log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
" modules but I didn't get any children TagetModuleID");
return false;
- }
-
+ }
+
// size is consistent ?
if (children.length!=app.getBundleDescriptors().size()) {
log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I got only " + children.length +
+ " modules but I got only " + children.length +
" children TagetModuleID");
return false;
} else {
- log("Expected " + app.getBundleDescriptors().size() +
+ log("Expected " + app.getBundleDescriptors().size() +
" children TargetModuleIDs and got " + children.length);
}
-
+
for (int j=0;j<children.length;j++) {
TargetModuleID aChild = children[j];
log("Processing " + aChild.getModuleID());
-
+
String childModuleID = aChild.getModuleID();
String[] splitted = childModuleID.split("#");
if (splitted.length!=2) {
log("Unknown sub module id " + childModuleID);
return false;
}
-
+
// check that parent TargeTModuleID is correct
if (aChild.getParentTargetModuleID().equals(parent)) {
log("Child's parent TargetModuleID is correctly set");
@@ -164,14 +164,14 @@
log("Child's parent TargetModuleID is incorrect");
return false;
}
-
+
String first = splitted[0];
if (first.equals(parent.getModuleID())) {
log("Correct parent module id for child " + childModuleID);
} else {
log("Incorrect parent module id for child " + childModuleID);
}
-
+
// look for the right module descriptor..
ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
if (md==null) {
@@ -180,10 +180,10 @@
} else {
log("Found module descriptor for " + childModuleID);
}
- }
+ }
}
}
// if we are here, it's good !
- return true;
- }
+ return true;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml
index 12edfec..016e163 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml
@@ -20,19 +20,19 @@
<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
]>
-
+
<project name="deploytargetmoduleid" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="compile">
+ <target name="compile">
<mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
+ <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
+ classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
+ />
+ </target>
+
<target name="build-ear" unless="earfile.built">
<echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
<ant dir="../../../ear/wstoejb" target="assemble"/>
@@ -40,24 +40,24 @@
<copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
<copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
</target>
-
+
<target name="private-all" depends="compile">
- <antcall target="declare-test">
+ <antcall target="declare-test">
<param name="description" value="jsr88/distribute/ChildTargetModuleID test TargetModuleID and its children returned from deployment"/>
- </antcall>
+ </antcall>
<available property="earfile.built" file="${archivedir}/wstoejb.ear"/>
<antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
+ <antcall target="specialized.run.jsr88">
<param name="deployer.class" value="devtests.deployment.jsr88.targetmoduleid.deploytargetmoduleid.DeployTargetModuleIDTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save/wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
+ <param name="command" value="deploy"/>
+ <param name="arg.list" value="true ${build}/../save/wstoejb.ear ${build}/../save/plan.jar"/>
+ </antcall>
<antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
+ <param name="result" value="0"/>
+ </antcall>
<antcall target="common.undeploy.asadmin">
<param name="arg.list" value="wstoejb"/>
- </antcall>
- </target>
-
+ </antcall>
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java
index 0422ec9..b23c3fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/ClientConfigurationTester.java
@@ -41,40 +41,40 @@
* @author Jerome Dochez
*/
public class ClientConfigurationTester extends JSR88Deployer {
-
+
/** Creates a new instance of DeployTargetModuleIDTester */
- public ClientConfigurationTester(String host, String port, String user, String password) {
+ public ClientConfigurationTester(String host, String port, String user, String password) {
super(host, port, user, password);
}
-
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
-
+
try {
ClientConfigurationTester deployer = getDeployer(args);
ProgressObject po = deployer.deploy(args);
if (deployer.test(po, args[6])) {
System.exit(0);
} else {
- deployer.dumpModulesIDs("", po.getResultTargetModuleIDs());
+ deployer.dumpModulesIDs("", po.getResultTargetModuleIDs());
System.exit(1);
}
-
+
} catch(Exception e) {
e.printStackTrace();
System.exit(1);
}
- }
-
- protected static ClientConfigurationTester getDeployer(String[] args) {
- return new ClientConfigurationTester(args[1], args[2], args[3], args[4]);
}
-
-
- protected ProgressObject deploy(String[] args) throws Exception {
-
+
+ protected static ClientConfigurationTester getDeployer(String[] args) {
+ return new ClientConfigurationTester(args[1], args[2], args[3], args[4]);
+ }
+
+
+ protected ProgressObject deploy(String[] args) throws Exception {
+
File inputFile = new File(args[6]);
if (!inputFile.exists()) {
error("File not found : " + inputFile.getPath());
@@ -90,29 +90,29 @@
}
}
}
-
+
log("Deploying " + inputFile + " plan: " + deploymentFile);
return deploy(inputFile, deploymentFile, false);
}
-
+
protected boolean test(ProgressObject po, String path)
throws Exception
{
-
+
TargetModuleID[] moduleIDs = po.getResultTargetModuleIDs();
if (moduleIDs.length==0) {
// deployment failed ?
log("Deployment failed, got zero TargetModuleID");
System.exit(1);
}
-
+
// we are loading the deployed file and checking that the moduleIDs are
// correct
Application app = ApplicationArchivist.openArchive(new File(path));
-
+
if (app.isVirtual()) {
BundleDescriptor bd = app.getStandaloneBundleDescriptor();
-
+
// standalone module, should be fast.
if (moduleIDs.length!=1) {
// wrong number...
@@ -120,7 +120,7 @@
dumpModulesIDs("", moduleIDs);
return false;
}
-
+
// let's just check that the web uri is fine
if (bd.getModuleType().equals(ModuleType.WAR)) {
if (moduleIDs[0].getWebURL()==null) {
@@ -129,30 +129,30 @@
}
}
} else {
- for (int i=0;i<moduleIDs.length;i++) {
+ for (int i=0;i<moduleIDs.length;i++) {
TargetModuleID parent = moduleIDs[i];
Target target = parent.getTarget();
log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
+
// now look at all the children
TargetModuleID[] children = parent.getChildTargetModuleID();
if (children==null) {
log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
" modules but I didn't get any children TagetModuleID");
return false;
- }
-
+ }
+
for (int j=0;j<children.length;j++) {
TargetModuleID aChild = children[j];
log("Processing " + aChild.getModuleID());
-
+
String childModuleID = aChild.getModuleID();
String[] splitted = childModuleID.split("#");
if (splitted.length!=2) {
log("Unknown sub module id " + childModuleID);
return false;
}
-
+
// look for the right module descriptor..
ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
if (md==null) {
@@ -166,10 +166,10 @@
ClientConfiguration cc = po.getClientConfiguration(aChild);
cc.execute();
}
- }
+ }
}
}
// if we are here, it's good !
- return true;
- }
+ return true;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml
index 8a2964f..bff7a3a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml
@@ -20,19 +20,19 @@
<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
]>
-
+
<project name="getweburl" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
-
- <target name="compile">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
+
+ <target name="compile">
+ <mkdir dir="${build}" />
+ <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
+ classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
+ />
+ </target>
+
<target name="build-ear" unless="earfile.built">
<echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
<ant dir="../../../ear/wstoejb" target="assemble"/>
@@ -40,24 +40,24 @@
<copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
<copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
</target>
-
+
<target name="private-all" depends="compile">
- <antcall target="declare-test">
+ <antcall target="declare-test">
<param name="description" value="jsr88/deploymentmanager/distribute/clientconfiguration test getClientConfiguraton API"/>
- </antcall>
+ </antcall>
<available property="earfile.built" file="${build}/../save/wstoejb.ear"/>
<antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
+ <antcall target="specialized.run.jsr88">
<param name="deployer.class" value="jsr88.deploymentmanager.distribute.clientconfiguration.ClientConfigurationTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save//wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
+ <param name="command" value="deploy"/>
+ <param name="arg.list" value="true ${build}/../save//wstoejb.ear ${build}/../save/plan.jar"/>
+ </antcall>
<antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
+ <param name="result" value="0"/>
+ </antcall>
<antcall target="common.undeploy.asadmin">
<param name="arg.list" value="wstoejb"/>
</antcall>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java
index 17d0a36..9697fe2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/DeployGetWebUrlTester.java
@@ -40,40 +40,40 @@
* @author Jerome Dochez
*/
public class DeployGetWebUrlTester extends JSR88Deployer {
-
+
/** Creates a new instance of DeployTargetModuleIDTester */
- public DeployGetWebUrlTester(String host, String port, String user, String password) {
+ public DeployGetWebUrlTester(String host, String port, String user, String password) {
super(host, port, user, password);
}
-
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
-
+
try {
DeployGetWebUrlTester deployer = getDeployer(args);
TargetModuleID[] ids = deployer.deploy(args);
if (deployer.test(ids, args[6])) {
System.exit(0);
} else {
- deployer.dumpModulesIDs("", ids);
+ deployer.dumpModulesIDs("", ids);
System.exit(1);
}
-
+
} catch(Exception e) {
e.printStackTrace();
System.exit(1);
}
- }
-
- protected static DeployGetWebUrlTester getDeployer(String[] args) {
- return new DeployGetWebUrlTester(args[1], args[2], args[3], args[4]);
}
-
-
- protected TargetModuleID[] deploy(String[] args) throws Exception {
-
+
+ protected static DeployGetWebUrlTester getDeployer(String[] args) {
+ return new DeployGetWebUrlTester(args[1], args[2], args[3], args[4]);
+ }
+
+
+ protected TargetModuleID[] deploy(String[] args) throws Exception {
+
File inputFile = new File(args[6]);
if (!inputFile.exists()) {
error("File not found : " + inputFile.getPath());
@@ -89,29 +89,29 @@
}
}
}
-
+
log("Deploying " + inputFile + " plan: " + deploymentFile);
ProgressObject po = deploy(inputFile, deploymentFile, false);
return po.getResultTargetModuleIDs();
}
-
+
protected boolean test(TargetModuleID[] moduleIDs, String path)
throws Exception
{
-
+
if (moduleIDs.length==0) {
// deployment failed ?
log("Deployment failed, got zero TargetModuleID");
System.exit(1);
}
-
+
// we are loading the deployed file and checking that the moduleIDs are
// correct
Application app = ApplicationArchivist.openArchive(new File(path));
-
+
if (app.isVirtual()) {
BundleDescriptor bd = app.getStandaloneBundleDescriptor();
-
+
// standalone module, should be fast.
if (moduleIDs.length!=1) {
// wrong number...
@@ -119,7 +119,7 @@
dumpModulesIDs("", moduleIDs);
return false;
}
-
+
// let's just check that the web uri is fine
if (bd.getModuleType().equals(ModuleType.WAR)) {
if (moduleIDs[0].getWebURL()==null) {
@@ -128,30 +128,30 @@
}
}
} else {
- for (int i=0;i<moduleIDs.length;i++) {
+ for (int i=0;i<moduleIDs.length;i++) {
TargetModuleID parent = moduleIDs[i];
Target target = parent.getTarget();
log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
+
// now look at all the children
TargetModuleID[] children = parent.getChildTargetModuleID();
if (children==null) {
log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
" modules but I didn't get any children TagetModuleID");
return false;
- }
-
+ }
+
for (int j=0;j<children.length;j++) {
TargetModuleID aChild = children[j];
log("Processing " + aChild.getModuleID());
-
+
String childModuleID = aChild.getModuleID();
String[] splitted = childModuleID.split("#");
if (splitted.length!=2) {
log("Unknown sub module id " + childModuleID);
return false;
}
-
+
// look for the right module descriptor..
ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
if (md==null) {
@@ -168,10 +168,10 @@
log("Web module " + splitted[1] + " available at " + aChild.getWebURL());
}
}
- }
+ }
}
}
// if we are here, it's good !
- return true;
- }
+ return true;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml
index 06acc0c..627ebeb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml
@@ -20,19 +20,19 @@
<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
]>
-
+
<project name="getweburl" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
-
- <target name="compile">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
+
+ <target name="compile">
+ <mkdir dir="${build}" />
+ <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
+ classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
+ />
+ </target>
+
<target name="build-ear" unless="earfile.built">
<echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
<ant dir="../../../ear/wstoejb" target="assemble"/>
@@ -40,24 +40,24 @@
<copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
<copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
</target>
-
+
<target name="private-all" depends="compile">
- <antcall target="declare-test">
+ <antcall target="declare-test">
<param name="description" value="jsr88/targetmoduleid/DeployGetWebUrlTester test GetWebURL returned from deployment"/>
- </antcall>
+ </antcall>
<available property="earfile.built" file="${build}/../save/wstoejb.ear"/>
<antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
+ <antcall target="specialized.run.jsr88">
<param name="deployer.class" value="devtests.deployment.jsr88.targetmoduleid.deploygetweburl.DeployGetWebUrlTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save//wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
+ <param name="command" value="deploy"/>
+ <param name="arg.list" value="true ${build}/../save//wstoejb.ear ${build}/../save/plan.jar"/>
+ </antcall>
<antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
+ <param name="result" value="0"/>
+ </antcall>
<antcall target="common.undeploy.asadmin">
<param name="arg.list" value="wstoejb"/>
</antcall>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml
index 0e5a074..c7f71c5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml
@@ -23,12 +23,12 @@
<project name="getXModules" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="childtmid" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="childtmid" target="private-all">
+ <property name="build" value="${build}"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java
index 3af7c6a..5952256 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/ChildTargetModuleIDTester.java
@@ -40,17 +40,17 @@
* @author Jerome Dochez
*/
public class ChildTargetModuleIDTester extends JSR88Deployer {
-
+
/** Creates a new instance of DeployTargetModuleIDTester */
- public ChildTargetModuleIDTester(String host, String port, String user, String password) {
+ public ChildTargetModuleIDTester(String host, String port, String user, String password) {
super(host, port, user, password);
}
-
+
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
-
+
try {
ChildTargetModuleIDTester deployer = getDeployer(args);
TargetModuleID[] ids = deployer.deploy(args);
@@ -59,23 +59,23 @@
System.exit(0);
} else {
log("Test FAILED");
- deployer.dumpModulesIDs("", ids);
+ deployer.dumpModulesIDs("", ids);
System.exit(1);
}
-
+
} catch(Exception e) {
e.printStackTrace();
System.exit(1);
}
- }
-
- protected static ChildTargetModuleIDTester getDeployer(String[] args) {
- return new ChildTargetModuleIDTester(args[1], args[2], args[3], args[4]);
}
-
-
- protected TargetModuleID[] deploy(String[] args) throws Exception {
-
+
+ protected static ChildTargetModuleIDTester getDeployer(String[] args) {
+ return new ChildTargetModuleIDTester(args[1], args[2], args[3], args[4]);
+ }
+
+
+ protected TargetModuleID[] deploy(String[] args) throws Exception {
+
File inputFile = new File(args[6]);
if (!inputFile.exists()) {
error("File not found : " + inputFile.getPath());
@@ -91,32 +91,32 @@
}
}
}
-
+
log("Deploying " + inputFile + " plan: " + deploymentFile);
ProgressObject po = deploy(inputFile, deploymentFile, false);
return po.getResultTargetModuleIDs();
- }
-
+ }
+
protected boolean test(TargetModuleID[] moduleIDs, String path)
throws Exception
{
-
+
// hack for std modules
-
+
TargetModuleID[] aTargetModuleIDs = findApplication("sayhello", ModuleType.WAR, null);
-
+
dumpModulesIDs("war", aTargetModuleIDs);
-
+
if (moduleIDs.length==0) {
// deployment failed ?
log("Deployment failed, got zero TargetModuleID");
System.exit(1);
}
-
+
// we are loading the deployed file and checking that the moduleIDs are
// correct
Application app = ApplicationArchivist.openArchive(new File(path));
-
+
// check of non running modules
ModuleType modType;
if (app.isVirtual()) {
@@ -124,44 +124,44 @@
} else {
modType = ModuleType.EAR;
}
-
+
// now we need to start the application
for (int i=0;i<moduleIDs.length;i++) {
TargetModuleID aTargetModuleID = moduleIDs[i];
-
+
// should be part of the non running
- TargetModuleID[] targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
+ TargetModuleID[] targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
modType, Boolean.FALSE);
check(path, app, targetModuleIDs);
-
+
// should be part of the available apps
- targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
+ targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
modType, null);
check(path, app, targetModuleIDs);
-
+
// now we start it..
start(aTargetModuleID.getModuleID());
-
+
// should be part of the running
- targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
+ targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
modType, Boolean.TRUE);
check(path, app, targetModuleIDs);
-
+
// should be part of the available apps
- targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
+ targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
modType, null);
check(path, app, targetModuleIDs);
-
+
}
return true;
-
- }
-
+
+ }
+
private boolean check(String path, Application app, TargetModuleID[] moduleIDs) {
-
+
if (app.isVirtual()) {
BundleDescriptor bd = app.getStandaloneBundleDescriptor();
-
+
// standalone module, should be fast.
if (moduleIDs.length!=1) {
// wrong number...
@@ -170,41 +170,41 @@
return false;
}
} else {
- for (int i=0;i<moduleIDs.length;i++) {
+ for (int i=0;i<moduleIDs.length;i++) {
TargetModuleID parent = moduleIDs[i];
Target target = parent.getTarget();
log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
+
// now look at all the children
TargetModuleID[] children = parent.getChildTargetModuleID();
if (children==null) {
log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
" modules but I didn't get any children TagetModuleID");
return false;
- }
-
+ }
+
// size is consistent ?
if (children.length!=app.getBundleDescriptors().size()) {
log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I got only " + children.length +
+ " modules but I got only " + children.length +
" children TagetModuleID");
return false;
} else {
- log("Expected " + app.getBundleDescriptors().size() +
+ log("Expected " + app.getBundleDescriptors().size() +
" children TargetModuleIDs and got " + children.length);
}
-
+
for (int j=0;j<children.length;j++) {
TargetModuleID aChild = children[j];
log("Processing " + aChild.getModuleID());
-
+
String childModuleID = aChild.getModuleID();
String[] splitted = childModuleID.split("#");
if (splitted.length!=2) {
log("Unknown sub module id " + childModuleID);
return false;
}
-
+
// check that parent TargeTModuleID is correct
if (aChild.getParentTargetModuleID().equals(parent)) {
log("Child's parent TargetModuleID is correctly set");
@@ -212,14 +212,14 @@
log("Child's parent TargetModuleID is incorrect");
return false;
}
-
+
String first = splitted[0];
if (first.equals(parent.getModuleID())) {
log("Correct parent module id for child " + childModuleID);
} else {
log("Incorrect parent module id for child " + childModuleID);
}
-
+
// look for the right module descriptor..
ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
if (md==null) {
@@ -231,10 +231,10 @@
if (md.getModuleType().equals(ModuleType.WAR)) {
log("Web module deployed at : " + aChild.getWebURL());
}
- }
+ }
}
}
// if we are here, it's good !
- return true;
- }
+ return true;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml
index 0384b0c..3eef317 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml
@@ -20,19 +20,19 @@
<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
]>
-
+
<project name="deploytargetmoduleid" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="compile" depends="init">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
+ <target name="compile" depends="init">
+ <mkdir dir="${build}" />
+ <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
+ classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
+ />
+ </target>
+
<target name="build-ear" unless="earfile.built">
<echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
<ant dir="../../../ear/wstoejb" target="assemble"/>
@@ -40,24 +40,24 @@
<copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
<copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
</target>
-
+
<target name="private-all" depends="compile">
- <antcall target="declare-test">
+ <antcall target="declare-test">
<param name="description" value="jsr88/distribute/ChildTargetModuleID test TargetModuleID and its children returned from deployment"/>
- </antcall>
+ </antcall>
<available property="earfile.built" file="${archivedir}/wstoejb.ear"/>
<antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
+ <antcall target="specialized.run.jsr88">
<param name="deployer.class" value="jsr88.deploymentmanager.getXModules.childtmid.ChildTargetModuleIDTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save/wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
+ <param name="command" value="deploy"/>
+ <param name="arg.list" value="true ${build}/../save/wstoejb.ear ${build}/../save/plan.jar"/>
+ </antcall>
<antcall target="processResult">
- <param name="result" value="0"/>
+ <param name="result" value="0"/>
</antcall>
<antcall target="common.undeploy.asadmin">
<param name="arg.list" value="wstoejb"/>
- </antcall>
- </target>
-
+ </antcall>
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml
index 62ab304..34792e8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml
@@ -23,12 +23,12 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="wstoejb" target="private-all">
- <property name="build" value="${build}/wstoejb"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="wstoejb" target="private-all">
+ <property name="build" value="${build}/wstoejb"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java
index d28b9f7..3f49164 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/SimpleJSR88Client.java
@@ -19,7 +19,7 @@
*
*Provides access to the JSR88 API through a convenient command line.
*<p>
- *This is intended for internal testing use only.
+ *This is intended for internal testing use only.
*
* Created on January 21, 2004, 11:22 AM
*/
@@ -44,7 +44,7 @@
*/
public class SimpleJSR88Client {
-
+
private final String J2EE_DEPLOYMENT_MANAGER = "J2EE-DeploymentFactory-Implementation-Class";
private DeploymentFactory deploymentFactory;
@@ -52,15 +52,15 @@
private DeploymentManager deploymentManager;
private String host;
-
+
private String port;
-
+
private String user;
-
+
private String password;
-
+
private String uri;
-
+
/** Creates a new instance of SimpleJSR88Client */
public SimpleJSR88Client(String host, String port, String user, String password) {
this.host = host;
@@ -69,7 +69,7 @@
this.password = password;
this.uri = "deployer:Sun:AppServer::" + host + ":" + port;
}
-
+
/**
* @param args the command line arguments
*/
@@ -78,10 +78,10 @@
*Get properties indicating the user, password, host, and port.
*/
String host = null;
- String port = null;
- String user = null;
+ String port = null;
+ String user = null;
String password = null;
-
+
if (((host = System.getProperty("jsr88client.host")) == null)
|| ((port = System.getProperty("jsr88client.port")) == null)
|| ((user = System.getProperty("jsr88client.user")) == null)
@@ -89,7 +89,7 @@
System.out.println("The properties jsr88client.host, jsr88client.port, jsr88client.user, and jsr88client.password must be assigned");
System.exit(-1);
}
-
+
try {
new SimpleJSR88Client(host, port, user, password).run(args);
System.exit(0);
@@ -99,19 +99,19 @@
System.exit(1);
}
}
-
+
public void run(String[] args) throws TargetException, DeploymentManagerCreationException {
if (args.length == 0) {
throw new IllegalArgumentException("Specify the JSR88 client command you want to execute as the first command line parameter");
}
-
+
if (args[0].equals("getAvailableAppClientModules") ){
getAvailableModules(ModuleType.CAR);
} else {
throw new IllegalArgumentException("Unrecognized JSR88 client command specified: " + args[0]);
}
}
-
+
private void getAvailableModules(ModuleType type) throws TargetException, DeploymentManagerCreationException {
Target targets [] = getDeploymentManager().getTargets();
TargetModuleID [] moduleIDs = getDeploymentManager().getAvailableModules(type, targets);
@@ -121,7 +121,7 @@
}
System.out.println();
}
-
+
private DeploymentFactory loadDeploymentFactory() {
System.out.println("Loading deployment factory");
Object deploymentFactory = null;
@@ -142,9 +142,9 @@
} catch (ClassNotFoundException cnfe) {
cnfe.printStackTrace();
System.exit(-1);
- }
+ }
- try {
+ try {
deploymentFactory = factory.newInstance();
} catch (Exception ie) {
ie.printStackTrace();
@@ -155,8 +155,8 @@
} else {
System.out.println("Expected instance of DeploymentFactory from class loading of " + className + " but got " + deploymentFactory.getClass().getName() + " instead");
System.exit(-1);
- }
-
+ }
+
} catch (Exception ex) {
log("Failed to load the deployment factory using URL " + file.getAbsolutePath() + " and class " + className);
ex.printStackTrace();
@@ -166,11 +166,11 @@
return (DeploymentFactory) deploymentFactory;
}
-
+
private static void log(String message) {
System.out.println("[" + getJSRClientName() + "]:: " + message);
}
-
+
protected static String getJSRClientName() {
return "SimpleJSR88Client";
}
@@ -181,14 +181,14 @@
}
return this.deploymentFactory;
}
-
+
private DeploymentManager loadDeploymentManager() throws DeploymentManagerCreationException {
System.out.println("Loading deployment manager using uri " + this.uri + " under user " + this.user);
- DeploymentManager answer = getDeploymentFactory().getDeploymentManager(this.uri, this.user, this.password);
+ DeploymentManager answer = getDeploymentFactory().getDeploymentManager(this.uri, this.user, this.password);
System.out.println("Deployment manager loaded.");
return answer;
}
-
+
protected DeploymentManager getDeploymentManager() throws DeploymentManagerCreationException {
if (this.deploymentManager == null) {
this.deploymentManager = loadDeploymentManager();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java
index 5792d1c..f29ddc6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestOpenJarFileWorkaround.java
@@ -33,9 +33,9 @@
* @author tjquinn
*/
public class TestOpenJarFileWorkaround {
-
+
private static final String here = "devtests/deployment/jsr88/misc";
-
+
/**
Values taken from command-line arguments
*/
@@ -44,13 +44,13 @@
private String user = null;
private String password = null;
private String warFileToDeploy = null;
-
+
private JSR88Deployer depl = null;
-
+
/** Creates a new instance of TestOpenJarFileWorkaround */
public TestOpenJarFileWorkaround() {
}
-
+
private void initDeployer(String host, String port, String user, String password) throws Exception {
log("Getting access to JSR88 deployer");
depl = new JSR88Deployer(host, port, user, password);
@@ -69,7 +69,7 @@
test.fail();
}
}
-
+
private void log(String message) {
System.out.println("[TestProgressObjectImpl]:: " + message);
}
@@ -83,27 +83,27 @@
log("FAILED: " + here);
System.exit(-1);
}
-
+
private void prepareArgs(String[] args) {
if (args.length < 5) {
log("Expected 5 arguments (host, port, user, password, war) but found " + args.length);
fail();
}
-
+
this.host = args[0];
this.port = args[1];
this.user = args[2];
this.password = args[3];
this.warFileToDeploy = args[4];
}
-
+
public void run(String[] args) throws Throwable {
-
+
/*
*Prepare instance variables from the command-line arguments for convenience.
*/
prepareArgs(args);
-
+
/*
*Locate the web archive to deploy.
*/
@@ -117,23 +117,23 @@
*Initialize the deployer for use during the test.
*/
initDeployer(host, port, user, password);
-
+
/*
*Start by deploying the web app.
*/
int firstDeployResult = depl.deploy(warFile, /*deploymentPlan */ null, /* startByDefault */ true);
-
+
if (firstDeployResult != 0) {
log("Failed to deploy war file " + warFile.getAbsolutePath() + " the first time.");
fail();
}
-
+
/*
*Next, undeploy the same web app.
- *Get the list of modules acted upon so we can specify the correct module ID to undeploy.
+ *Get the list of modules acted upon so we can specify the correct module ID to undeploy.
*/
TargetModuleID [] firstListOfApps = depl.getMostRecentTargetModuleIDs();
-
+
if (firstListOfApps.length != 1) {
log("Expected exactly one result module from the deployer but found " + firstListOfApps.length);
for (int i = 0; i < firstListOfApps.length; i++) {
@@ -141,29 +141,29 @@
}
fail();
}
-
+
int firstUndeployResult = depl.undeploy(firstListOfApps[0].getModuleID());
-
+
if (firstUndeployResult != 0) {
log("Error undeploying the web application the first time.");
fail();
}
-
+
/*
*Now, try to deploy the app again.
*/
int secondDeployResult = depl.deploy(warFile, /*deploymentPlan */ null, /* startByDefault */ true);
-
+
if (secondDeployResult != 0) {
log("Failed to deploy war file " + warFile.getAbsolutePath() + " the second time.");
fail();
}
-
+
/*
*Undeploy the web app one last time.
*/
TargetModuleID [] secondListOfApps = depl.getMostRecentTargetModuleIDs();
-
+
if (secondListOfApps.length != 1) {
log("Expected exactly one application from the deployer but found " + secondListOfApps.length);
for (int i = 0; i < secondListOfApps.length; i++) {
@@ -171,9 +171,9 @@
}
fail();
}
-
+
int secondUndeployResult = depl.undeploy(secondListOfApps[0].getModuleID());
-
+
if (secondUndeployResult != 0) {
log("Error undeploying the web application the second time.");
fail();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java
index eac4b10..20178cf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/TestProgressObjectImpl.java
@@ -36,7 +36,7 @@
/**
*Makes sure that the ProgressObjectImpl class functions correctly.
*<p>
- *In particular, bug 4977764 reported that the ProgressObjectImpl class was susceptible to
+ *In particular, bug 4977764 reported that the ProgressObjectImpl class was susceptible to
*concurrent update failures in the vector that holds registered progress listeners. The
*fireProgressEvent method worked with the vector of listeners itself rather than a clone of the vector.
*One of the listeners unregistered itself from the progress object, so when the iterator tried to
@@ -48,22 +48,22 @@
public class TestProgressObjectImpl {
private static final String here = "devtests/deployment/jsr88/misc";
-
+
/**
*Provides a concrete implementation of the progress object for testing. Note that the behavior being
*tested is actually that of the superclass ProgressObjectImpl.
*/
public class MyProgressObjectImpl extends ProgressObjectImpl {
-
+
public MyProgressObjectImpl(TargetImpl target) {
super(target);
}
-
+
/**
*Required by the abstract class definition but not used during testing.
*/
public void run() {}
-
+
/**
*Stands in as an operation that fires an event to registered listeners.
*/
@@ -76,13 +76,13 @@
fireProgressEvent(StateType.COMPLETED, "done");
}
}
-
+
/**
*Adds a new listener during the event handling.
*/
public class MeddlingListenerAdder implements ProgressListener {
-
-
+
+
public void handleProgressEvent(javax.enterprise.deploy.spi.status.ProgressEvent progressEvent) {
/*
*Meddle in the listener list by adding a new listener to the list. This should trigger the error
@@ -90,15 +90,15 @@
*/
TestProgressObjectImpl.this.theProgressObjectImpl.addProgressListener(new TestProgressObjectImpl.MeddlingListenerRemover());
}
-
+
}
-
+
/**
*Removes itself as a listener during the event handling.
*/
public class MeddlingListenerRemover implements ProgressListener {
-
-
+
+
public void handleProgressEvent(javax.enterprise.deploy.spi.status.ProgressEvent progressEvent) {
/*
*Meddle in the listener list by removing itself from the list. This should trigger the error
@@ -106,16 +106,16 @@
*/
TestProgressObjectImpl.this.theProgressObjectImpl.removeProgressListener(this);
}
-
+
}
-
+
/* Local progress object implementation to be tested. */
private MyProgressObjectImpl theProgressObjectImpl;
-
+
/** Creates a new instance of TestProgressObjectImpl */
public TestProgressObjectImpl() {
}
-
+
/**
* @param args the command line arguments
*/
@@ -129,13 +129,13 @@
test.fail();
}
}
-
+
public void run(String[] args) {
addNewListenerDuringEventHandling();
}
/**
- * Tamper with the listener list by adding a new listener during event handling.
+ * Tamper with the listener list by adding a new listener during event handling.
*/
private void addNewListenerDuringEventHandling() {
/*
@@ -146,17 +146,17 @@
theProgressObjectImpl = new MyProgressObjectImpl(target);
TestProgressObjectImpl.MeddlingListenerAdder meddlingListener1 = new TestProgressObjectImpl.MeddlingListenerAdder();
TestProgressObjectImpl.MeddlingListenerAdder meddlingListener2 = new TestProgressObjectImpl.MeddlingListenerAdder();
-
+
theProgressObjectImpl.addProgressListener(meddlingListener1);
theProgressObjectImpl.addProgressListener(meddlingListener2);
-
+
/*
*Fire an event that will change the listener set.
*/
theProgressObjectImpl.act();
-
+
}
-
+
private void log(String message) {
System.out.println("[TestProgressObjectImpl]:: " + message);
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml
index fb3d878..bbe83fa 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml
@@ -24,11 +24,11 @@
<project name="miscellaneousTestForJSR88" default="usage" basedir=".">
&commonBuild;
-
+
<property name="appClientName" value="appclienttest"/>
<property name="appClientJarFile" value="${build}/${appClientName}.jar"/>
<property name="appClientModuleName" value="testAppClient"/>
-
+
<property name="webServicesWorkaroundCheckWarFile" value="exampleFromJ2EETutorial/cb/provided-wars/jaxrpc-coffee-distributor.war"/>
<path id="jsr88.exec.classpath">
@@ -47,7 +47,7 @@
includes="*.java"
debug="on"
failonerror="true">
- <classpath>
+ <classpath>
<path refid="gfv3.classpath"/>
<path refid="test.compile.classpath"/>
<pathelement location="../../util/build"/> <!-- need this to find the JSR88Deployer -->
@@ -56,7 +56,7 @@
</target>
<!--
- Run all the tests.
+ Run all the tests.
-->
<target name="run" depends="compile,assemble">
<antcall target="runTestProgressObjectImpl"/>
@@ -86,7 +86,7 @@
<pathelement path="${build}"/>
</classpath>
</javaWithResult>
-
+
<antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/TestProgressObjectImpl.log"/>
@@ -108,7 +108,7 @@
<fileset dir="${basedir}" includes="**/application-client.xml **/sun-application-client.xml"/>
</jar>
</target>
-
+
<!--
To test the ability to get information about the modules through JSR88, first deploy an app client
(which exposed a bug), then use JSR88 to retrieve information about app client components, then undeploy
@@ -125,7 +125,7 @@
<antcall target="common.deploy.asadmin">
<param name="arg.list" value="--name ${appClientModuleName} ${appClientJarFile}"/>
</antcall>
-
+
<javaWithResult
fork="true"
failonerror="false"
@@ -164,14 +164,14 @@
<param name="log" value="${build}/GetModulesTest.log"/>
</antcall>
</target>
-
+
<!--
- This test checks on a workaround that avoids a bug in J2SE that opens a jar file but never closes it.
+ This test checks on a workaround that avoids a bug in J2SE that opens a jar file but never closes it.
This happens during web services compilation during deployment (in some cases) and the open jar file
prevents the app server from completely undeploying the app. A later attempt to deploy the app
again fails because of the open jar file. The administrator must shut down and restart the app
server to clear the open jar and permit the later deployment to succeed.
-
+
Deployment has worked around this problem, and this test makes sure the workaround continues to work.
-->
<target name="runOpenJarWorkaroundTest" depends="init">
@@ -180,7 +180,7 @@
</antcall>
<!--
- Run the test program that deploys, undeploys, and deploys again.
+ Run the test program that deploys, undeploys, and deploys again.
-->
<javaWithResult
fork="true"
@@ -216,7 +216,7 @@
</antcall>
</target>
-
+
<target name="private-all">
<antcall target="run"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml
index e258316..89dcbe8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml
@@ -17,28 +17,28 @@
-->
<project name="Coffee Break, common" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
+ <target name="init">
+ <tstamp/>
+ </target>
<property name="build" value="build" />
<property name="src" value="src" />
-
- <target name="prepare" depends="init"
- description="Create build directories.">
- <mkdir dir="${build}" />
- </target>
-
- <!-- Executable Targets -->
-
- <target name="compile" depends="prepare"
- description="Compile .java files." >
- <javac
- srcdir="${src}"
- destdir="${build}"
- includes="**/*.java"
+
+ <target name="prepare" depends="init"
+ description="Create build directories.">
+ <mkdir dir="${build}" />
+ </target>
+
+ <!-- Executable Targets -->
+
+ <target name="compile" depends="prepare"
+ description="Compile .java files." >
+ <javac
+ srcdir="${src}"
+ destdir="${build}"
+ includes="**/*.java"
/>
- </target>
+ </target>
<target name="build" depends="compile"
description="Compiles source.">
@@ -49,5 +49,5 @@
<delete dir="${build}" />
</target>
-</project>
-
+</project>
+
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java
index be305e7..f0587dd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/AddressBean.java
@@ -27,8 +27,8 @@
public AddressBean() { }
- public AddressBean(String street, String city,
- String state, String zip) {
+ public AddressBean(String street, String city,
+ String state, String zip) {
this.street = street;
this.city = city;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java
index a9feb57..f042d52 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/CustomerBean.java
@@ -27,8 +27,8 @@
public CustomerBean() { }
- public CustomerBean(String firstName, String lastName,
- String phoneNumber, String emailAddress) {
+ public CustomerBean(String firstName, String lastName,
+ String phoneNumber, String emailAddress) {
this.firstName = firstName;
this.lastName = lastName;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java
index d0a1b20..eaf40b4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/DateHelper.java
@@ -205,7 +205,7 @@
public static Date calendarToDate(Calendar cal) {
- return cal.getTime();
+ return cal.getTime();
} // calendarToDate
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java
index 62d9d8c..de381cf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/src/com/sun/cb/URLHelper.java
@@ -16,7 +16,7 @@
package com.sun.cb;
import java.util.ResourceBundle;
-
+
public final class URLHelper {
public static final String getSaajURL() {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties
index 8cf2445..8599a87 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
# This file is referenced by the build.xml file.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml
index 95048a0..62a236c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml
@@ -42,10 +42,10 @@
<include name="*.jar"/>
</fileset>
</path>
-
+
<!-- ========================== PREPARE ============================= -->
- <target name="prepare"
+ <target name="prepare"
description="Creates the build and dist directories" >
<echo message="Creating the required directories...." />
<mkdir dir="${build}/client" />
@@ -53,14 +53,14 @@
<mkdir dir="${build}/registry" />
<mkdir dir="${dist}" />
</target>
-
+
<target name="init">
<tstamp/>
</target>
<!-- ========================== WSCOMPILE ============================= -->
-
+
<target name="set-wscompile" >
<condition property="wscompile" value="${wscompile.dir}/wscompile.bat">
<os family="windows"/>
@@ -100,8 +100,8 @@
<target name="compile-common" depends="prepare"
description="Compiles the common beans">
<echo message="Compiling the common bean source code...."/>
- <ant antfile="../common/build.xml"
- dir="../common"
+ <ant antfile="../common/build.xml"
+ dir="../common"
target="build">
</ant>
</target>
@@ -121,8 +121,8 @@
</fileset>
</copy>
</target>
-
- <target name="compile-registry" depends="prepare"
+
+ <target name="compile-registry" depends="prepare"
description="Compiles the registry source code" >
<echo message="Compiling the registry source code...."/>
<javac srcdir="${registry.src}" destdir="${build}/registry">
@@ -137,11 +137,11 @@
<classpath refid="compile.classpath" />
<classpath path="${common}" />
</javac>
- <copy file="../common/src/${package.path}/CoffeeBreak.properties"
+ <copy file="../common/src/${package.path}/CoffeeBreak.properties"
todir="${build}/registry/${package.path}" />
</target>
-
- <target name="compile-client" depends="prepare"
+
+ <target name="compile-client" depends="prepare"
description="Compiles the client-side source code" >
<echo message="Compiling the client source code...."/>
<javac srcdir="${client.src}" destdir="${build}/client">
@@ -149,12 +149,12 @@
<classpath refid="compile.classpath"/>
</javac>
</target>
-
+
<!-- ========================== COPY & REMOVE ===================== -->
<target name="copy-common-service"
description="Copies common class files to build/service
- because multiple classpaths for a wscompile command run
+ because multiple classpaths for a wscompile command run
within ant do not work.">
<echo message="Copying common classes...."/>
<copy todir="${build}/server/${package.path}">
@@ -166,11 +166,11 @@
description="Copies common class files to build/client
but doesn't copy beans because they are created w. generate-stubs.">
<echo message="Copying common classes...."/>
- <copy file="../common/build/${package.path}/DateHelper.class"
+ <copy file="../common/build/${package.path}/DateHelper.class"
todir="${build}/client/${package.path}"/>
- </target>
-
-
+ </target>
+
+
<!-- ========================== PACKAGE ============================= -->
@@ -183,7 +183,7 @@
</jar>
</target>
- <target name="package-registry"
+ <target name="package-registry"
description="Builds the JAR file that contains the registry routines">
<echo message="Building the registry JAR file...."/>
<copy file="${registry.src}/CoffeeRegistry.properties" todir="${build}/registry/${package.path}" />
@@ -193,39 +193,39 @@
</jar>
</target>
-
+
<!-- ========================== RUN ============================= -->
- <target name="run-test-order"
+ <target name="run-test-order"
description="Runs TestOrderCaller">
<antcall target="run-test-client">
<param name="client.class" value="com.sun.cb.TestOrderCaller"/>
</antcall>
</target>
- <target name="run-test-price"
+ <target name="run-test-price"
description="Runs TestPriceFetcher">
<antcall target="run-test-client">
<param name="client.class" value="com.sun.cb.TestPriceFetcher"/>
</antcall>
</target>
- <target name="run-test-client"
+ <target name="run-test-client"
description="Runs a test JAX-RPC client.">
- <java
- fork="on"
- classpath="dist/${client.jar}"
+ <java
+ fork="on"
+ classpath="dist/${client.jar}"
classname="${client.class}" >
<arg value="${endpoint-address}" />
- <classpath refid="run.classpath" />
+ <classpath refid="run.classpath" />
</java>
</target>
- <target name="run-registry-publish"
+ <target name="run-registry-publish"
description="Publishes an organization in the registry server. Note: You must start the registry server before executing this task." >
<echo message="Running OrgPublisher." />
<echo message="Note: Remember to start the registry server before running this program." />
- <java classname="com.sun.cb.OrgPublisher"
+ <java classname="com.sun.cb.OrgPublisher"
fork="yes"
classpath="dist/${registry.jar}" >
<classpath refid="run.classpath" />
@@ -233,11 +233,11 @@
</java>
</target>
- <target name="run-registry-remove"
+ <target name="run-registry-remove"
description="Removes an organization from the registry. Note: You must start the registry server before executing this task." >
<echo message="Running OrgRemover." />
<echo message="Note: Remember to start the registry server before running this program." />
- <java classname="com.sun.cb.OrgRemover"
+ <java classname="com.sun.cb.OrgRemover"
fork="yes"
classpath="dist/${registry.jar}:${foo}" >
<classpath refid="run.classpath" />
@@ -246,29 +246,29 @@
</target>
<!-- ========================== BUILD ============================= -->
-
-
-
- <target name="build-service"
+
+
+
+ <target name="build-service"
depends="compile-service,copy-common-service,generate-wsdl"
description="Executes the targets needed to build the service.">
</target>
-
- <target name="build-client"
+
+ <target name="build-client"
depends="generate-stubs,copy-common-client,compile-client,package-client"
description="Executes the targets needed to build the client files.">
</target>
-
- <target name="build-registry"
+
+ <target name="build-registry"
depends="compile-registry,package-registry"
description="Executes the targets needed to build the registry JAR.">
</target>
-
+
<!-- ========================== UTIL ============================= -->
- <target name="clean"
+ <target name="clean"
description="Removes the build and dist directory">
<delete dir="${build}" />
<delete dir="dist" />
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml
index d13779b..78926fc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
<wsdl location="http://localhost:8080/jaxrpc-coffee-supplier/jaxrpc?WSDL"
packageName="com.sun.cb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml
index 311fdc6..7842794 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
<wsdl location="build/Supplier.wsdl"
packageName="com.sun.cb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml
index 6c045c8..3c3d693 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml
@@ -19,10 +19,10 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="Supplier"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
+ <service
+ name="Supplier"
+ targetNamespace="urn:Foo"
+ typeNamespace="urn:Foo"
packageName="com.sun.cb">
<interface name="com.sun.cb.SupplierIF"/>
<typeMappingRegistry>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml
index 6c045c8..3c3d693 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml
@@ -19,10 +19,10 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="Supplier"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
+ <service
+ name="Supplier"
+ targetNamespace="urn:Foo"
+ typeNamespace="urn:Foo"
packageName="com.sun.cb">
<interface name="com.sun.cb.SupplierIF"/>
<typeMappingRegistry>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml
index d13779b..78926fc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
<wsdl location="http://localhost:8080/jaxrpc-coffee-supplier/jaxrpc?WSDL"
packageName="com.sun.cb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java
index 319a7fc..a8b0772 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/OrderCaller.java
@@ -24,7 +24,7 @@
public OrderCaller(String endpoint) {
try {
- Stub stub = (Stub)(new Supplier_Impl().getSupplierIFPort());
+ Stub stub = (Stub)(new Supplier_Impl().getSupplierIFPort());
//stub = (SupplierIF_Stub)(new Supplier_Impl().getSupplierIFPort());
stub._setProperty(
javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY,
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java
index b967ede..7fc7113 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/PriceFetcher.java
@@ -21,7 +21,7 @@
public static final PriceListBean getPriceList(String endpoint) {
PriceListBean result = null;
-
+
try {
SupplierIF_Stub stub =
(SupplierIF_Stub)(new Supplier_Impl().getSupplierIFPort());
@@ -32,9 +32,9 @@
} catch (Exception ex) {
ex.printStackTrace();
}
-
+
return result;
- } // getPriceList
+ } // getPriceList
} // class
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java
index eeff3be..f565d08 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestOrderCaller.java
@@ -33,7 +33,7 @@
LineItemBean itemC = new LineItemBean("wakeup call", new BigDecimal("0.5"), new BigDecimal("10.00"));
LineItemBean[] lineItems = {itemA, itemB, itemC};
- OrderBean order = new OrderBean(address, customer, "123", lineItems,
+ OrderBean order = new OrderBean(address, customer, "123", lineItems,
new BigDecimal("55.67"));
OrderCaller oc = new OrderCaller(args[0]);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java
index 01ed2ab..d523f54 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/client/com/sun/cb/TestPriceFetcher.java
@@ -40,5 +40,5 @@
} catch (Exception ex) {
ex.printStackTrace();
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java
index 0de39b6..b39cc9a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRPublisher.java
@@ -39,8 +39,8 @@
/**
* Establishes a connection to a registry.
*
- * @param queryUrl the URL of the query registry
- * @param publishUrl the URL of the publish registry
+ * @param queryUrl the URL of the query registry
+ * @param publishUrl the URL of the publish registry
*/
public void makeConnection(String queryUrl,
String publishUrl) {
@@ -63,7 +63,7 @@
// Create the connection, passing it the
// configuration properties
context = new InitialContext();
- factory = (ConnectionFactory)
+ factory = (ConnectionFactory)
context.lookup("java:comp/env/eis/JAXR");
factory.setProperties(props);
connection = factory.createConnection();
@@ -171,7 +171,7 @@
is = blcm.createInternationalString
(bundle.getString("service.binding"));
binding.setDescription(is);
- binding.setValidateURI(false);
+ binding.setValidateURI(false);
binding.setAccessURI(endpoint);
serviceBindings.add(binding);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java
index f14184d..940e013 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/JAXRRemover.java
@@ -16,8 +16,8 @@
package com.sun.cb;
-import javax.xml.registry.*;
-import javax.xml.registry.infomodel.*;
+import javax.xml.registry.*;
+import javax.xml.registry.infomodel.*;
import java.net.*;
import java.security.*;
import java.util.*;
@@ -25,8 +25,8 @@
/**
* The JAXRRemover class consists of a makeConnection method,
- * a createOrgKey method, and an executeRemove method. It
- * finds and deletes the organization that the OrgPublisher
+ * a createOrgKey method, and an executeRemove method. It
+ * finds and deletes the organization that the OrgPublisher
* class created.
*/
public class JAXRRemover {
@@ -35,34 +35,34 @@
RegistryService rs = null;
public JAXRRemover() {}
-
+
/**
* Establishes a connection to a registry.
*
- * @param queryUrl the URL of the query registry
- * @param publishUrl the URL of the publish registry
+ * @param queryUrl the URL of the query registry
+ * @param publishUrl the URL of the publish registry
*/
- public void makeConnection(String queryUrl,
+ public void makeConnection(String queryUrl,
String publishUrl) {
Context context = null;
ConnectionFactory factory = null;
/*
- * Define connection configuration properties.
- * To delete, you need both the query URL and the
+ * Define connection configuration properties.
+ * To delete, you need both the query URL and the
* publish URL.
*/
Properties props = new Properties();
props.setProperty("javax.xml.registry.queryManagerURL",
queryUrl);
- props.setProperty("javax.xml.registry.lifeCycleManagerURL",
+ props.setProperty("javax.xml.registry.lifeCycleManagerURL",
publishUrl);
try {
- // Create the connection, passing it the
+ // Create the connection, passing it the
// configuration properties
context = new InitialContext();
- factory = (ConnectionFactory)
+ factory = (ConnectionFactory)
context.lookup("java:comp/env/eis/JAXR");
factory.setProperties(props);
connection = factory.createConnection();
@@ -82,9 +82,9 @@
* program, verifying it by checking that the key strings
* match.
*
- * @param keyStr the key of the published organization
+ * @param keyStr the key of the published organization
*
- * @return the key of the organization found
+ * @return the key of the organization found
*/
public javax.xml.registry.infomodel.Key createOrgKey(String keyStr) {
@@ -96,7 +96,7 @@
blcm = rs.getBusinessLifeCycleManager();
System.out.println("Got registry service and " +
"life cycle manager");
-
+
orgKey = blcm.createKey(keyStr);
} catch (Exception e) {
e.printStackTrace();
@@ -114,19 +114,19 @@
/**
* Removes the organization with the specified key value.
*
- * @param key the Key of the organization
+ * @param key the Key of the organization
*/
public void executeRemove(javax.xml.registry.infomodel.Key key,
String username, String password) {
BusinessLifeCycleManager blcm = null;
-
+
try {
blcm = rs.getBusinessLifeCycleManager();
// Get authorization from the registry
PasswordAuthentication passwdAuth =
- new PasswordAuthentication(username,
+ new PasswordAuthentication(username,
password.toCharArray());
Set creds = new HashSet();
@@ -155,7 +155,7 @@
Exception exception = null;
while (excIter.hasNext()) {
exception = (Exception) excIter.next();
- System.err.println("Exception on delete: " +
+ System.err.println("Exception on delete: " +
exception.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java
index f4e49b0..1024fd1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgPublisher.java
@@ -16,7 +16,7 @@
package com.sun.cb;
-import javax.xml.registry.*;
+import javax.xml.registry.*;
import java.util.ResourceBundle;
import java.io.*;
@@ -31,15 +31,15 @@
ResourceBundle registryBundle =
ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry");
- String username =
+ String username =
registryBundle.getString("registry.username");
- String password =
+ String password =
registryBundle.getString("registry.password");
String keyFile = registryBundle.getString("key.file");
JAXRPublisher publisher = new JAXRPublisher();
publisher.makeConnection(queryURL, publishURL);
- String key = publisher.executePublish(username,
+ String key = publisher.executePublish(username,
password, endpoint);
try {
FileWriter out = new FileWriter(keyFile);
@@ -50,5 +50,5 @@
System.out.println(ex.getMessage());
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java
index 0e0664f..fbd8771 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/registry/com/sun/cb/OrgRemover.java
@@ -17,7 +17,7 @@
package com.sun.cb;
import java.util.ResourceBundle;
-import javax.xml.registry.*;
+import javax.xml.registry.*;
import javax.xml.registry.infomodel.Key;
import java.io.*;
@@ -35,9 +35,9 @@
ResourceBundle registryBundle =
ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry");
- String username =
+ String username =
registryBundle.getString("registry.username");
- String password =
+ String password =
registryBundle.getString("registry.password");
String keyFile = registryBundle.getString("key.file");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java
index 371ee43..6bfcbe9 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/ContextListener.java
@@ -17,7 +17,7 @@
package com.sun.cb;
import jakarta.servlet.*;
-import javax.xml.registry.*;
+import javax.xml.registry.*;
import java.util.ResourceBundle;
import java.io.*;
@@ -32,15 +32,15 @@
ResourceBundle registryBundle =
ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry");
- String username =
+ String username =
registryBundle.getString("registry.username");
- String password =
+ String password =
registryBundle.getString("registry.password");
String keyFile = registryBundle.getString("key.file");
JAXRPublisher publisher = new JAXRPublisher();
publisher.makeConnection(queryURL, publishURL);
- String key = publisher.executePublish(username,
+ String key = publisher.executePublish(username,
password, endpoint);
try {
FileWriter out = new FileWriter(keyFile);
@@ -49,9 +49,9 @@
out.close();
} catch (IOException ex) {
System.out.println(ex.getMessage());
- }
+ }
}
-
+
public void contextDestroyed(ServletContextEvent event) {
String keyStr = null;
@@ -61,9 +61,9 @@
ResourceBundle registryBundle =
ResourceBundle.getBundle("com.sun.cb.CoffeeRegistry");
- String username =
+ String username =
registryBundle.getString("registry.username");
- String password =
+ String password =
registryBundle.getString("registry.password");
String keyFile = registryBundle.getString("key.file");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java
index 275939a..252cbed 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/PriceLoader.java
@@ -24,9 +24,9 @@
public static final PriceItemBean[] loadItems(String propsName) {
- ResourceBundle priceBundle =
+ ResourceBundle priceBundle =
ResourceBundle.getBundle(propsName);
-
+
Enumeration bundleKeys = priceBundle.getKeys();
ArrayList keyList = new ArrayList();
@@ -34,14 +34,14 @@
String key = (String)bundleKeys.nextElement();
String value = priceBundle.getString(key);
keyList.add(value);
- }
+ }
- PriceItemBean[] items =
+ PriceItemBean[] items =
(PriceItemBean[])Array.newInstance(PriceItemBean.class, keyList.size());
int k = 0;
for (Iterator it=keyList.iterator(); it.hasNext(); ) {
String s = (String)it.next();
- int commaIndex = s.indexOf(",");
+ int commaIndex = s.indexOf(",");
String name = s.substring(0, commaIndex).trim();
String price = s.substring(commaIndex + 1, s.length()).trim();
items[k] = new PriceItemBean(name, new BigDecimal(price));
@@ -49,5 +49,5 @@
}
return items;
- }
-}
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java
index f9b163a..ac265b5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierImpl.java
@@ -25,7 +25,7 @@
Date tomorrow = com.sun.cb.DateHelper.addDays(new Date(), 1);
ConfirmationBean confirmation =
- new ConfirmationBean(order.getId(),
+ new ConfirmationBean(order.getId(),
DateHelper.dateToCalendar(tomorrow));
return confirmation;
}
@@ -43,7 +43,7 @@
Date endDate = DateHelper.addDays(today, 30);
PriceItemBean[] priceItems = PriceLoader.loadItems(propsName);
- PriceListBean priceList =
+ PriceListBean priceList =
new PriceListBean(DateHelper.dateToCalendar(today),
DateHelper.dateToCalendar(endDate), priceItems);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties
index 284ce10..f0d4543 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/src/server/com/sun/cb/SupplierPrices.properties
@@ -17,5 +17,5 @@
c1=Mocca, 4.00
c2=Wake Up Call, 5.50
-c3=French Roast, 5.00
+c3=French Roast, 5.00\u0020
c4=Kona, 6.50
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties
index 2641276..e7025be 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
# This file contains properties common to the tutorial examples for SAAJ.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml
index 5edbdb2..e91daa8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml
@@ -21,15 +21,15 @@
]>
<project name="SAAJ Tutorial, Coffee Break" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
+ <target name="init">
+ <tstamp/>
+ </target>
<property file="../../common/build.properties"/>
<property file="build.properties"/>
&targets;
-
+
<path id="run.classpath">
<fileset dir="${j2ee.home}/lib">
<include name="*.jar"/>
@@ -39,7 +39,7 @@
</fileset>
</path>
- <target name="prepare"
+ <target name="prepare"
description="Creates the build and dist directories" >
<echo message="Creating the required directories...." />
<mkdir dir="${build}/client" />
@@ -77,11 +77,11 @@
<classpath refid="classpath" />
<classpath path="${common}" />
</javac>
- <copy file="../common/src/com/sun/cb/CoffeeBreak.properties"
+ <copy file="../common/src/com/sun/cb/CoffeeBreak.properties"
todir="${build}/client/com/sun/cb" />
</target>
- <target name="package-client" depends="compile-client"
+ <target name="package-client" depends="compile-client"
description="Builds the JAR file that contains the SAAJ client routines">
<echo message="Building the ${client-jar} file...."/>
<delete file="dist/${client-jar}" />
@@ -92,24 +92,24 @@
</jar>
</target>
- <target name="run-test-order">
+ <target name="run-test-order">
<antcall target="run-test-client">
<param name="client-class" value="com.sun.cb.TestOrderRequest"/>
</antcall>
</target>
- <target name="run-test-price">
+ <target name="run-test-price">
<antcall target="run-test-client">
<param name="client-class" value="com.sun.cb.TestPriceListRequest"/>
</antcall>
</target>
- <target name="run-test-client"
+ <target name="run-test-client"
description="Runs a test client">
<echo message="Running the ${client-class} program:" />
<echo message=" " />
- <java
- fork="on"
+ <java
+ fork="on"
classname="${client-class}">
<classpath refid="run.classpath" />
<classpath path="${build}/client" />
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml
index 123d48b..4e23136 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml
@@ -23,7 +23,7 @@
<coffee-order>
<orderID>
- "1234"
+ "1234"
</orderID>
<customer>
@@ -71,5 +71,5 @@
<total>
"10.95"
</total>
-
+
</coffee-order>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml
index 6c7406e..0d08ca8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml
@@ -22,10 +22,10 @@
<confirmation>
<orderID>
- "1234"
- </orderID>
+ "1234"
+ </orderID>
<ship-date>
- "01-01-2001"
- </ship-date>
+ "01-01-2001"
+ </ship-date>
</confirmation>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml
index ed67db2..f090a1e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml
@@ -22,23 +22,23 @@
<price-list
<coffee>
- <coffee-name> Arabica </coffee-name>
- <price> 4.50 </price>
+ <coffee-name> Arabica </coffee-name>
+ <price> 4.50 </price>
</coffee>
<coffee>
- <coffee-name> HouseBlend </coffee-name>
- <price> 5.00 </price>
+ <coffee-name> HouseBlend </coffee-name>
+ <price> 5.00 </price>
</coffee>
<coffee>
- <coffee-name> Espresso </coffee-name>
- <price> 5.00 </price>
+ <coffee-name> Espresso </coffee-name>
+ <price> 5.00 </price>
</coffee>
<coffee>
- <coffee-name> Dorada </coffee-name>
- <price> 6.00 </price>
+ <coffee-name> Dorada </coffee-name>
+ <price> 6.00 </price>
</coffee>
</price-list>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml
index bcd33f2..24434dd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml
@@ -22,6 +22,6 @@
<request-prices>
<request>
- "Send current price list."
- </request>
+ "Send current price list."
+ </request>
</request-prices>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java
index 77fc500..6c66272 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/ConfirmationServlet.java
@@ -27,7 +27,7 @@
public class ConfirmationServlet extends HttpServlet {
static MessageFactory fac = null;
-
+
static {
try {
fac = MessageFactory.newInstance();
@@ -36,12 +36,12 @@
}
}
- public void init(ServletConfig servletConfig)
+ public void init(ServletConfig servletConfig)
throws ServletException {
super.init(servletConfig);
}
-
- public void doPost( HttpServletRequest req,
+
+ public void doPost( HttpServletRequest req,
HttpServletResponse resp)
throws ServletException, IOException {
try {
@@ -54,25 +54,25 @@
// Now internalize the contents of a HTTP request
// and create a SOAPMessage
SOAPMessage msg = fac.createMessage(headers, is);
-
+
SOAPMessage reply = null;
reply = onMessage(msg);
if (reply != null) {
-
- /*
- * Need to call saveChanges because we're
- * going to use the MimeHeaders to set HTTP
+
+ /*
+ * Need to call saveChanges because we're
+ * going to use the MimeHeaders to set HTTP
* response information. These MimeHeaders
* are generated as part of the save.
*/
if (reply.saveRequired()) {
- reply.saveChanges();
+ reply.saveChanges();
}
resp.setStatus(HttpServletResponse.SC_OK);
putHeaders(reply.getMimeHeaders(), resp);
-
+
// Write out the message on the response stream
OutputStream os = resp.getOutputStream();
reply.writeTo(os);
@@ -82,7 +82,7 @@
HttpServletResponse.SC_NO_CONTENT);
}
} catch (Exception ex) {
- throw new ServletException("SAAJ POST failed: " +
+ throw new ServletException("SAAJ POST failed: " +
ex.getMessage());
}
}
@@ -99,14 +99,14 @@
StringTokenizer values =
new StringTokenizer(headerValue, ",");
while (values.hasMoreTokens()) {
- headers.addHeader(headerName,
+ headers.addHeader(headerName,
values.nextToken().trim());
}
}
return headers;
}
- static void putHeaders(MimeHeaders headers,
+ static void putHeaders(MimeHeaders headers,
HttpServletResponse res) {
Iterator it = headers.getAllHeaders();
@@ -115,7 +115,7 @@
String[] values = headers.getHeader(header.getName());
if (values.length == 1) {
- res.setHeader(header.getName(),
+ res.setHeader(header.getName(),
header.getValue());
} else {
StringBuffer concat = new StringBuffer();
@@ -139,10 +139,10 @@
try {
// Retrieve orderID from message received
- SOAPBody sentSB =
+ SOAPBody sentSB =
message.getSOAPPart().getEnvelope().getBody();
Iterator sentIt = sentSB.getChildElements();
- SOAPBodyElement sentSBE =
+ SOAPBodyElement sentSBE =
(SOAPBodyElement)sentIt.next();
Iterator sentIt2 = sentSBE.getChildElements();
SOAPElement sentSE = (SOAPElement)sentIt2.next();
@@ -156,9 +156,9 @@
SOAPEnvelope env = sp.getEnvelope();
SOAPBody sb = env.getBody();
- Name newBodyName = env.createName("confirmation",
+ Name newBodyName = env.createName("confirmation",
"Confirm", "http://sonata.coffeebreak.com");
- SOAPBodyElement confirm =
+ SOAPBodyElement confirm =
sb.addBodyElement(newBodyName);
// Create the orderID element for confirmation
@@ -169,7 +169,7 @@
// Create ship-date element
Name shipDateName = env.createName("ship-date");
- SOAPElement shipDate =
+ SOAPElement shipDate =
confirm.addChildElement(shipDateName);
// Create the shipping date
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java
index c611201..66c37d3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/OrderRequest.java
@@ -32,10 +32,10 @@
}
public ConfirmationBean placeOrder(OrderBean orderBean) {
- ConfirmationBean cb = null;
+ ConfirmationBean cb = null;
try {
- SOAPConnectionFactory scf =
+ SOAPConnectionFactory scf =
SOAPConnectionFactory.newInstance();
SOAPConnection con = scf.createConnection();
@@ -75,7 +75,7 @@
orderBean.getCustomer().getPhoneNumber());
childName = envelope.createName("email-address");
- SOAPElement emailAddress =
+ SOAPElement emailAddress =
customer.addChildElement(childName);
emailAddress.addTextNode(
orderBean.getCustomer().getEmailAddress());
@@ -99,8 +99,8 @@
childName = envelope.createName("zip");
SOAPElement zip = address.addChildElement(childName);
zip.addTextNode(orderBean.getAddress().getZip());
-
- LineItemBean[] lineItems=orderBean.getLineItems();
+
+ LineItemBean[] lineItems=orderBean.getLineItems();
for (int i=0;i < lineItems.length;i++) {
LineItemBean lib = lineItems[i];
@@ -108,7 +108,7 @@
SOAPElement lineItem = order.addChildElement(childName);
childName = envelope.createName("coffeeName");
- SOAPElement coffeeName =
+ SOAPElement coffeeName =
lineItem.addChildElement(childName);
coffeeName.addTextNode(lib.getCoffeeName());
@@ -123,10 +123,10 @@
// total
childName = envelope.createName("total");
- SOAPElement total =
+ SOAPElement total =
order.addChildElement(childName);
- total.addTextNode(orderBean.getTotal().toString());
-
+ total.addTextNode(orderBean.getTotal().toString());
+
URL endpoint = new URL(url);
SOAPMessage reply = con.call(msg, endpoint);
con.close();
@@ -145,7 +145,7 @@
// Get ship date
SOAPElement sDate = (SOAPElement)bodyIt2.next();
String shippingDate = sDate.getValue();
- SimpleDateFormat df =
+ SimpleDateFormat df =
new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy");
Date date = df.parse(shippingDate);
Calendar cal = new GregorianCalendar();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java
index a3c3344..2949b12 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListRequest.java
@@ -24,7 +24,7 @@
public class PriceListRequest {
String url;
-
+
public PriceListRequest(String url){
this.url = url;
}
@@ -32,7 +32,7 @@
public PriceListBean getPriceList() {
PriceListBean plb = null;
try {
- SOAPConnectionFactory scf =
+ SOAPConnectionFactory scf =
SOAPConnectionFactory.newInstance();
SOAPConnection con = scf.createConnection();
@@ -44,14 +44,14 @@
SOAPEnvelope envelope = part.getEnvelope();
SOAPBody body = envelope.getBody();
- // Create SOAPBodyElement request
+ // Create SOAPBodyElement request
Name bodyName = envelope.createName("request-prices",
"RequestPrices", "http://sonata.coffeebreak.com");
SOAPBodyElement requestPrices =
body.addBodyElement(bodyName);
-
+
Name requestName = envelope.createName("request");
- SOAPElement request =
+ SOAPElement request =
requestPrices.addChildElement(requestName);
request.addTextNode("Send updated price list.");
@@ -66,9 +66,9 @@
Vector list = new Vector();
- SOAPBody responseBody =
+ SOAPBody responseBody =
response.getSOAPPart().getEnvelope().getBody();
- Iterator it1 = responseBody.getChildElements();
+ Iterator it1 = responseBody.getChildElements();
// Get price-list element
while (it1.hasNext()) {
@@ -90,7 +90,7 @@
ArrayList items = new ArrayList();
for (int i = 0; i < list.size(); i = i + 2) {
items.add(
- new PriceItemBean(list.elementAt(i).toString(),
+ new PriceItemBean(list.elementAt(i).toString(),
new BigDecimal(list.elementAt(i + 1).toString())));
System.out.print(list.elementAt(i) + " ");
System.out.println(list.elementAt(i + 1));
@@ -98,9 +98,9 @@
PriceItemBean[] priceItems = new PriceItemBean[items.size()];
int i=0;
- for (Iterator it=items.iterator(); it.hasNext(); ) {
+ for (Iterator it=items.iterator(); it.hasNext(); ) {
priceItems[i] = (PriceItemBean)it.next();
- i++;
+ i++;
}
Date today = new Date();
Date endDate = DateHelper.addDays(today, 30);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java
index eb70e37..adc2842 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/PriceListServlet.java
@@ -27,7 +27,7 @@
public class PriceListServlet extends HttpServlet {
static MessageFactory fac = null;
-
+
static {
try {
fac = MessageFactory.newInstance();
@@ -36,12 +36,12 @@
}
};
- public void init(ServletConfig servletConfig)
+ public void init(ServletConfig servletConfig)
throws ServletException {
super.init(servletConfig);
}
-
- public void doPost(HttpServletRequest req,
+
+ public void doPost(HttpServletRequest req,
HttpServletResponse resp)
throws ServletException, IOException {
try {
@@ -54,35 +54,35 @@
// Now internalize the contents of the HTTP request
// and create a SOAPMessage
SOAPMessage msg = fac.createMessage(headers, is);
-
+
SOAPMessage reply = null;
reply = onMessage(msg);
if (reply != null) {
-
- /*
- * Need to call saveChanges because we're
- * going to use the MimeHeaders to set HTTP
+
+ /*
+ * Need to call saveChanges because we're
+ * going to use the MimeHeaders to set HTTP
* response information. These MimeHeaders
* are generated as part of the save.
*/
if (reply.saveRequired()) {
- reply.saveChanges();
+ reply.saveChanges();
}
resp.setStatus(HttpServletResponse.SC_OK);
- putHeaders(reply.getMimeHeaders(), resp);
+ putHeaders(reply.getMimeHeaders(), resp);
// Write out the message on the response stream
OutputStream os = resp.getOutputStream();
reply.writeTo(os);
- os.flush();
+ os.flush();
} else {
resp.setStatus(
HttpServletResponse.SC_NO_CONTENT);
}
} catch (Exception ex) {
- throw new ServletException("SAAJ POST failed: " +
+ throw new ServletException("SAAJ POST failed: " +
ex.getMessage());
}
}
@@ -96,17 +96,17 @@
String headerName = (String)enum.nextElement();
String headerValue = req.getHeader(headerName);
- StringTokenizer values =
+ StringTokenizer values =
new StringTokenizer(headerValue, ",");
while (values.hasMoreTokens()) {
- headers.addHeader(headerName,
+ headers.addHeader(headerName,
values.nextToken().trim());
}
}
return headers;
}
- static void putHeaders(MimeHeaders headers,
+ static void putHeaders(MimeHeaders headers,
HttpServletResponse res) {
Iterator it = headers.getAllHeaders();
@@ -115,7 +115,7 @@
String[] values = headers.getHeader(header.getName());
if (values.length == 1) {
- res.setHeader(header.getName(),
+ res.setHeader(header.getName(),
header.getValue());
} else {
StringBuffer concat = new StringBuffer();
@@ -155,43 +155,43 @@
SOAPElement coffee = list.addChildElement(coffeeN);
Name coffeeNm1 = envelope.createName("coffee-name");
- SOAPElement coffeeName =
+ SOAPElement coffeeName =
coffee.addChildElement(coffeeNm1);
coffeeName.addTextNode("Arabica");
Name priceName1 = envelope.createName("price");
- SOAPElement price1 =
- coffee.addChildElement(priceName1);
+ SOAPElement price1 =
+ coffee.addChildElement(priceName1);
price1.addTextNode("4.50");
Name coffeeNm2 = envelope.createName("coffee-name");
- SOAPElement coffeeName2 =
+ SOAPElement coffeeName2 =
coffee.addChildElement(coffeeNm2);
coffeeName2.addTextNode("Espresso");
Name priceName2 = envelope.createName("price");
- SOAPElement price2 =
- coffee.addChildElement(priceName2);
+ SOAPElement price2 =
+ coffee.addChildElement(priceName2);
price2.addTextNode("5.00");
Name coffeeNm3 = envelope.createName("coffee-name");
- SOAPElement coffeeName3 =
+ SOAPElement coffeeName3 =
coffee.addChildElement(coffeeNm3);
coffeeName3.addTextNode("Dorada");
Name priceName3 = envelope.createName("price");
- SOAPElement price3 =
- coffee.addChildElement(priceName3);
+ SOAPElement price3 =
+ coffee.addChildElement(priceName3);
price3.addTextNode("6.00");
Name coffeeNm4 = envelope.createName("coffee-name");
- SOAPElement coffeeName4 =
+ SOAPElement coffeeName4 =
coffee.addChildElement(coffeeNm4);
coffeeName4.addTextNode("House Blend");
Name priceName4 = envelope.createName("price");
- SOAPElement price4 =
- coffee.addChildElement(priceName4);
+ SOAPElement price4 =
+ coffee.addChildElement(priceName4);
price4.addTextNode("5.00");
message.saveChanges();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java
index a087bf9..760be0e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestOrderRequest.java
@@ -23,13 +23,13 @@
import jakarta.xml.soap.*;
public class TestOrderRequest {
- public static void main(String [] args) {
+ public static void main(String [] args) {
try {
SOAPConnectionFactory scf = SOAPConnectionFactory.newInstance();
SOAPConnection con = scf.createConnection();
MessageFactory mf = MessageFactory.newInstance();
-
+
SOAPMessage msg = mf.createMessage();
// Access the SOABBody object
@@ -66,7 +66,7 @@
phoneNumber.addTextNode("908 983-6789");
childName = envelope.createName("email-address");
- SOAPElement emailAddress =
+ SOAPElement emailAddress =
customer.addChildElement(childName);
emailAddress.addTextNode("ragnip@aol.com");
@@ -89,7 +89,7 @@
childName = envelope.createName("zip");
SOAPElement zip = address.addChildElement(childName);
zip.addTextNode("99999");
-
+
// line-item 1
childName = envelope.createName("line-item");
SOAPElement lineItem = order.addChildElement(childName);
@@ -123,7 +123,7 @@
childName = envelope.createName("total");
SOAPElement total = order.addChildElement(childName);
total.addTextNode("21.90");
-
+
URL endpoint = new URL(
URLHelper.getSaajURL() + "/orderCoffee");
SOAPMessage reply = con.call(msg, endpoint);
@@ -148,7 +148,7 @@
System.out.println("");
System.out.println("Confirmation for order #" + id);
System.out.print("Your order will be shipped on ");
- System.out.println(shippingDate);
+ System.out.println(shippingDate);
} catch(Exception e) {
e.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java
index c48f52e..172bae4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/src/com/sun/cb/TestPriceListRequest.java
@@ -26,11 +26,11 @@
public static void main(String [] args) {
try {
- SOAPConnectionFactory scf =
+ SOAPConnectionFactory scf =
SOAPConnectionFactory.newInstance();
SOAPConnection con = scf.createConnection();
- MessageFactory mf = MessageFactory.newInstance();
+ MessageFactory mf = MessageFactory.newInstance();
SOAPMessage msg = mf.createMessage();
// Access the SOABBody object
@@ -38,14 +38,14 @@
SOAPEnvelope envelope = part.getEnvelope();
SOAPBody body = envelope.getBody();
- // create SOAPBodyElement request
+ // create SOAPBodyElement request
Name bodyName = envelope.createName("request-prices",
"RequestPrices", "http://sonata.coffeebreak.com");
SOAPBodyElement requestPrices =
body.addBodyElement(bodyName);
-
+
Name requestName = envelope.createName("request");
- SOAPElement request =
+ SOAPElement request =
requestPrices.addChildElement(requestName);
request.addTextNode("Send updated price list.");
@@ -60,9 +60,9 @@
// get contents of response
Vector list = new Vector();
- SOAPBody responseBody =
+ SOAPBody responseBody =
response.getSOAPPart().getEnvelope().getBody();
- Iterator it1 = responseBody.getChildElements();
+ Iterator it1 = responseBody.getChildElements();
// get price-list element
while (it1.hasNext()) {
SOAPBodyElement bodyEl = (SOAPBodyElement)it1.next();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties
index b833e46..d50416d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
build=build
src=src
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml
index 8eda2f4..3955621 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml
@@ -21,9 +21,9 @@
]>
<project name="Coffee Break Server" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
+ <target name="init">
+ <tstamp/>
+ </target>
<property file="../../common/build.properties"/>
<property file="build.properties"/>
@@ -31,16 +31,16 @@
&targets;
<target name="prepare" depends="init"
- description="Create build directories.">
+ description="Create build directories.">
<mkdir dir="${build}" />
</target>
-
- <target name="build" depends="prepare"
+
+ <target name="build" depends="prepare"
description="Compile CB server Java files and copy DD and static files." >
- <javac
- srcdir="${src}"
+ <javac
+ srcdir="${src}"
destdir="${build}">
- <include name="**/*.java" />
+ <include name="**/*.java" />
<classpath refid="classpath" />
<classpath path="${common}:../jaxrpc/dist/jaxrpc-client.jar:../saaj/dist/saaj-client.jar" />
</javac>
@@ -52,7 +52,7 @@
<classpath refid="classpath" />
<classpath path="${common}" />
</javac>
- <copy file="../common/src/com/sun/cb/CoffeeBreak.properties"
+ <copy file="../common/src/com/sun/cb/CoffeeBreak.properties"
todir="${build}/com/sun/cb" />
<copy todir="${build}">
<fileset dir="web">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java
index 979e3c1..360865c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/CheckoutFormBean.java
@@ -36,7 +36,7 @@
private RetailPriceList rpl;
private OrderConfirmations ocs;
private ResourceBundle messages;
-
+
public boolean validate() {
boolean allOk=true;
@@ -47,7 +47,7 @@
} else {
errors.put("firstName","");
}
-
+
if (lastName.equals("")) {
errors.put("lastName",messages.getString("LastNameError"));
lastName="";
@@ -111,12 +111,12 @@
} else {
try {
int x = Integer.parseInt(zip);
- errors.put("zip","");
+ errors.put("zip","");
} catch (NumberFormatException e) {
errors.put("zip",messages.getString("ZipError"));
zip="";
allOk=false;
- }
+ }
}
if (CCNumber.equals("")) {
@@ -133,31 +133,31 @@
if (allOk) {
String orderId = CCNumber;
-
- AddressBean address =
+
+ AddressBean address =
new AddressBean(street, city, state, zip);
- CustomerBean customer =
- new CustomerBean(firstName, lastName,
+ CustomerBean customer =
+ new CustomerBean(firstName, lastName,
"(" + areaCode+ ") " + phoneNumber, email);
-
- for (Iterator d = rpl.getDistributors().iterator();
+
+ for (Iterator d = rpl.getDistributors().iterator();
d.hasNext(); ) {
String distributor = (String)d.next();
- System.out.println(distributor);
+ System.out.println(distributor);
ArrayList lis = new ArrayList();
BigDecimal price = new BigDecimal("0.00");
BigDecimal total = new BigDecimal("0.00");
- for (Iterator c = cart.getItems().iterator();
+ for (Iterator c = cart.getItems().iterator();
c.hasNext(); ) {
ShoppingCartItem sci = (ShoppingCartItem) c.next();
if ((sci.getItem().getDistributor()).
- equals(distributor) &&
+ equals(distributor) &&
sci.getPounds().floatValue() > 0) {
price = sci.getItem().getWholesalePricePerPound().
- multiply(sci.getPounds());
+ multiply(sci.getPounds());
total = total.add(price);
LineItemBean li = new LineItemBean(
- sci.getItem().getCoffeeName(), sci.getPounds(),
+ sci.getItem().getCoffeeName(), sci.getPounds(),
sci.getItem().getWholesalePricePerPound());
lis.add(li);
}
@@ -169,12 +169,12 @@
lineItems[i] = (LineItemBean)j.next();
i++;
}
-
+
if (lineItems.length != 0) {
- OrderBean order = new OrderBean(address, customer,
+ OrderBean order = new OrderBean(address, customer,
orderId, lineItems, total);
-
- String SAAJOrderURL =
+
+ String SAAJOrderURL =
URLHelper.getSaajURL() + "/orderCoffee";
if (distributor.equals(SAAJOrderURL)) {
OrderRequest or = new OrderRequest(SAAJOrderURL);
@@ -182,17 +182,17 @@
}
else {
OrderCaller ocaller = new OrderCaller(distributor);
- confirmation = ocaller.placeOrder(order);
+ confirmation = ocaller.placeOrder(order);
}
- OrderConfirmation oc =
+ OrderConfirmation oc =
new OrderConfirmation(order, confirmation);
ocs.add(oc);
- }
+ }
}
}
return allOk;
}
-
+
public HashMap getErrors() {
return errors;
}
@@ -220,7 +220,7 @@
this.messages = messages;
ocs = new OrderConfirmations();
}
-
+
public String getFirstName() {
return firstName;
}
@@ -240,38 +240,38 @@
public String getAreaCode() {
return areaCode;
}
-
+
public String getPhoneNumber() {
return phoneNumber;
}
-
+
public String getStreet() {
return street;
}
-
+
public String getCity() {
return city;
}
-
+
public String getState() {
return state;
}
-
-
+
+
public int getCCOption() {
return CCOption;
}
-
-
+
+
public String getCCNumber() {
return CCNumber;
}
-
-
+
+
public OrderConfirmations getOrderConfirmations() {
return ocs;
}
-
+
public void setMessages(ResourceBundle messages) {
this.messages=messages;
}
@@ -298,27 +298,27 @@
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber=phoneNumber ;
}
-
+
public void setStreet(String street) {
this.street=street ;
}
-
+
public void setCity(String city) {
this.city=city ;
}
-
+
public void setState(String state) {
this.state=state ;
}
-
+
public void setCCOption(int CCOption) {
this.CCOption=CCOption ;
}
public void setCCNumber(String CCNumber) {
this.CCNumber=CCNumber ;
}
-
- public void setErrors(String key, String msg) {
+
+ public void setErrors(String key, String msg) {
errors.put(key,msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java
index db03c9f..7fb4747 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/Dispatcher.java
@@ -22,12 +22,12 @@
import java.math.BigDecimal;
public class Dispatcher extends HttpServlet {
- public void doGet(HttpServletRequest request, HttpServletResponse response) {
+ public void doGet(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
ResourceBundle messages = (ResourceBundle)session.getAttribute("messages");
if (messages == null) {
Locale locale=request.getLocale();
- messages = ResourceBundle.getBundle("com.sun.cb.messages.CBMessages", locale);
+ messages = ResourceBundle.getBundle("com.sun.cb.messages.CBMessages", locale);
session.setAttribute("messages", messages);
}
@@ -95,7 +95,7 @@
cart = new ShoppingCart(rpl);
session.setAttribute("cart", cart);
}
-
+
if (selectedScreen.equals("/orderForm")) {
cart.clear();
for(Iterator i = rpl.getItems().iterator(); i.hasNext(); ) {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java
index 1d7a3d7..973efe5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/JAXRQueryByName.java
@@ -16,20 +16,20 @@
package com.sun.cb;
-import javax.xml.registry.*;
-import javax.xml.registry.infomodel.*;
+import javax.xml.registry.*;
+import javax.xml.registry.infomodel.*;
import java.net.*;
import java.util.*;
/**
- * The JAXRQueryByName class consists of a main method, a
- * makeConnection method, an executeQuery method, and some
- * helper methods. It searches a registry for
- * information about organizations whose names contain a
+ * The JAXRQueryByName class consists of a main method, a
+ * makeConnection method, an executeQuery method, and some
+ * helper methods. It searches a registry for
+ * information about organizations whose names contain a
* user-supplied string.
- *
- * To run this program, use the command
- *
+ *
+ * To run this program, use the command
+ *
* ant -Dquery-string=<value> run-query
*
* after starting Tomcat and Xindice.
@@ -50,7 +50,7 @@
}
String queryString = new String(args[0]);
System.out.println("Query string is " + queryString);
-
+
JAXRQueryByName jq = new JAXRQueryByName();
connection = jq.makeConnection(queryURL, publishURL);
@@ -61,11 +61,11 @@
/**
* Establishes a connection to a registry.
*
- * @param queryUrl the URL of the query registry
- * @param publishUrl the URL of the publish registry
+ * @param queryUrl the URL of the query registry
+ * @param publishUrl the URL of the publish registry
* @return the connection
*/
- public Connection makeConnection(String queryUrl,
+ public Connection makeConnection(String queryUrl,
String publishUrl) {
/*
@@ -78,24 +78,24 @@
String httpProxyHost = "";
String httpProxyPort = "";
- /*
- * Define connection configuration properties.
+ /*
+ * Define connection configuration properties.
* For simple queries, you need the query URL.
- * To obtain the connection factory class, set a System
+ * To obtain the connection factory class, set a System
* property.
*/
Properties props = new Properties();
props.setProperty("javax.xml.registry.queryManagerURL",
queryUrl);
- props.setProperty("com.sun.xml.registry.http.proxyHost",
+ props.setProperty("com.sun.xml.registry.http.proxyHost",
httpProxyHost);
- props.setProperty("com.sun.xml.registry.http.proxyPort",
+ props.setProperty("com.sun.xml.registry.http.proxyPort",
httpProxyPort);
try {
- // Create the connection, passing it the
+ // Create the connection, passing it the
// configuration properties
- ConnectionFactory factory =
+ ConnectionFactory factory =
ConnectionFactory.newInstance();
factory.setProperties(props);
connection = factory.createConnection();
@@ -110,11 +110,11 @@
}
return connection;
}
-
+
/**
* Returns organizations containing a string.
*
- * @param qString the string argument
+ * @param qString the string argument
* @return a collection of organizations
*/
public Collection executeQuery(String qString) {
@@ -137,25 +137,25 @@
//namePatterns.add("%" + qString + "%");
// Find using the name
- BulkResponse response =
- bqm.findOrganizations(findQualifiers,
+ BulkResponse response =
+ bqm.findOrganizations(findQualifiers,
namePatterns, null, null, null, null);
orgs = response.getCollection();
} catch (Exception e) {
e.printStackTrace();
return null;
- }
-
+ }
+
return orgs;
}
/**
* Returns the name value for a registry object.
*
- * @param ro a RegistryObject
- * @return the String value
+ * @param ro a RegistryObject
+ * @return the String value
*/
- public String getName(RegistryObject ro)
+ public String getName(RegistryObject ro)
throws JAXRException {
try {
@@ -164,14 +164,14 @@
return "No Name";
}
}
-
+
/**
* Returns the description value for a registry object.
*
- * @param ro a RegistryObject
- * @return the String value
+ * @param ro a RegistryObject
+ * @return the String value
*/
- public String getDescription(RegistryObject ro)
+ public String getDescription(RegistryObject ro)
throws JAXRException {
try {
return ro.getDescription().getValue();
@@ -179,14 +179,14 @@
return "No Description";
}
}
-
+
/**
* Returns the key id value for a registry object.
*
- * @param ro a RegistryObject
- * @return the String value
+ * @param ro a RegistryObject
+ * @return the String value
*/
- public String getKey(RegistryObject ro)
+ public String getKey(RegistryObject ro)
throws JAXRException {
try {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java
index 2b89ec7..a951549 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmation.java
@@ -15,7 +15,7 @@
*/
package com.sun.cb;
-
+
public class OrderConfirmation {
private OrderBean ob;
@@ -25,14 +25,14 @@
this.ob = ob;
this.cb = cb;
}
-
+
public OrderBean getOrderBean() {
return ob;
}
-
+
public ConfirmationBean getConfirmationBean() {
return cb;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java
index bf18fd3..4e54bfc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/OrderConfirmations.java
@@ -17,19 +17,19 @@
package com.sun.cb;
import java.util.*;
-
+
public class OrderConfirmations {
ArrayList items = null;
public OrderConfirmations() {
- items = new ArrayList();
+ items = new ArrayList();
}
public synchronized void add(OrderConfirmation oc) {
items.add(oc);
}
-
-
+
+
public synchronized Collection getItems() {
return items;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java
index 357c671..f5171e5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceList.java
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.*;
-import javax.xml.registry.*;
-import javax.xml.registry.infomodel.*;
+import javax.xml.registry.*;
+import javax.xml.registry.infomodel.*;
public class RetailPriceList implements Serializable {
@@ -62,7 +62,7 @@
// Get price list from service at distributor URI
PriceListBean priceList = PriceFetcher.getPriceList(distributor);
-
+
PriceItemBean[] items = priceList.getPriceItems();
retailPriceItems = new ArrayList();
distributors = new ArrayList();
@@ -72,19 +72,19 @@
RetailPriceItem pi = new RetailPriceItem(items[i].getCoffeeName(), items[i].getPricePerPound(), price , distributor);
retailPriceItems.add(pi);
}
- distributors.add(distributor);
+ distributors.add(distributor);
}
}
// Print spacer between organizations
System.out.println(" --- ");
- }
+ }
} catch (Exception e) {
e.printStackTrace();
} finally {
// At end, close connection to registry
if (connection != null) {
try {
- connection.close();
+ connection.close();
} catch (JAXRException je) {}
}
}
@@ -99,8 +99,8 @@
RetailPriceItem rpi = new RetailPriceItem(pib.getCoffeeName(), pib.getPricePerPound(), price, SAAJOrderURL);
retailPriceItems.add(rpi);
}
- distributors.add(SAAJOrderURL);
- }
+ distributors.add(SAAJOrderURL);
+ }
public ArrayList getItems() {
return retailPriceItems;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java
index 9fd620d..f9bd541 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/RetailPriceListServlet.java
@@ -24,23 +24,23 @@
* This is a simple example of an HTTP Servlet. It responds to the GET
* method of the HTTP protocol.
*/
-public class RetailPriceListServlet extends HttpServlet {
+public class RetailPriceListServlet extends HttpServlet {
public void doGet (HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
-
- HttpSession session = request.getSession();
- ServletContext context = getServletContext();
+
+ HttpSession session = request.getSession();
+ ServletContext context = getServletContext();
RetailPriceList rpl = new RetailPriceList();
context.setAttribute("retailPriceList", rpl);
ShoppingCart cart = new ShoppingCart(rpl);
session.setAttribute("cart", cart);
PrintWriter out = response.getWriter();
-
- // then write the data of the response
+
+ // then write the data of the response
out.println("<html><body bgcolor=\"#ffffff\">" +
"Reloaded price list." + "</html></body>");
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java
index a5bd8f1..2f71ed7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCart.java
@@ -20,15 +20,15 @@
import java.math.BigDecimal;
import com.sun.cb.RetailPriceList;
import com.sun.cb.RetailPriceItem;
-
+
public class ShoppingCart {
ArrayList items = null;
BigDecimal total = new BigDecimal("0.00");
int numberOfItems = 0;
-
+
public ShoppingCart(RetailPriceList rpl) {
items = new ArrayList();
-
+
for(Iterator i = rpl.getItems().iterator(); i.hasNext(); ) {
RetailPriceItem item = (RetailPriceItem) i.next();
ShoppingCartItem sci = new ShoppingCartItem(item, new BigDecimal("0.0"), new BigDecimal("0.00"));
@@ -36,7 +36,7 @@
numberOfItems++;
}
}
-
+
public synchronized void add (ShoppingCartItem item) {
items.add(item);
total = total.add(item.getPrice()).setScale(2);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java
index eded39e..3fe7513 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/ShoppingCartItem.java
@@ -51,7 +51,7 @@
public BigDecimal getPounds() {
return pounds;
- }
+ }
public BigDecimal getPrice() {
return price;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java
index 9c1619d..d339c00 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Debug.java
@@ -43,7 +43,7 @@
public static void print(Throwable t, String msg) {
if (debuggingOn) {
System.err.println("Received throwable with Message: "+t.getMessage());
- if (msg != null)
+ if (msg != null)
System.err.print(msg);
t.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java
index 64c3092..cfa21c0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/DefinitionTag.java
@@ -23,7 +23,7 @@
public class DefinitionTag extends SimpleTagSupport {
private String definitionName = null;
private String screenId;
- private HashMap screens = null;
+ private HashMap screens = null;
public DefinitionTag() {
super();
@@ -39,15 +39,15 @@
}
public void doTag() {
try {
- screens = new HashMap();
+ screens = new HashMap();
-
+
getJspBody().invoke(null);
-
+
Definition definition = new Definition();
PageContext context = (PageContext)getJspContext();
ArrayList params = (ArrayList) screens.get(screenId);
- Iterator ir = null;
+ Iterator ir = null;
if (params != null) {
ir = params.iterator();
while (ir.hasNext())
@@ -56,7 +56,7 @@
// put the definition in the page context
context.setAttribute(definitionName, definition, context.APPLICATION_SCOPE);
}
- else
+ else
Debug.println("DefinitionTag: params are not defined.");
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java
index aeddf42..0f861bb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/InsertTag.java
@@ -38,7 +38,7 @@
public void doTag() throws JspTagException {
Definition definition = null;
Parameter parameter = null;
- boolean directInclude = false;
+ boolean directInclude = false;
PageContext context = (PageContext)getJspContext();
// get the definition from the page context
@@ -54,7 +54,7 @@
// if parameter is direct, print to out
if (directInclude && parameter != null)
context.getOut().print(parameter.getValue());
- // if parameter is indirect, include results of dispatching to page
+ // if parameter is indirect, include results of dispatching to page
else {
if ((parameter != null) && (parameter.getValue() != null))
context.include(parameter.getValue());
@@ -62,9 +62,9 @@
} catch (Exception ex) {
Throwable rootCause = null;
if (ex instanceof ServletException) {
- rootCause = ((ServletException) ex).getRootCause();
+ rootCause = ((ServletException) ex).getRootCause();
}
- throw new JspTagException(ex.getMessage(), rootCause);
- }
+ throw new JspTagException(ex.getMessage(), rootCause);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java
index b48ab7d..e35cc5c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/Parameter.java
@@ -29,7 +29,7 @@
public String getName() {
return name;
- }
+ }
public boolean isDirect() {
return isDirect;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java
index 36a8e55..86815cc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ParameterTag.java
@@ -39,7 +39,7 @@
public void doTag() {
boolean isDirect = false;
- if ((isDirectString != null) &&
+ if ((isDirectString != null) &&
isDirectString.toLowerCase().equals("true"))
isDirect = true;
@@ -50,8 +50,8 @@
if (parameters != null) {
Parameter param = new Parameter(paramName, paramValue, isDirect);
parameters.add(param);
- } else
- Debug.println("ParameterTag: parameters do not exist.");
+ } else
+ Debug.println("ParameterTag: parameters do not exist.");
}
} catch (Exception e) {
Debug.println("ParameterTag: error in doTag: " + e);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java
index 7d58b1e..b2111a7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/src/com/sun/cb/template/ScreenTag.java
@@ -24,7 +24,7 @@
private ArrayList parameters = null;
public ArrayList getParameters() {
- return parameters;
+ return parameters;
}
public void setScreenId(String screenId) {
this.screenId = screenId;
@@ -37,7 +37,7 @@
parameters = new ArrayList();
HashMap screens = (HashMap)((DefinitionTag)getParent()).getScreens();
if (screens != null) {
- try {
+ try {
if (!screens.containsKey(screenId))
screens.put(screenId, parameters);
getJspBody().invoke(null);
@@ -46,6 +46,6 @@
}
}
else
- Debug.println("ScreenTag: Unable to get screens object.");
+ Debug.println("ScreenTag: Unable to get screens object.");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties
index d0f7abe..27bbb85 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
j2ee.home=${S1AS_home}
sunone.home=${j2ee.home}
#
-# The following settings have been commented out because they are performed by the devtests
+# The following settings have been commented out because they are performed by the devtests
# set-up instead.
#
#admin.password=
@@ -41,5 +41,5 @@
#db.pwd=pbpublic
url.prop=DatabaseName
ds.class=com.pointbase.jdbc.jdbcDataSource
-db.jvmargs=-ms16m -mx32m
+db.jvmargs=-ms16m -mx32m\u0020
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml
index bf99751..1def8de 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml
@@ -24,7 +24,7 @@
<target name="clean" >
<delete dir="${build}" />
- <delete dir="${dist}" />
+ <delete dir="${dist}" />
</target>
<path id="db.classpath">
@@ -44,19 +44,19 @@
<target name="admin_command_common">
<echo message="Doing admin task ${admin.command}"/>
- <sun-appserv-admin
+ <sun-appserv-admin
command="${admin.command}"
- user="${admin.user}"
- password="${admin.password}"
- host="${admin.host}"
- port="${admin.port}"
+ user="${admin.user}"
+ password="${admin.password}"
+ host="${admin.host}"
+ port="${admin.port}"
sunonehome="${j2ee.home}" />
</target>
<target name="create-jdbc-resource_common">
<antcall target="admin_command_common">
<param name="admin.command"
- value="create-jdbc-resource
+ value="create-jdbc-resource
--connectionpoolid ${conpool.name} ${jdbc.resource.name}" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java
index 612bad5..93d8c04 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/Deployer.java
@@ -31,19 +31,19 @@
public class Deployer implements ProgressListener {
public static void main(String args[]) {
-
+
try {
System.out.println(" inst at " + System.getProperty("com.sun.aas.installRoot"));
Deployer deployer = new Deployer();
deployer.deploy(args);
- System.exit(0);
+ System.exit(0);
} catch(Exception e) {
e.printStackTrace();
System.exit(-1);
}
- }
-
-
+ }
+
+
public void deploy(String args[]) throws Exception {
DeploymentFactoryInstaller.getInstaller();
@@ -51,37 +51,37 @@
ProgressObject dpo;
File archive = new File(args[0]);
File deploymentPlan = new File(args[1]);
-
+
if (!deploymentPlan.exists()) {
System.out.println("Warning, deploying with null deployment plan");
- dpo = dm.distribute(dm.getTargets(), archive, null);
+ dpo = dm.distribute(dm.getTargets(), archive, null);
} else {
System.out.println("Deploying " + archive.getAbsolutePath() + " with plan " + deploymentPlan.getAbsoluteFile());
- dpo = dm.distribute(dm.getTargets(), archive, deploymentPlan);
- }
+ dpo = dm.distribute(dm.getTargets(), archive, deploymentPlan);
+ }
dpo.addProgressListener(this);
System.out.println("Deployment returned " + dpo);
if (dpo!=null) {
DeploymentStatus deploymentStatus = dpo.getDeploymentStatus();
do {
Thread.currentThread().sleep(200);
- } while (!(deploymentStatus.isCompleted() || deploymentStatus.isFailed()));
+ } while (!(deploymentStatus.isCompleted() || deploymentStatus.isFailed()));
System.out.println("Deployment status is " + deploymentStatus);
}
- TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs();
+ TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs();
dumpResultModuleIDs("Deployed " , dpo);
-
+
// ModuleType moduleType = ((SunTargetModuleID) targetModuleIDs[0]).getModuleType();
-
+
// listApplications(dm, moduleType , dm.getTargets(), null);
}
-
+
private void dumpResultModuleIDs(String prefix, ProgressObject po) {
TargetModuleID[] targetModuleIDs = po.getResultTargetModuleIDs();
- for (int i=0;i<targetModuleIDs.length;i++) {
- dumpModulesIDs(prefix, targetModuleIDs[i]);
+ for (int i=0;i<targetModuleIDs.length;i++) {
+ dumpModulesIDs(prefix, targetModuleIDs[i]);
}
- }
+ }
private void dumpModulesIDs(String prefix, TargetModuleID targetModuleID) {
System.out.println(prefix + targetModuleID);
@@ -91,11 +91,11 @@
System.out.println(" Child " + i + "\n" + subs[i]);
}
}
- }
-
+ }
+
public void handleProgressEvent(javax.enterprise.deploy.spi.status.ProgressEvent progressEvent) {
DeploymentStatus ds = progressEvent.getDeploymentStatus();
- System.out.println("Received Progress Event state " + ds.getState() + " msg = " + ds.getMessage());
+ System.out.println("Received Progress Event state " + ds.getState() + " msg = " + ds.getMessage());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml
index 3a966e5..6c362b1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml
@@ -20,22 +20,22 @@
<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
]>
-
+
<project name="wstoejb" default="all" basedir=".">
-
+
&commonBuild;
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- </target>
+
+ <target name="prepare" depends="init">
+ <mkdir dir="${build}" />
+ </target>
<target name="compile" depends="prepare">
<javac srcdir="." destdir="${build}">
- <classpath>
- <pathelement path="${inst}/lib/j2ee.jar"/>
- <pathelement path="${inst}/lib/appserv-rt.jar"/>
- </classpath>
+ <classpath>
+ <pathelement path="${inst}/lib/j2ee.jar"/>
+ <pathelement path="${inst}/lib/appserv-rt.jar"/>
+ </classpath>
</javac>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml
index 2124cf7..e3b2aae 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml
@@ -23,12 +23,12 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="simple" target="private-all">
- <property name="build" value="${build}/simple"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="simple" target="private-all">
+ <property name="build" value="${build}/simple"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml
index 70775d6..75fe973 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml
@@ -23,49 +23,49 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
<property name="archivedir" value="${build}/archives"/>
- <target name="build-deployment-plan">
- <mkdir dir="${build}/plan"/>
- <copy file="sun-web.xml" tofile="${build}/plan/sun-web.xml"/>
- <jar destfile="${archivedir}/plan.jar" basedir="${build}/plan"/>
- </target>
+ <target name="build-deployment-plan">
+ <mkdir dir="${build}/plan"/>
+ <copy file="sun-web.xml" tofile="${build}/plan/sun-web.xml"/>
+ <jar destfile="${archivedir}/plan.jar" basedir="${build}/plan"/>
+ </target>
- <target name="build-portable">
- <war destfile="${archivedir}/simple.war" webxml="web.xml">
- <fileset file="Simple_Page.html"/>
- </war>
- </target>
+ <target name="build-portable">
+ <war destfile="${archivedir}/simple.war" webxml="web.xml">
+ <fileset file="Simple_Page.html"/>
+ </war>
+ </target>
- <target name="undeploy">
- <antcall target="common.run.jsr88">
- <param name="command" value="undeploy"/>
- <param name="arg.list" value="simple"/>
- </antcall>
- </target>
+ <target name="undeploy">
+ <antcall target="common.run.jsr88">
+ <param name="command" value="undeploy"/>
+ <param name="arg.list" value="simple"/>
+ </antcall>
+ </target>
- <target name="deploy-test" depends="setHttpPort">
+ <target name="deploy-test" depends="setHttpPort">
<mkdir dir="${archivedir}"/>
- <antcall target="declare-test">
+ <antcall target="declare-test">
<param name="description" value="jsr88/war/simple deploy test"/>
</antcall>
- <antcall target="build-portable"/>
- <antcall target="build-deployment-plan"/>
- <antcall target="common.run.jsr88">
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${archivedir}/simple.war ${archivedir}/plan.jar"/>
- </antcall>
- <echo message="getting http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
- <condition property="success">
- <http url="http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
- </condition>
+ <antcall target="build-portable"/>
+ <antcall target="build-deployment-plan"/>
+ <antcall target="common.run.jsr88">
+ <param name="command" value="deploy"/>
+ <param name="arg.list" value="true ${archivedir}/simple.war ${archivedir}/plan.jar"/>
+ </antcall>
+ <echo message="getting http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
+ <condition property="success">
+ <http url="http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
+ </condition>
<antcall target="testSuccess"><param name="log.id" value="1"/></antcall>
<antcall target="testFailure"><param name="log.id" value="2"/></antcall>
<!--
- <antcall target="undeploy"/>
+ <antcall target="undeploy"/>
-->
- </target>
+ </target>
<target name="redeploy-test" depends="setHttpPort">
<antcall target="declare-test">
@@ -99,16 +99,16 @@
<antcall target="redeploy-test"/>
</target>
- <target name="testSuccess" if="success">
+ <target name="testSuccess" if="success">
<antcall target="processResult">
<param name="result" value="0"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
- <target name="testFailure" unless="success">
+ </antcall>
+ </target>
+ <target name="testFailure" unless="success">
<antcall target="processResult">
<param name="result" value="-1"/>
<param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml
index 450451f..b8b93f7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml
@@ -20,6 +20,6 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Simplistic Web Application</display-name>
<welcome-file-list>
- <welcome-file>simple_page.html</welcome-file>
+ <welcome-file>simple_page.html</welcome-file>
</welcome-file-list>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/lifecycle-module/DeplLifecycleModule.java b/appserver/tests/appserv-tests/devtests/deployment/lifecycle-module/DeplLifecycleModule.java
index 7453761..2312370 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/lifecycle-module/DeplLifecycleModule.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/lifecycle-module/DeplLifecycleModule.java
@@ -51,4 +51,4 @@
return;
}
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/TestClient.java
index 90b12ae..5869df8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml b/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml
index b0d4b79..48657d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/osgi/simple/build.xml
@@ -70,16 +70,16 @@
</antcall>
</target>
- <target name="enable.asadmin">
+ <target name="enable.asadmin">
<antcall target="common.enable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
<target name="disable.asadmin">
<antcall target="common.disable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
@@ -128,10 +128,10 @@
<target name="private-all">
<antcall target="assemble"/>
-
+
<antcall target="deploy.osgi.asadmin"/>
- <!-- put in a 30s sleep time to make sure the asynchronous osgi
+ <!-- put in a 30s sleep time to make sure the asynchronous osgi
deployment finishes before accessing the application -->
<sleep seconds="30"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/run_test.sh b/appserver/tests/appserv-tests/devtests/deployment/run_test.sh
index c763790..7443e6c 100755
--- a/appserver/tests/appserv-tests/devtests/deployment/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/deployment/run_test.sh
@@ -55,7 +55,7 @@
fi
if [[ ${1} = "deployment_cluster_all" ]]; then
cp -r ${APS_HOME}/devtests/deployment/server-logs/ ${WORKSPACE}/results/
- fi
+ fi
echo DEPL_TARGET is ${DEPL_TARGET}
}
@@ -78,8 +78,8 @@
print " <testcase classname=\"DeploymentTest\" name=\"" \
substr($2,2,index($2,"description")-4) \
id \
- "\">"
-
+ "\">"
+
# searching for FAILED in field 4,5,6
# if not found, test PASSED
failure=1
@@ -92,11 +92,11 @@
failure=0;
}
}
- }
+ }
if( failure == 1 ) {
print " <failure type=\"testfailure\"/>"
}
-
+
print " </testcase>"
id++;
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java b/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java
index 4f77818..a1c7ac8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/JSR88Deployer.java
@@ -45,13 +45,13 @@
private final String J2EE_DEPLOYMENT_MANAGER =
"J2EE-DeploymentFactory-Implementation-Class";
private static List systemApps = new ArrayList();
-
+
/** Record all events delivered to this deployer (which is also a progress listener. */
private Vector receivedEvents = new Vector();
-
+
/** Record the TargetModuleIDs that resulted from the most recent operation. */
private TargetModuleID [] mostRecentTargetModuleIDs = null;
-
+
/** Creates a new instance of JSR88Deployer */
public JSR88Deployer(String uri, String user, String password) {
this.user = user;
@@ -65,15 +65,15 @@
dm = DeploymentFactoryManager.getInstance().getDeploymentManager(uri, user, password);
} catch (Exception ex) {
ex.printStackTrace();
- System.exit(-1);
+ System.exit(-1);
}
Target[] allTargets = dm.getTargets();
if (allTargets.length == 0) {
log("Can't find deployment targets...");
- System.exit(-1);
+ System.exit(-1);
}
-
+
// If test being run on EE, exclude the DAS server instance from the deploy targets
String targetPlatform = System.getProperty("deploymentTarget");
List filteredTargets = new ArrayList();
@@ -105,7 +105,7 @@
*/
deploymentStatus = po.getDeploymentStatus();
Thread.currentThread().sleep(200);
- } while (!(deploymentStatus.isCompleted() || deploymentStatus.isFailed()));
+ } while (!(deploymentStatus.isCompleted() || deploymentStatus.isFailed()));
log("Deployment status is " + deploymentStatus.getState().toString());
if(deploymentStatus.isFailed())
return(-1);
@@ -114,7 +114,7 @@
public ProgressObject deploy(File archive, File deploymentPlan,
boolean startByDefault, boolean useStream,
- ModuleType type)
+ ModuleType type)
throws Exception {
ProgressObject dpo = null;
@@ -123,7 +123,7 @@
log("Warning, deploying with null deployment plan");
if (useStream) {
if (type == null) {
- dpo = dm.distribute(targets,
+ dpo = dm.distribute(targets,
new FileInputStream(archive.getAbsolutePath()),
null);
} else {
@@ -132,12 +132,12 @@
null);
}
} else {
- dpo = dm.distribute(targets, archive, null);
+ dpo = dm.distribute(targets, archive, null);
}
} else {
if (useStream) {
if (type == null) {
- dpo = dm.distribute(targets,
+ dpo = dm.distribute(targets,
new FileInputStream(archive.getAbsolutePath()),
new FileInputStream(deploymentPlan.getAbsolutePath()));
} else {
@@ -146,9 +146,9 @@
new FileInputStream(deploymentPlan.getAbsolutePath()));
}
} else {
- dpo = dm.distribute(targets, archive, deploymentPlan);
+ dpo = dm.distribute(targets, archive, deploymentPlan);
}
- }
+ }
if (dpo!=null) {
dpo.addProgressListener(this);
if(waitTillComplete(dpo) != 0) {
@@ -156,7 +156,7 @@
return(null);
}
- TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs();
+ TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs();
this.mostRecentTargetModuleIDs = targetModuleIDs;
dumpResultModuleIDs("Deployed " , dpo);
@@ -196,22 +196,22 @@
ProgressObject dpo = null;
if (deploymentPlan == null || deploymentPlan.getName().equals("null")) {
log("Warning, redeploying with null deployment plan");
- if (useStream) {
- dpo = dm.redeploy(modules,
+ if (useStream) {
+ dpo = dm.redeploy(modules,
new FileInputStream(archive.getAbsolutePath()),
null);
} else {
dpo = dm.redeploy(modules, archive, null);
}
} else {
- if (useStream) {
- dpo = dm.redeploy(modules,
+ if (useStream) {
+ dpo = dm.redeploy(modules,
new FileInputStream(archive.getAbsolutePath()),
new FileInputStream(deploymentPlan.getAbsolutePath()));
} else {
- dpo = dm.redeploy(modules, archive, deploymentPlan);
+ dpo = dm.redeploy(modules, archive, deploymentPlan);
}
- }
+ }
if (dpo!=null) {
dpo.addProgressListener(this);
if(waitTillComplete(dpo) != 0) {
@@ -219,7 +219,7 @@
return(null);
}
- TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs();
+ TargetModuleID[] targetModuleIDs = dpo.getResultTargetModuleIDs();
this.mostRecentTargetModuleIDs = targetModuleIDs;
dumpResultModuleIDs("Redeployed " , dpo);
}
@@ -330,15 +330,15 @@
protected void dumpResultModuleIDs(String prefix, ProgressObject po) {
TargetModuleID[] targetModuleIDs = po.getResultTargetModuleIDs();
- dumpModulesIDs(prefix, targetModuleIDs);
+ dumpModulesIDs(prefix, targetModuleIDs);
}
protected void dumpModulesIDs(String prefix, TargetModuleID[] targetModuleIDs) {
- for (int i=0;i<targetModuleIDs.length;i++) {
- dumpModulesIDs(prefix, targetModuleIDs[i]);
+ for (int i=0;i<targetModuleIDs.length;i++) {
+ dumpModulesIDs(prefix, targetModuleIDs[i]);
}
}
-
+
protected void dumpModulesIDs(String prefix, TargetModuleID targetModuleID) {
log(prefix + targetModuleID);
TargetModuleID[] subs = targetModuleID.getChildTargetModuleID();
@@ -349,7 +349,7 @@
}
}
- public TargetModuleID[] getApplications(ModuleType moduleType, Boolean running)
+ public TargetModuleID[] getApplications(ModuleType moduleType, Boolean running)
throws Exception {
TargetModuleID[] modules = null;
if (running==null) {
@@ -363,7 +363,7 @@
return modules;
}
- public TargetModuleID[] getAllApplications(Boolean running)
+ public TargetModuleID[] getAllApplications(Boolean running)
throws Exception {
//log("222. getAllApplications, running = " + running);
TargetModuleID[] ears = getApplications(ModuleType.EAR, running);
@@ -378,15 +378,15 @@
for (int i = 0; i < cars.length; i++) { list.add(cars[i]); }
for (int i = 0; i < ejbs.length; i++) { list.add(ejbs[i]); }
for (int i = 0; i < rars.length; i++) { list.add(rars[i]); }
-
+
TargetModuleID[] results = new TargetModuleID[list.size()];
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); i++) {
results[i] = (TargetModuleID) list.get(i);
}
return results;
}
- protected TargetModuleID[] findApplication(String moduleID, ModuleType moduleType, Boolean running)
+ protected TargetModuleID[] findApplication(String moduleID, ModuleType moduleType, Boolean running)
throws Exception {
/*
*The DeploymentFacility requires that start, stop, redeploy, and undeploy requests
@@ -398,7 +398,7 @@
return filterTargetModuleIDsByModule(list, moduleID);
}
- protected TargetModuleID[] findApplication(String moduleID, Boolean running)
+ protected TargetModuleID[] findApplication(String moduleID, Boolean running)
throws Exception {
//log("111 trying to get everything, moduleid = " + moduleID + "; boolean = " + running);
TargetModuleID[] list = getAllApplications(running);
@@ -424,10 +424,10 @@
}
return (TargetModuleID [])(tmidsToUse.toArray(new TargetModuleID[tmidsToUse.size()]));
}
-
- public void listApplications(ModuleType moduleType, Boolean running)
+
+ public void listApplications(ModuleType moduleType, Boolean running)
throws Exception {
- TargetModuleID[] modules = getApplications(moduleType, running);
+ TargetModuleID[] modules = getApplications(moduleType, running);
if (modules == null) {
} else {
for (int i = 0; i < modules.length; i++) {
@@ -436,14 +436,14 @@
} else if (running.booleanValue()) {
dumpModulesIDs(" RUNNING ", modules[i]);
} else {
- dumpModulesIDs(" NOT RUNNING ", modules[i]);
+ dumpModulesIDs(" NOT RUNNING ", modules[i]);
}
}
}
}
-
+
private void invokeAppClient(ProgressObject po, TargetModuleID targetModuleID) {
- TargetModuleID[] subs = targetModuleID.getChildTargetModuleID();
+ TargetModuleID[] subs = targetModuleID.getChildTargetModuleID();
if (subs==null) {
return;
}
@@ -458,26 +458,26 @@
}
}
}
- }
+ }
-
+
public static void main(String[] args) {
int finalExitValue = 0;
- if (args.length == 0 || "help".equals(args[0])) {
- usage();
+ if (args.length == 0 || "help".equals(args[0])) {
+ usage();
System.exit(1);
}
if (args.length < 5) {
- usage();
+ usage();
System.exit(1);
}
JSR88Deployer deployer = new JSR88Deployer(args[1], args[2], args[3]);
if ("deploy".equals(args[0]) || "deploy-stream".equals(args[0])) {
- if (args.length < 6) {
- usage();
+ if (args.length < 6) {
+ usage();
System.exit(1);
}
boolean useStream = "deploy-stream".equals(args[0]);
@@ -507,8 +507,8 @@
System.exit(1);
}
} else if ("deploy-stream-withtype".equals(args[0])) {
- if (args.length < 7) {
- usage();
+ if (args.length < 7) {
+ usage();
System.exit(1);
}
boolean useStream = true;
@@ -518,7 +518,7 @@
error("File not found : " + inputFile.getPath());
System.exit(1);
}
- ModuleType t =
+ ModuleType t =
ModuleType.getModuleType((new Integer(args[6])).intValue());
File deploymentFile = null;
if (args.length > 7) {
@@ -541,8 +541,8 @@
}
} else if ("list".equals(args[0])) {
- if (args.length != 5) {
- usage();
+ if (args.length != 5) {
+ usage();
System.exit(0);
}
@@ -574,11 +574,11 @@
System.exit(-1);
}
} else if ("redeploy".equals(args[0]) || "redeploy-stream".equals(args[0])) {
- if (args.length < 6) {
- usage();
+ if (args.length < 6) {
+ usage();
System.exit(-1);
}
-
+
boolean useStream = "redeploy-stream".equals(args[0]);
java.io.File inputFile = new java.io.File(args[5]);
if (!inputFile.exists()) {
@@ -609,8 +609,8 @@
System.exit(1);
}
} else {
- if (args.length != 5) {
- usage();
+ if (args.length != 5) {
+ usage();
System.exit(1);
}
@@ -651,7 +651,7 @@
}
System.exit(finalExitValue);
}
-
+
/** Invoked when a deployment progress event occurs.
*
* @param event the progress status event.
@@ -676,7 +676,7 @@
ProgressEvent [] answer = new ProgressEvent[this.receivedEvents.size()];
return (ProgressEvent []) this.receivedEvents.toArray(answer);
}
-
+
/**
*Clear the collection of received events recorded by this deployer.
*/
@@ -687,11 +687,11 @@
public TargetModuleID [] getMostRecentTargetModuleIDs() {
return this.mostRecentTargetModuleIDs;
}
-
+
public void clearMostRecentTargetModuleIDs() {
this.mostRecentTargetModuleIDs = null;
}
-
+
private void loadDeploymentFactory() {
try {
File file = new File(System.getProperty("com.sun.aas.installRoot")
@@ -708,10 +708,10 @@
factory=urlClassLoader.loadClass(className);
} catch (ClassNotFoundException cnfe) {
cnfe.printStackTrace();
- }
+ }
Object df = null;
- try {
+ try {
df = factory.newInstance();
} catch (Exception ie) {
ie.printStackTrace();
@@ -720,7 +720,7 @@
DeploymentFactoryManager.getInstance().registerDeploymentFactory((DeploymentFactory) df);
} else {
System.exit(-1);
- }
+ }
} catch (Exception ex) {
log("Failed to load the deployment factory.");
@@ -753,7 +753,7 @@
public static void error(String message) {
System.err.println("[JSR88Deployer]:: " + message);
}
-
+
private void loadSystemApps() {
systemApps.add("MEjbApp");
systemApps.add("__ejb_container_timer_app");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/customAntTasks/JavaWithResult.java b/appserver/tests/appserv-tests/devtests/deployment/util/customAntTasks/JavaWithResult.java
index fc2fe7a..a0616dd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/customAntTasks/JavaWithResult.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/customAntTasks/JavaWithResult.java
@@ -23,7 +23,7 @@
import java.io.File;
/**
- *Custom Ant task that runs Java, just like the built-in java ant task, but stores the result of the invocation as a
+ *Custom Ant task that runs Java, just like the built-in java ant task, but stores the result of the invocation as a
*property value, which Ant's java task does not (yet) support.
*<p>
*Fortunately, we only need to minimally extend the Java class in Ant, overriding the execute method (to set the result property if
@@ -42,14 +42,14 @@
* @author tjquinn
*/
public class JavaWithResult extends org.apache.tools.ant.taskdefs.Java {
-
+
/*
*String holding the name of the property to be set to the result value of the Java execution. If
*the build.xml file does not specify the property name, then this will remain null and no property
*value assignment will occur.
*/
private String resultProperty = null;
-
+
/*
*The next two declarations were duplicated from the java task's source so the duplicated execute
*method could be modified as little as possible.
@@ -60,7 +60,7 @@
/** Creates a new instance of JavaWithResult */
public JavaWithResult() {
}
-
+
public void init() {
super.init();
/*
@@ -74,13 +74,13 @@
* The working directory of the process.
*<p>
*This method simply mirrors the superclass setDir method. We use it to set this class's private dir
- *variable and also to set the superclass's private dir variable.
+ *variable and also to set the superclass's private dir variable.
*/
public void setDir(File d) {
super.setDir(d);
this.dir = d;
}
-
+
/**
*Assigns the name of the property to receive the result value from the JVM execution.
*@param resultProperty name of the property to be assigned
@@ -88,7 +88,7 @@
public void setResultProperty(String resultProperty) {
this.resultProperty = resultProperty;
}
-
+
/**
* If true, then fail if the command exits with a
* returncode other than 0
@@ -102,7 +102,7 @@
/**
* Do the execution.
*<p>
- *Almost all of this code is duplicated from the source for the build-in java ant task. The difference is
+ *Almost all of this code is duplicated from the source for the build-in java ant task. The difference is
*the logic that checks whether the resultproperty variable has been set and, if so, assigns a value to that
*property.
*/
@@ -111,7 +111,7 @@
int err = -1;
try {
- if ((err = executeJava()) != 0) {
+ if ((err = executeJava()) != 0) {
if (failOnError) {
throw new BuildException("Java returned: " + err, location);
} else {
@@ -120,7 +120,7 @@
}
} finally {
dir = savedDir;
-
+
/*
*If the result property was assigned - meaning the invoking build.xml wants to know the
*result of the JVM execution - then assign the JVM result to the specified property. Because
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java
index 9aa5c7e..826e568 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/AnnotationTest.java
@@ -70,7 +70,7 @@
final ServiceLocator serviceLocator = Utils.getServiceLocator();
Globals.setDefaultHabitat(serviceLocator);
}
-
+
public AnnotationTest(String name) {
super(name);
}
@@ -127,7 +127,7 @@
Assert.assertTrue("BundleDescriptors do not match.",
dc.compareContent(bundleDescs[0], bundleDescs[1]));
}
-
+
protected BundleDescriptor[] processEjbDescriptors() {
try {
processor.generateEjbJarXmlFile(workDir);
@@ -190,13 +190,13 @@
new WebServicesDeploymentDescriptorFile(bundleDescs[0]),
new WebServicesDeploymentDescriptorFile(bundleDescs[1]),
WEB_INF_DIR, "webservices.xml");
-
+
return bundleDescs;
}
private BundleDescriptor[] loadDescriptorFiles(
BundleDescriptor expBundleDescriptor,
- BundleDescriptor genBundleDescriptor,
+ BundleDescriptor genBundleDescriptor,
DeploymentDescriptorFile expDf, DeploymentDescriptorFile genDf,
String metaDir, String descFilename) {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java
index 5fbe569..a656f57 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/DescriptorContentComparator.java
@@ -52,7 +52,7 @@
};
private static Logger logger = null;
-
+
// for easy debug
private Field lastField = null;
@@ -80,7 +80,7 @@
* @return boolean result of comparison
*/
private boolean compareContent(Field field, Object o1, Object o2, Set set) {
- if (o1 == o2 ||
+ if (o1 == o2 ||
isNullEquivalent(field, o1) && isNullEquivalent(field, o2)) {
return true;
}
@@ -91,7 +91,7 @@
if (logger.isLoggable(Level.FINE)) {
logger.fine("... null, class mismatch or excluded for " +
- ((field != null)? field : "") +
+ ((field != null)? field : "") +
", o1 = " + o1 + ", o2 = " + o2);
}
@@ -212,7 +212,7 @@
} else if (o instanceof Collection) {
Collection coll = (Collection)o;
result = (coll.size() == 0);
- } else if (o instanceof Map) {
+ } else if (o instanceof Map) {
Map map = (Map)o;
int size = map.size();
@@ -332,7 +332,7 @@
private void initLogger() {
logger = Logger.getLogger(DescriptorContentComparator.class.getName());
- Level logLevel = Boolean.getBoolean("debug") ?
+ Level logLevel = Boolean.getBoolean("debug") ?
Level.FINEST : Level.CONFIG;
for (Handler h : Logger.getLogger("").getHandlers()) {
h.setLevel(logLevel);
@@ -370,7 +370,7 @@
}
if (!(o instanceof ReferencePair)) {
return false;
- }
+ }
ReferencePair rd = (ReferencePair)o;
return (c1 == rd.c1 && c2 == rd.c2 ||
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java
index 0808c6f..712feef 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/LogFormatter.java
@@ -31,11 +31,11 @@
* @author dochez
*/
public class LogFormatter extends Formatter {
-
+
/** Creates a new instance of LogFormatter */
public LogFormatter() {
}
-
+
public String format(LogRecord record) {
return record.getMessage()+"\n";
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java
index 3dc05c4..6977f39 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneErrorHandler.java
@@ -19,7 +19,7 @@
import org.glassfish.apf.ErrorHandler;
import org.glassfish.apf.AnnotationProcessorException;
import org.glassfish.apf.impl.AnnotationUtils;
-
+
/**
* Standalone Implementation of ErrorHandler.
*
@@ -33,8 +33,8 @@
/**
* Receive notication of a fine error message
* @param ape The warning information
- * @throws any exception to stop the annotation processing
- */
+ * @throws any exception to stop the annotation processing
+ */
public void fine(AnnotationProcessorException ape) throws
AnnotationProcessorException {
AnnotationUtils.getLogger().fine("Fine : " + ape);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java
index eefe6f9..b565fed 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/StandaloneProcessor.java
@@ -91,7 +91,7 @@
private ModuleType type = null;
private Set<String> compClassNames = null;
private static ServiceLocator serviceLocator = null;
-
+
/** Creates a new instance of StandaloneProcessor */
public StandaloneProcessor() {
this(ModuleType.EJB);
@@ -102,7 +102,7 @@
if (ModuleType.EJB.equals(type)) {
bundleDescriptor = new EjbBundleDescriptorImpl();
aeHandler = new EjbBundleContext((EjbBundleDescriptorImpl) bundleDescriptor);
-
+
} else if (ModuleType.WAR.equals(type)) {
bundleDescriptor = new WebBundleDescriptorImpl();
aeHandler = new WebBundleContext(
@@ -120,14 +120,14 @@
public void setComponentClassNames(Set compClassNames) {
this.compClassNames = compClassNames;
}
-
+
public static void main(String[] args) throws Exception {
StandaloneProcessor processor = new StandaloneProcessor();
processor.run(args);
processor.generateEjbJarXmlFile(".");
processor.generateWebServicesXmlFile(".");
}
-
+
public int run(String[] args) throws Exception {
for (String arg : args) {
System.out.println("Annotation log is set to " + System.getProperty("annotation.log"));
@@ -135,7 +135,7 @@
if (logWhat!=null) {
AnnotationUtils.setLoggerTarget(logWhat);
initLogger();
- }
+ }
AnnotationUtils.getLogger().info("processing " + arg);
File f = new File(arg);
if (f.exists()) {
@@ -157,7 +157,7 @@
(EjbBundleDescriptorImpl)bundleDescriptor;
scanner = serviceLocator.getService(EjbJarScanner.class);
scanner.process(archive, ejbBundleDesc, classLoader, null);
-
+
} else if (ModuleType.WAR.equals(type)) {
WebBundleDescriptor webBundleDesc =
(WebBundleDescriptor)bundleDescriptor;
@@ -170,26 +170,26 @@
}
scanner = serviceLocator.getService(WarScanner.class);
scanner.process(archive, webBundleDesc, classLoader, null);
-
+
} else if (ModuleType.CAR.equals(type)) {
String mainClassName = compClassNames.iterator().next();
- ApplicationClientDescriptor appClientDesc =
+ ApplicationClientDescriptor appClientDesc =
(ApplicationClientDescriptor)bundleDescriptor;
appClientDesc.setMainClassName(mainClassName);
scanner = serviceLocator.getService(AppClientScanner.class);
scanner.process(archive, appClientDesc, classLoader, null);
-
+
}
AnnotationProcessor ap = serviceLocator.<SJSASFactory>getService(SJSASFactory.class).getAnnotationProcessor(false);
-
-
- // if the user indicated a directory for handlers, time to add the
+
+
+ // if the user indicated a directory for handlers, time to add the
String handlersDir = System.getProperty("handlers.dir");
if (handlersDir!=null) {
addHandlers(ap, handlersDir);
}
-
+
ProcessingContext ctx = ap.createContext();
ctx.setErrorHandler(new StandaloneErrorHandler());
bundleDescriptor.setClassLoader(scanner.getClassLoader());
@@ -221,13 +221,13 @@
public void generateAppClientXmlFile(String dir) throws IOException {
AppClientDeploymentDescriptorFile appClientdf = new AppClientDeploymentDescriptorFile();
appClientdf.write(bundleDescriptor, dir);
-
+
}
public void generateEjbJarXmlFile(String dir) throws IOException {
EjbDeploymentDescriptorFile ejbdf = new EjbDeploymentDescriptorFile();
ejbdf.write(bundleDescriptor, dir);
-
+
}
public void generateWebXmlFile(String dir) throws IOException {
@@ -239,13 +239,13 @@
WebServicesDeploymentDescriptorFile ddf = new WebServicesDeploymentDescriptorFile(bundleDescriptor);
ddf.write(bundleDescriptor, dir);
}
-
+
private void addHandlers(AnnotationProcessor ap, String handlersDir) {
try {
System.out.println("Handlers dir set at " + handlersDir);
DirectoryScanner scanner = new DirectoryScanner();
scanner.process(new File(handlersDir),null,null);
-
+
Set<Class> elements = scanner.getElements();
for (Class handlerClass : elements) {
Class[] interfaces = handlerClass.getInterfaces();
@@ -253,7 +253,7 @@
if (interf.equals(org.glassfish.apf.AnnotationHandler.class)) {
AnnotationHandler handler = (AnnotationHandler) handlerClass.newInstance();
if (AnnotationUtils.shouldLog("handler")) {
- AnnotationUtils.getLogger().fine("Registering handler " + handlerClass
+ AnnotationUtils.getLogger().fine("Registering handler " + handlerClass
+ " for type " + handler.getAnnotationType());
}
ap.pushAnnotationHandler(handler);
@@ -264,7 +264,7 @@
AnnotationUtils.getLogger().severe("Exception while registering handlers : " + e.getMessage());
}
}
-
+
private void initLogger() {
try {
FileHandler handler = new FileHandler("annotation.log");
@@ -274,7 +274,7 @@
logger.setLevel(Level.FINE);
logger.addHandler(handler);} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
private void prepareServiceLocator() {
@@ -282,7 +282,7 @@
// Bootstrap a hk2 environment.
ModulesRegistry registry = new StaticModulesRegistry(getClass().getClassLoader());
serviceLocator = registry.createServiceLocator("default");
-
+
StartupContext startupContext = new StartupContext();
ServiceLocatorUtilities.addOneConstant(serviceLocator, startupContext);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java
index 35b5dda..69cee32 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/util/devtests/deployment/util/Utils.java
@@ -34,7 +34,7 @@
/**
* Utilities to create a configured Habitat and cache them
*
- * Shamelessly copied from nucleus/tests/util
+ * Shamelessly copied from nucleus/tests/util
*
* @author Jerome Dochez
*/
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml
index 802dbc8..440839b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/basic-scenarios.xml
@@ -67,7 +67,7 @@
<antcall target="deploy.version">
<param name="force" value="true"/>
<param name="versionExpression" value="${identifier.2}"/>
- <param name="xmlVersionIdentifier" value="${identifier.1}"/>
+ <param name="xmlVersionIdentifier" value="${identifier.1}"/>
</antcall>
<!-- test that the deployed version running is ${identifier.2} -->
<antcall target="test.registred">
@@ -551,7 +551,7 @@
<antcall target="run.positive.clusterInstance2">
<param name="description" value="rolling.upgrade(1)"/>
</antcall>
-
+
<!-- switch the 2nd instance to the specific version -->
<antcall target="enable.version.clusterInstance2">
<param name="versionExpression" value="${identifier.1}"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/build.properties b/appserver/tests/appserv-tests/devtests/deployment/versioning/build.properties
index fc317a1..69361c8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/build.properties
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
qualifier.1=ALPHA
identifier.1=ALPHA-1.0.0
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/build.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/build.xml
index c5833e8..c02365a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/build.xml
@@ -35,7 +35,7 @@
<ant dir="simple-versioned-appclient" target="private-all">
<property name="build" value="${build}/simple-versioned-appclient"/>
</ant>
-
+
<!-- play some versioning devtests scenarios with simple-versioned-ejb -->
<ant dir="simple-versioned-ejb" target="private-all">
<property name="build" value="${build}/simple-versioned-ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/GetJWSClientStubs.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/GetJWSClientStubs.java
index f52d00c..c92ec76 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/GetJWSClientStubs.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/GetJWSClientStubs.java
@@ -46,7 +46,7 @@
* "asadmin get-client-stubs" command is not aware of the enabled state.
*
* This class retrieve the stubs from the JWS URL of the application.
- *
+ *
* The GlassFish server now uses http sessions to maintain
* some important information during Java Web Start launches.
* For this test to work it now saves the session that is set
@@ -58,10 +58,10 @@
public class GetJWSClientStubs {
private static final String SESSION_PROPERTY_NAME = "JSESSIONID";
-
+
String javaWebStartUrl;
String stubsPath;
-
+
String session = null;
public GetJWSClientStubs(String[] args) {
@@ -188,7 +188,7 @@
}
return result;
}
-
+
private String getSession(final HttpURLConnection c) {
final String s = c.getHeaderField("Set-Cookie");
log("Set-Cookie from server is " + s);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/SimpleVersionedAppClient.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/SimpleVersionedAppClient.java
index b40119d..a00cdf8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/SimpleVersionedAppClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/src/SimpleVersionedAppClient.java
@@ -41,7 +41,7 @@
* client-stub retrieved with the "asadmin get-client-stubs" command. Instead,
* we choose to use the Java Web Start URL ([host:port/contextRoot], the
* contextroot equals to the untagged if not provided in the deployment descriptor)
- *
+ *
* The stubs are retrieved with JWS mechanism, it allows us to change the enabled status
* and make some tests.
*
@@ -120,7 +120,7 @@
/**
* @param args the command line arguments
*/
- public static void main(String[] args) {
+ public static void main(String[] args) {
SimpleVersionedAppClient app = new SimpleVersionedAppClient(args);
app.doTest();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml
index ae5f1f3..f77ab23 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ear/build.xml
@@ -66,20 +66,20 @@
<target name="assemble" depends="prepare,process.servletName">
<property name="moduleUntaggedArchive" value="${build}/${moduleUntaggedName}.${modulePackaging}"/>
<delete file="${moduleUntaggedArchive}" failonerror="false"/>
- <ant dir="${moduleBuildDir}" target="create.version" inheritAll="false">
+ <ant dir="${moduleBuildDir}" target="create.version" inheritAll="false">
<property name="versionExpression" value="${versionExpression}"/>
<property name="xmlVersionIdentifier" value=""/>
</ant>
<move file="${build}/${servletAppName}.${modulePackaging}" tofile="${moduleUntaggedArchive}" failonerror="false"/>
<property name="xmlFile" value="${gfDDDir}/${gfDDFile}"/>
- <antcall target="generate.xml.identifier"/>
+ <antcall target="generate.xml.identifier"/>
<jar destfile="${archiveFile}">
<fileset dir="." includes="META-INF/*.xml"/>
<fileset dir="${build}" includes="${moduleUntaggedName}.${modulePackaging}"/>
</jar>
<delete file="${moduleUntaggedArchive}" failonerror="false"/>
</target>
-
+
<!--
Currently, only the scenarios processing test.registred and test.notregistred
are supported.
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/build.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/build.xml
index e1c5af6..9c0be1b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/build.xml
@@ -37,7 +37,7 @@
-->
<property name="versionInfos" value="version-infos.properties"/>
<property name="testPackage" value="versionedejb"/>
-
+
<property name="gfDDFile" value="glassfish-ejb-jar.xml"/>
<property name="gfDDDir" value="META-INF"/>
@@ -68,11 +68,11 @@
<entry key="version.identifier" value="${versionExpression}"/>
</propertyfile>
<property name="xmlFile" value="${gfDDDir}/${gfDDFile}"/>
- <antcall target="generate.xml.identifier"/>
+ <antcall target="generate.xml.identifier"/>
</target>
<!-- assemble: package the ejb -->
- <target name="assemble" depends="compile">
+ <target name="assemble" depends="compile">
<jar destfile="${archiveFile}" manifest="META-INF/MANIFEST.MF">
<fileset dir="${classPath}" includes="**/*.class, **/*.properties"/>
<fileset dir="." includes="META-INF/*.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
index 0024e71..a829f71 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
@@ -27,8 +27,8 @@
public class SimpleVersionedEjbImpl implements SimpleVersionedEjb {
public String getVersion() {
- Properties prop = new Properties();
- InputStream in = null;
+ Properties prop = new Properties();
+ InputStream in = null;
try {
in = this.getClass().getResource("version-infos.properties").openStream();
prop.load(in);
@@ -36,6 +36,6 @@
} catch (IOException ex) {
Logger.getLogger(SimpleVersionedEjbImpl.class.getName()).log(Level.SEVERE, null, ex);
}
- return prop.getProperty("version.identifier", "");
+ return prop.getProperty("version.identifier", "");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/build.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/build.xml
index 50630ac..9ae4888 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/build.xml
@@ -70,11 +70,11 @@
<entry key="version.identifier" value="${versionExpression}"/>
</propertyfile>
<property name="xmlFile" value="${gfDDDir}/${gfDDFile}"/>
- <antcall target="generate.xml.identifier"/>
+ <antcall target="generate.xml.identifier"/>
</target>
<!-- assemble: package the war archive -->
- <target name="assemble" depends="compile">
+ <target name="assemble" depends="compile">
<war destfile="${archiveFile}" webxml="WEB-INF/web.xml" manifest="META-INF/MANIFEST.MF">
<webinf dir="WEB-INF" includes="glassfish-web.xml"/>
<classes dir="${classPath}" includes="**/*.class, **/*.properties">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/src/SimpleVersionedClient.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/src/SimpleVersionedClient.java
index c7d5749..6c3111a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/src/SimpleVersionedClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-servlet/src/SimpleVersionedClient.java
@@ -42,8 +42,8 @@
versionIdentifier = "";
}
}
-
- public void doTest() {
+
+ public void doTest() {
try {
// this provides some usefull informations to investigate
log("Test: devtests/deployment/versioning/simple-versioned-servlet");
@@ -62,7 +62,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -75,7 +75,7 @@
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
-
+
BufferedReader input = new BufferedReader (new InputStreamReader(is));
String line = input.readLine();
return new TestResponse(code, line);
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml
index ae05d65..77c0513 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml
@@ -200,7 +200,7 @@
Test that the given version is registred or not on the ${testServer} target.
In clustering mode, the default target that is used is ${testCluster},
but we have also to test the ${testServer} references.
-
+
@param ${versionExpression} (optional)
@param ${description} (optional, but very important for investigations)
-->
@@ -235,7 +235,7 @@
<antcall target="test.notregistred.cluster"/>
</target>
-<!--
+<!--
PROPERTIES PROCESSING TARGETS, not directly usable for making scenarios
-->
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java
index 26615ff..8ab5cb7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java
@@ -110,5 +110,5 @@
return hash;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java
index 706eb35..cd24742 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java
@@ -96,7 +96,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java
index cfe4ff9..790011e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java
@@ -34,8 +34,8 @@
* @author tjquinn
*/
public class TestServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -75,13 +75,13 @@
} catch (Exception e) {
e.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -92,9 +92,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -107,7 +107,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml
index 3de1950..c23982f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml
@@ -54,7 +54,7 @@
<jar destfile="${deployplan.jar}">
<fileset dir="${basedir}" includes="sun-web.xml"/>
</jar>
-
+
<war destfile="${all.war}" webxml="web.xml">
<webinf dir="." includes="sun-web.xml"/>
<classes dir="${build}"/>
@@ -89,16 +89,16 @@
</antcall>
</target>
- <target name="enable.asadmin">
+ <target name="enable.asadmin">
<antcall target="common.enable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
<target name="disable.asadmin">
<antcall target="common.disable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
@@ -368,7 +368,7 @@
<param name="extra.args" value="${customized.config.client.args}"/>
</antcall>
</target>
-
+
<target name="check.added.customization.and.suppressed.original.config">
<antcall target="check.additive.customization">
<param name="log.id" value="${log.id}.1"/>
@@ -391,7 +391,7 @@
<param name="extra.args" value="-param builtin=in-app"/>
</antcall>
</target>
-
+
<target name="clobber" depends="clean">
<delete file="${portable.war}"/>
<delete file="${all.war}"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/TestClient.java
index 64ccb23..64e2bc4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml
index 74bfbcc..f5d5667 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/build.xml
@@ -56,7 +56,7 @@
<target name="deploydir.asadmin" depends="prepare">
<antcall target="common.deploydir.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${build}/${testName}"/>
</antcall>
</target>
@@ -72,7 +72,7 @@
<antcall target="common.v3.redeploy.asadmin">
<param name="arg.list"
value="--name ${testName}"/>
- </antcall>
+ </antcall>
</target>
@@ -85,7 +85,7 @@
<target name="undeploy.asadmin">
<antcall target="common.undeploy.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
@@ -172,7 +172,7 @@
<antcall target="run.positive.foo"><param name="log.id" value="5"/></antcall>
<antcall target="declare-test">
<param name="description" value="war/deploydir Test asadmin redeploydir preserves context root"/>
- </antcall>
+ </antcall>
<antcall target="redeploydir.asadmin"/>
<antcall target="run.positive.foo"><param name="log.id" value="6"/></antcall>
<antcall target="declare-test">
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/web.xml
index 5875051..44ebead 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/deploydir/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>deploydir</display-name>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java
index 470281a..51c247f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml
index 0e08cc5..250f821 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml
@@ -78,16 +78,16 @@
</antcall>
</target>
- <target name="enable.asadmin">
+ <target name="enable.asadmin">
<antcall target="common.enable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
<target name="disable.asadmin">
<antcall target="common.disable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
@@ -172,7 +172,7 @@
<target name="private-all">
<antcall target="assemble"/>
-
+
<antcall target="deploy.asadmin"/>
<antcall target="run.positive">
<param name="log.id" value="1"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml
index 3dfbe20..7633c90 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>htmlonly</display-name>
<welcome-file-list>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java
index feecff2..ad0a318 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml
index 41fdd84..960384b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml
@@ -141,7 +141,7 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<classpath>
- <path refid="gfv3.classpath"/>
+ <path refid="gfv3.classpath"/>
<path location="${build}"/>
</classpath>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml
index 769784e..963fd1c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>jsponly</display-name>
<welcome-file-list>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java
index bfc54ca..8cc2957 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml
index 7788704..57dc06f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml
@@ -20,21 +20,21 @@
<project name="changeme" default="all" basedir=".">
<target name="all">
<antcall target="ensure.no.file">
- <param name="file" value="/tim"/>
- </antcall>
+ <param name="file" value="/tim"/>
+ </antcall>
- <antcall target="ensure.no.file">
- <param name="file" value="/tim/jjjj"/>
- </antcall>
+ <antcall target="ensure.no.file">
+ <param name="file" value="/tim/jjjj"/>
+ </antcall>
</target>
-
+
<target name="ensure.no.file">
<available file="${file}" property="result" value="1"/>
- <condition property="result" value="0">
- <not>
- <isset property="result"/>
- </not>
- </condition>
+ <condition property="result" value="0">
+ <not>
+ <isset property="result"/>
+ </not>
+ </condition>
<echo>Result for file ${file}: ${result}</echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java
index 512761e..94795cb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestServlet.java
@@ -37,7 +37,7 @@
throws ServletException, IOException
{
try {
- DummyLib d = new DummyLib();
+ DummyLib d = new DummyLib();
PrintWriter out = response.getWriter();
response.setContentType("text/html");
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml
index 8bf2f66..c3fdf83 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml
@@ -191,11 +191,11 @@
File to check is ${file.to.check}</echo>
<available file="${file.to.check}" property="result" value="1"/>
<echo>After available check, result is now ${result}</echo>
- <condition property="result" value="0">
- <not>
- <isset property="result"/>
- </not>
- </condition>
+ <condition property="result" value="0">
+ <not>
+ <isset property="result"/>
+ </not>
+ </condition>
<echo>After final check of results, value is now ${result}</echo>
<antcall target="processResult">
</antcall>
@@ -265,7 +265,7 @@
<target name="xx" depends="init">
<antcall target="ensure.no.file">
- <param name="file" value="${file.to.check}"/>
+ <param name="file" value="${file.to.check}"/>
</antcall>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java
index 9cd2f0e..4e86726 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/dummylib/DummyLib.java
@@ -18,7 +18,7 @@
public class DummyLib {
- public DummyLib() {}
+ public DummyLib() {}
public String getDummyString() {
return "This is the string from dummy lib";
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml
index 31eaed4..4c74258 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>nojarexpansion</display-name>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java
index 0fca795..21258be 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestClient.java
@@ -33,7 +33,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -53,7 +53,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java
index b17377c..e70e0ec 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/TestServlet.java
@@ -51,7 +51,7 @@
* The following line will compile correctly only when the ant
* devtest is running. The ChangeableClass class is generated
* by the ant task (two different ways at two different points
- * in the processing).
+ * in the processing).
*/
final String changeableValue = ChangeableClass.changeableValue();
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml
index 8b7a75a..4d74acf 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml
@@ -65,8 +65,8 @@
<jar destfile="${deployplan.jar}">
<fileset dir="${basedir}" includes="glassfish-web.xml,sun-web.xml"/>
</jar>
-
- <!--
+
+ <!--
The manifest in the next task specifies a Main-Class. It is not used except
to make sure the app client sniffer does not claim the web
module simply because it has a Main-Class setting.
@@ -113,16 +113,16 @@
</antcall>
</target>
- <target name="enable.asadmin">
+ <target name="enable.asadmin">
<antcall target="common.enable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
<target name="disable.asadmin">
<antcall target="common.disable.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml
index d9321ef..6af6b4d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>servletonly</display-name>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/TestClient.java
index 06cfa11..e2ca9c6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml
index 759abbe..6aee563 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/build.xml
@@ -27,9 +27,9 @@
<property name="contextRoot" value="war"/>
<property name="testName" value="virtualserver"/>
- <property name="url2"
+ <property name="url2"
value="http://${http.host}:${http.port.2}/${contextRoot}/${testName}"/>
-
+
<target name="prepare" depends="init">
<property name="portable.war" value="${build}/${testName}-portable.war"/>
<property name="all.war" value="${build}/${testName}.war"/>
@@ -61,7 +61,7 @@
<target name="create.virtual.server">
<antcall target="common.create.virtual.server.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="--hosts ${http.host} ${virtual.server.name}"/>
</antcall>
</target>
@@ -89,14 +89,14 @@
<target name="deploy.asadmin" depends="prepare">
<antcall target="common.deploy.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="--virtualservers ${virtual.server.name} ${all.war}"/>
</antcall>
</target>
<target name="undeploy.asadmin">
<antcall target="common.undeploy.asadmin">
- <param name="arg.list"
+ <param name="arg.list"
value="${testName}"/>
</antcall>
</target>
@@ -146,7 +146,7 @@
</target>
<target name="private-all">
- <!-- test that the app is deployed to the newly
+ <!-- test that the app is deployed to the newly
created virtual server -->
<antcall target="declare-test">
<param name="description" value="war/virtualserver Test asadmin deploy1"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/web.xml
index 6f14c4e..3df6ea4 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/virtualserver/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>virtualserver</display-name>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java
index c2502d9..baf9f00 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestClient.java
@@ -29,7 +29,7 @@
TestClient client = new TestClient();
client.doTest(args);
}
-
+
public void doTest(String[] args) {
String url = args[0];
@@ -46,7 +46,7 @@
log("Caught EXPECTED IOException: " + ex);
pass();
}
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java
index 512761e..94795cb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/TestServlet.java
@@ -37,7 +37,7 @@
throws ServletException, IOException
{
try {
- DummyLib d = new DummyLib();
+ DummyLib d = new DummyLib();
PrintWriter out = response.getWriter();
response.setContentType("text/html");
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java
index 9cd2f0e..4e86726 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/dummylib/DummyLib.java
@@ -18,7 +18,7 @@
public class DummyLib {
- public DummyLib() {}
+ public DummyLib() {}
public String getDummyString() {
return "This is the string from dummy lib";
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml
index 9313b23..241168f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>webinflib</display-name>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml
index 54e4046..aef7e81 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml
@@ -23,12 +23,12 @@
<project name="webservices" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="helloservice" target="private-all">
- <property name="build" value="${build}/helloservice"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="helloservice" target="private-all">
+ <property name="build" value="${build}/helloservice"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml
index 4740bd5..cf81c72 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml
@@ -25,7 +25,7 @@
&commonBuild;
<property name="archivedir" value="${build}/archives"/>
-
+
<property name="testName" value="SayHelloWS"/>
<target name="prepare" depends="init">
<property name="binary" value="${build}/WEB-INF/classes"/>
@@ -36,25 +36,25 @@
<property name="all.war" value="${archivedir}/sayhello.war"/>
<property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
</target>
-
+
<target name="compile" depends="prepare">
- <javac srcdir="helloservice" destdir="${binary}"
- classpath="${inst}/lib/j2ee.jar"/>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
+ <javac srcdir="helloservice" destdir="${binary}"
+ classpath="${inst}/lib/j2ee.jar"/>
+ <echo message="invoking wscompile to generate wsdl file"/>
+ <exec executable="${WSCOMPILE}">
<arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
- </exec>
+ </exec>
</target>
-
+
<target name="assemble" depends="compile">
- <copy file="web.xml" todir="${build}/WEB-INF"/>
- <copy file="webservices.xml" todir="${build}/WEB-INF"/>
- <jar destfile="${portable.war}" basedir="${build}"/>
- <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
- <jar destfile="${all.war}" basedir="${build}"/>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
+ <copy file="web.xml" todir="${build}/WEB-INF"/>
+ <copy file="webservices.xml" todir="${build}/WEB-INF"/>
+ <jar destfile="${portable.war}" basedir="${build}"/>
+ <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
+ <jar destfile="${all.war}" basedir="${build}"/>
+ <jar destfile="${deployplan.jar}">
+ <fileset dir="${basedir}" includes="sun-web.xml"/>
+ </jar>
</target>
<target name="deploy.asadmin" depends="prepare">
@@ -62,10 +62,10 @@
<param name="arg.list" value="--name ${testName} ${all.war}"/>
<param name="testName" value="${testName}"/>
</antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
+ <echo message="Create client webservices artifacts"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
+ </exec>
</target>
<target name="redeploy.asadmin" depends="prepare">
@@ -73,10 +73,10 @@
<param name="arg.list" value="--name ${testName} ${all.war}"/>
<param name="testName" value="${testName}"/>
</antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
+ <echo message="Create client webservices artifacts"/>
+ <exec executable="${WSCOMPILE}">
+ <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
+ </exec>
</target>
<target name="undeploy.asadmin">
@@ -139,13 +139,13 @@
</target>
<target name="runclient" depends="prepare">
- <javac srcdir="staticstubclient" destdir="${binary}"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/webservices-rt.jar:${inst}/lib/webservices-tools.jar"/>
+ <javac srcdir="staticstubclient" destdir="${binary}"
+ classpath="${inst}/lib/j2ee.jar:${inst}/lib/webservices-rt.jar:${inst}/lib/webservices-tools.jar"/>
<javaWithResult
fork="true"
failonerror="false"
- jvm="${JAVA}"
+ jvm="${JAVA}"
classname="staticstubclient.SayHelloClient"
output="${build}/${log.id}.output.log"
resultproperty="result">
@@ -161,7 +161,7 @@
<arg line="${arg.list}"/>
</javaWithResult>
- <antcall target="processResult">
+ <antcall target="processResult">
<param name="result" value="${result}"/>
<param name="log" value="${build}/${log.id}.output.log"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml
index a99d9c0..894789a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
+ <service
+ name="SayHelloService"
+ targetNamespace="urn:DeploymentWebServiceTest"
+ typeNamespace="urn:DeploymentWebServiceTest"
packageName="helloservice">
<interface name="helloservice.SayHello"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java
index 0774d61..d25335b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHello.java
@@ -15,7 +15,7 @@
*/
package helloservice;
-
+
import java.rmi.Remote;
import java.rmi.RemoteException;
@@ -23,11 +23,11 @@
* This is a minimum WebService interface
*/
public interface SayHello extends Remote {
-
- /*
- * @return a hello string
- */
- public String sayHello(String name) throws RemoteException;
-
+
+ /*
+ * @return a hello string
+ */
+ public String sayHello(String name) throws RemoteException;
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java
index 13a6ac4..05bb1d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/helloservice/SayHelloImpl.java
@@ -20,9 +20,9 @@
public class SayHelloImpl implements SayHello {
- public String message ="Bonjour ";
+ public String message ="Bonjour ";
- public String sayHello(String s) throws RemoteException {
- return message + s;
- }
-}
+ public String sayHello(String s) throws RemoteException {
+ return message + s;
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java
index 8010064..d61f78e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/staticstubclient/SayHelloClient.java
@@ -26,28 +26,28 @@
public static void main(String[] args) {
System.out.println("Endpoint address = " + args[0]);
- boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
+ boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
try {
Stub stub = createProxy();
stub._setProperty
(javax.xml.rpc.Stub.ENDPOINT_ADDRESS_PROPERTY,
- args[0]);
- SayHello hello = (SayHello)stub;
+ args[0]);
+ SayHello hello = (SayHello)stub;
System.out.println(hello.sayHello("Jerome !"));
} catch (Exception ex) {
- if(testPositive) {
- ex.printStackTrace();
- System.exit(-1);
- } else {
- System.out.println("Exception recd as expected");
- }
- }
- System.exit(0);
- }
+ if(testPositive) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } else {
+ System.out.println("Exception recd as expected");
+ }
+ }
+ System.exit(0);
+ }
private static Stub createProxy() {
// Note: MyHelloService_Impl is implementation-specific.
- return
+ return
(Stub) (new SayHelloService_Impl().getSayHelloPort());
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml b/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml
index 6c1774a..c31928a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/annotations-common.xml
@@ -17,16 +17,16 @@
-->
<property environment="env"/>
-<property file="${env.APS_HOME}/config.properties"/>
+<property file="${env.APS_HOME}/config.properties"/>
<target name="test-all" depends="clean">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
<echo message="Starting Test ${directory}"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="deploy">
- <param name="pkg-name" value="${pkg-name}"/>
- </antcall>
+ <param name="pkg-name" value="${pkg-name}"/>
+ </antcall>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
@@ -41,11 +41,11 @@
</target>
<target name="clean">
- <echo message="Clean from ${ant.file}"/>
+ <echo message="Clean from ${ant.file}"/>
<delete dir="${env.APS_HOME}/build/module/classes"/>
- <delete dir="${env.APS_HOME}/build/module/archive"/>
- <mkdir dir="${env.APS_HOME}/build/module/classes"/>
- <mkdir dir="${env.APS_HOME}/build/module/archive"/>
+ <delete dir="${env.APS_HOME}/build/module/archive"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes"/>
+ <mkdir dir="${env.APS_HOME}/build/module/archive"/>
</target>
<path id="classpath">
@@ -67,14 +67,14 @@
<target name="test-compile">
<echo message="Compiling into ${pkg-name}/${server}.class"/>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/*.java">
<classpath refid="classpath"/>
</javac>
</target>
<target name="compile-client">
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="${client-src-name}">
<classpath refid="classpath"/>
</javac>
@@ -83,15 +83,15 @@
<target name="build">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="test-compile"/>
<echo message="Building with package ${pkg-name}"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar"
basedir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/**">
- <metainf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- </jar>
+ <metainf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ </jar>
</target>
<target name="deploy">
@@ -108,7 +108,7 @@
<target name="undeploy">
<basename file="${src-name}" property="server" suffix=".java"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.jar"/>
+ <param name="filename" value="${server}.jar"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -131,7 +131,7 @@
</target>
<target name="report" depends="internal-report-success, internal-report-failure">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
</target>
<target name="run">
@@ -155,7 +155,7 @@
</target>
<target name="configurable-wsdl-import">
- <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
+ <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL"/>
</exec>
@@ -165,10 +165,10 @@
<!--basename file="${server}" property="port" suffix="EJB"/-->
<basename file="${server}" property="port"/>
<antcall target="wsdl-import">
- <param name="server" value="${server}"/>
- <param name="port" value="${port}"/>
+ <param name="server" value="${server}"/>
+ <param name="port" value="${port}"/>
</antcall>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<antcall target="unjar-client-utils"/>
</target>
@@ -179,11 +179,11 @@
<target name="internal-run" if="deploy_succeeded">
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
<echo message="Running appclient with ${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
+ <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/build.xml b/appserver/tests/appserv-tests/devtests/deployment/webservices/build.xml
index b91ad8a..e663404 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/webservices/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/build.xml
@@ -23,11 +23,11 @@
<project name="webservices" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="noinf" target="all">
- <property name="build" value="${build}/noinf"/>
- </ant>
- </target>
+ <target name="private-all">
+ <ant dir="noinf" target="all">
+ <property name="build" value="${build}/noinf"/>
+ </ant>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/build.xml b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/build.xml
index 34f310a..1c5021e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java
index 23dccf7..ab8e2f7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-nointf-annotation");
+ stat.addDescription("webservices-ejb-nointf-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-nointf-annotation");
+ stat.printSummary("webservices-ejb-nointf-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-nointf-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml
index d944234..e150ef9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/build.xml
@@ -47,11 +47,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant ctxcheck (Executes the ejb-allowedmethods ctxcheck test)
- ant remove (Executes the ejb-allowedmethods remove test)
- ant all (Executes all the ejb allowedmethods tests)
- </echo>
+ <echo>
+ Usage:
+ ant ctxcheck (Executes the ejb-allowedmethods ctxcheck test)
+ ant remove (Executes the ejb-allowedmethods remove test)
+ ant all (Executes all the ejb allowedmethods tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties
index 2fe2f64..c7457b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-allowedmethods-ctxcheck"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml
index 4956501..c6662b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,13 +46,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Driver*.class,**/HereLocal*.class, **/LocalEntity.class, LocalEntityHome.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -63,14 +63,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
index 8928c70..d3a6bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,11 +37,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-allowedmethods-ctxcheck");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
localSlsbGetEJBObject();
localSlsbGetEJBLocalObject();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
index 252abd5..929cfca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -60,7 +60,7 @@
throw ise;
}
}
-
+
public void localSlsbGetEJBLocalObject() {
try {
Context ic = new InitialContext();
@@ -135,7 +135,7 @@
throw ise;
}
}
-
+
public void localEntityGetEJBLocalObject() {
try {
Context ic = new InitialContext();
@@ -195,5 +195,5 @@
public void ejbActivate() {}
public void ejbPassivate() {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
index 4696c14..58a6ba7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public HereLocalBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HereLocalBean::ejbCreate !!");
+ System.out.println("In HereLocalBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void doSomethingHere() {
@@ -49,7 +49,7 @@
}
public void accessEJBLocalObject() {
- sc.getEJBLocalObject();
+ sc.getEJBLocalObject();
}
public void accessEJBHome() {
@@ -57,7 +57,7 @@
}
public void accessEJBLocalHome() {
- sc.getEJBLocalHome();
+ sc.getEJBLocalHome();
}
public void ejbRemove()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
index f0526f0..731825a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
@@ -24,7 +24,7 @@
public interface LocalEntity
extends EJBLocalObject
{
-
+
/**
* Returns the Name of a student.
* exception RemoteException
@@ -39,7 +39,7 @@
public void setName(String name);
public void localEntityGetEJBObject();
-
+
public void localEntityGetEJBLocalObject();
public void localEntityGetEJBHome();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
index b01c9a6..8edabfc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
@@ -99,7 +99,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/devtestDS");
Context initial = new InitialContext();
} catch (Exception ex) {
@@ -112,7 +112,7 @@
public void localEntityGetEJBObject() {
context.getEJBObject();
}
-
+
public void localEntityGetEJBLocalObject() {
context.getEJBLocalObject();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
index c73a23a..72a9423 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
@@ -38,7 +38,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public LocalEntity findByPrimaryKey(String studentId)
+
+ public LocalEntity findByPrimaryKey(String studentId)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
index ea3e28e..27afcc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
@@ -24,7 +24,7 @@
public interface LocalStudent
extends EJBLocalObject
{
-
+
/**
* Returns the Name of a student.
* exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
index 85752f6..0a238f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -32,11 +32,11 @@
public ThereRemoteBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In ThereRemoteBean::ejbCreate !!");
+ System.out.println("In ThereRemoteBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void doSomethingHere() {
@@ -44,7 +44,7 @@
}
public void accessEJBObject() {
- sc.getEJBObject();
+ sc.getEJBObject();
}
public void accessEJBLocalObject() {
@@ -52,7 +52,7 @@
}
public void accessEJBHome() {
- sc.getEJBHome();
+ sc.getEJBHome();
}
public void accessEJBLocalHome() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties
index 5f46524..f3468f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-allowedmethods-remove"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml
index 3505938..75158cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,13 +46,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Driver*.class,**/HereLocal*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -60,10 +60,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
index 688f0b2..95a8618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,11 +37,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-allowedmethods-remove");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
index 774accc..718eee8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -63,11 +63,11 @@
return false;
}
-
+
public void ejbRemove() throws RemoteException {}
public void ejbActivate() {}
public void ejbPassivate() {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
index fd7c176..2ded14e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,21 +33,21 @@
public HereLocalBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HereLocalBean::ejbCreate !!");
+ System.out.println("In HereLocalBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void test() {
- System.out.println("In HereLocalBean::test !!");
+ System.out.println("In HereLocalBean::test !!");
}
public void ejbRemove()
throws RemoteException
{
- System.out.println("In HereLocalBean::ejbRemove !!");
+ System.out.println("In HereLocalBean::ejbRemove !!");
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml
index 5fa25f1..a78b382 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/build.xml
@@ -29,15 +29,15 @@
&reporting;
<target name="all">
- <antcall target="finder"/>
+ <antcall target="finder"/>
<antcall target="readonly"/>
- <antcall target="simple"/>
- <antcall target="simple_nopackage"/>
+ <antcall target="simple"/>
+ <antcall target="simple_nopackage"/>
<antcall target="twolevel"/>
- <antcall target="txtests"/>
- <antcall target="thread_pool_id"/>
+ <antcall target="txtests"/>
+ <antcall target="thread_pool_id"/>
<!-- These tests need to be fixed
- <antcall target="handle"/>
+ <antcall target="handle"/>
-->
</target>
@@ -91,19 +91,19 @@
</target>
<target name="usage">
- <echo>
- Usage:
+ <echo>
+ Usage:
ant all (Executes all the ejb-bmp tests)
ant finder
- ant handle
- ant readonly
- ant simple
+ ant handle
+ ant readonly
+ ant simple
ant simple_nopackage
- ant twolevel
- ant txtests
- ant thread_pool_id
-
- </echo>
+ ant twolevel
+ ant txtests
+ ant thread_pool_id
+
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties
index 30cd936..5018c1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-finder"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml
index 75cf674..d6a3f0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,18 +68,18 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java
index eee06da..d37af19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/client/FinderClient.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -36,11 +36,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- FinderClient client = new FinderClient();
+ public static void main(String[] args) {
+ FinderClient client = new FinderClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -60,12 +60,12 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Course intro = cHome.findByPrimaryKey("777");
@@ -76,14 +76,14 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
private void test02() {
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
ArrayList list = cHome.findAllCourses();
@@ -94,6 +94,6 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
index 825f577..fef372a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
@@ -330,7 +330,7 @@
<method-params />
</method>
- <!-- methods for Student EJB -->
+ <!-- methods for Student EJB -->
<method>
<ejb-name>FinderStudentBean</ejb-name>
@@ -671,6 +671,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
index 3c3b739..34bc204 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
index daf34c6..c6481ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
@@ -89,7 +89,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-finderDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
@@ -235,7 +235,7 @@
con.close();
}
- private ArrayList selectAllCourses()
+ private ArrayList selectAllCourses()
throws SQLException {
String selectStatement =
@@ -243,7 +243,7 @@
"from FinderEnrollment ";
Connection con = dataSource.getConnection();
- Statement stmt =
+ Statement stmt =
con.createStatement();
ResultSet rs = stmt.executeQuery(selectStatement);
@@ -276,7 +276,7 @@
try {
// In BMP, can't get timer service or call timer service methods
- TimerService ts = context.getTimerService();
+ TimerService ts = context.getTimerService();
throw new EJBException("should have gotten timer service method " +
" illegal state exception ");
} catch(IllegalStateException ise) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
index 1e5b712..b58f2ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
@@ -30,13 +30,13 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
public java.util.ArrayList findAllCourses()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
index 26bd031..c14d966 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
index 44292d7..4932d79 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.finder.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -26,7 +26,7 @@
import java.io.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-finderDB";
private SessionContext context;
@@ -61,7 +61,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -74,7 +74,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -164,7 +164,7 @@
String insertStatement =
"insert into FinderEnrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -174,7 +174,7 @@
prepStmt.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
String deleteStatement =
@@ -217,13 +217,13 @@
prepStmt.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
String selectStatement =
"select studentid " +
"from FinderEnrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -239,13 +239,13 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
String selectStatement =
"select courseid " +
"from FinderEnrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
index c0b4153..d7f312b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
index 3310d76..4e70ec9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
@@ -98,7 +98,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-finderDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
index 4925aa9..884da5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql
index 2a88a12..3209ac1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/create_pointbase.sql
@@ -1,45 +1,45 @@
-create table FinderStudent
-(studentid varchar(3) constraint pk_FinderStudent primary key not null,
-name varchar(36));
-
-insert into FinderStudent
-values ('123', 'Sal Jones');
-insert into FinderStudent
-values ('221', 'Alice Smith');
-insert into FinderStudent
-values ('388', 'Elizabeth Willis');
-insert into FinderStudent
-values ('456', 'Joe Smith');
-
-
-create table FinderCourse
-(courseid varchar(3) constraint pk_FinderCourse primary key not null,
-name varchar(36));
-
-insert into FinderCourse
-values ('999', 'Advanced Java Programming');
-insert into FinderCourse
-values ('111', 'J2EE for Smart People');
-insert into FinderCourse
-values ('333', 'XML Made Easy');
-insert into FinderCourse
-values ('777', 'An Introduction to Java Programming');
-
-create table FinderEnrollment
-(studentid varchar(3),
-courseid varchar(3),
-constraint fk_studentid
-foreign key (studentid)
-references FinderStudent(studentid),
-constraint fk_courseid
-foreign key (courseid)
-references FinderCourse(courseid));
-
-insert into FinderEnrollment
-values ('123', '777');
-insert into FinderEnrollment
-values ('221', '777');
-insert into FinderEnrollment
-values ('388', '777');
-insert into FinderEnrollment
-values ('456', '777');
+create table FinderStudent
+(studentid varchar(3) constraint pk_FinderStudent primary key not null,
+name varchar(36));
+
+insert into FinderStudent
+values ('123', 'Sal Jones');
+insert into FinderStudent
+values ('221', 'Alice Smith');
+insert into FinderStudent
+values ('388', 'Elizabeth Willis');
+insert into FinderStudent
+values ('456', 'Joe Smith');
+
+
+create table FinderCourse
+(courseid varchar(3) constraint pk_FinderCourse primary key not null,
+name varchar(36));
+
+insert into FinderCourse
+values ('999', 'Advanced Java Programming');
+insert into FinderCourse
+values ('111', 'J2EE for Smart People');
+insert into FinderCourse
+values ('333', 'XML Made Easy');
+insert into FinderCourse
+values ('777', 'An Introduction to Java Programming');
+
+create table FinderEnrollment
+(studentid varchar(3),
+courseid varchar(3),
+constraint fk_studentid
+foreign key (studentid)
+references FinderStudent(studentid),
+constraint fk_courseid
+foreign key (courseid)
+references FinderCourse(courseid));
+
+insert into FinderEnrollment
+values ('123', '777');
+insert into FinderEnrollment
+values ('221', '777');
+insert into FinderEnrollment
+values ('388', '777');
+insert into FinderEnrollment
+values ('456', '777');
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql
index 136a556..326bb68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/sql/drop_pointbase.sql
@@ -1,3 +1,3 @@
-drop table FinderEnrollment;
-drop table FinderStudent;
-drop table FinderCourse;
+drop table FinderEnrollment;
+drop table FinderStudent;
+drop table FinderCourse;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml
index 0231fab..b092fc0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/build.xml
@@ -28,11 +28,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant mix (Executes the ejb-bm-handle mix tests)
- ant all (Executes all the ejb-bmp-handle tests)
- </echo>
+ <echo>
+ Usage:
+ ant mix (Executes the ejb-bm-handle mix tests)
+ ant all (Executes all the ejb-bmp-handle tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties
index be2b680..96d061b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-handle"/>
-<property name="appname" value="${module}-mix"/>
+<property name="appname" value="${module}-mix"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml
index d680a55..5940b3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,18 +68,18 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java
index ee36835..a481b73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/client/HandleClient.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -36,11 +36,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- HandleClient client = new HandleClient();
+ public static void main(String[] args) {
+ HandleClient client = new HandleClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -50,15 +50,15 @@
Context initialCtx = new InitialContext();
Object objref = initialCtx.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome enrollerHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome enrollerHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
test02(initialCtx, enrollerHome);
test03(initialCtx, enrollerHome);
test04(initialCtx, enrollerHome);
test05(initialCtx, enrollerHome);
-
+
stat.printSummary("HandleClient");
} catch (Exception ex) {
System.out.println("Exception in runTestClient: " + ex.toString());
@@ -71,8 +71,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Student denise = sHome.create("823", "Denise Smith");
@@ -81,8 +81,8 @@
sHome.create("388", "A smart programmer");
objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
Course power = cHome.create("220", "Power J2EE Programming");
@@ -90,8 +90,8 @@
cHome.create("777", "Design Patterns");
objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -110,7 +110,7 @@
System.out.println(courseId + " " + course.getName());
}
System.out.println();
-
+
Course intro = cHome.findByPrimaryKey("777");
System.out.println(intro.getName() + ":");
courses = intro.getStudentIds();
@@ -120,14 +120,14 @@
Student student = sHome.findByPrimaryKey(studentId);
System.out.println(studentId + " " + student.getName());
}
-
+
stat.addStatus("Bmp HandleClient", stat.PASS);
} catch (Exception ex) {
stat.addStatus("Bmp HandleClient", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
private void test02(Context initialCtx, EnrollerHome enrollerHome) {
try {
@@ -181,4 +181,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
index d9222cd..e69d5d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
@@ -325,7 +325,7 @@
<method-params />
</method>
- <!-- methods for Student EJB -->
+ <!-- methods for Student EJB -->
<method>
<ejb-name>HandleStudentBean</ejb-name>
@@ -666,6 +666,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
index 1907a65..8db9217 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
index 1687d68..86c8c81 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
@@ -105,7 +105,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-handle-mixDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
index d01c797..8fe23ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
@@ -30,12 +30,12 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
index 0a580d4..c1fe1bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
index 5c9d7b3..9af3fe5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -26,7 +26,7 @@
import java.io.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-handle-mixDB";
private SessionContext context;
@@ -61,7 +61,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -74,7 +74,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -143,8 +143,8 @@
} catch (SQLException ex) {
throw new EJBException("ejbPassivate Exception: " + ex.getMessage());
} finally {
- con = null;
- }
+ con = null;
+ }
}
public void setSessionContext(SessionContext context) {
@@ -166,7 +166,7 @@
String insertStatement =
"insert into HandleEnrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -176,7 +176,7 @@
prepStmt.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
String deleteStatement =
@@ -219,13 +219,13 @@
prepStmt.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
String selectStatement =
"select studentid " +
"from HandleEnrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -241,13 +241,13 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
String selectStatement =
"select courseid " +
"from HandleEnrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
@@ -303,7 +303,7 @@
Object objref = initial.lookup("java:comp/env/ejb/Student");
StudentHome studentHome =
(StudentHome) PortableRemoteObject.narrow(objref, StudentHome.class);
-
+
HomeHandle homeHandle = studentHome.getHomeHandle();
StringBuffer sbuf = new StringBuffer("BEGIN: testStudentHomeHandle");
HomeHandle retHomeHandle = doHomeHandleTest(homeHandle, sbuf, "testStudentHomeHandle");
@@ -324,7 +324,7 @@
Object objref = initial.lookup("java:comp/env/ejb/Student");
StudentHome studentHome =
(StudentHome) PortableRemoteObject.narrow(objref, StudentHome.class);
-
+
Student student = studentHome.findByPrimaryKey(studentID);
Handle handle = student.getHandle();
StringBuffer sbuf = new StringBuffer("BEGIN: testStudentHandle");
@@ -343,7 +343,7 @@
private HomeHandle doHomeHandleTest(HomeHandle handle, StringBuffer sbuf, String msg)
throws Exception
{
-
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(handle);
@@ -363,7 +363,7 @@
private Handle doHandleTest(Handle handle, StringBuffer sbuf, String msg)
throws Exception
{
-
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(handle);
@@ -380,7 +380,7 @@
return newHandle;
}
- private boolean isSame(HomeHandle h1, HomeHandle h2)
+ private boolean isSame(HomeHandle h1, HomeHandle h2)
throws RemoteException
{
EJBMetaData meta1 = h1.getEJBHome().getEJBMetaData();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
index 088eef4..ec71b9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
index 7367ef7..477ebe5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
@@ -98,7 +98,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-handle-mixDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
index a255dca..e09d677 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql
index 6fdfb2b..af4015d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/sql/create_pointbase.sql
@@ -1,15 +1,15 @@
Drop table HandleStudent;
create table HandleStudent
-(studentid varchar(3) primary key not null,
+(studentid varchar(3) primary key not null,
name varchar(36));
Drop table HandleCourse;
create table HandleCourse
-(courseid varchar(3) primary key not null,
+(courseid varchar(3) primary key not null,
name varchar(36));
Drop table HandleEnrollment;
create table HandleEnrollment
-(courseid varchar(3),
+(courseid varchar(3),
studentid varchar(36));
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties
index d273d8d..6e7c94c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-readonly"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml
index 2b00d83..5111402 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,23 +48,23 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
-
+
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-common">
+ <antcall target="runclient-common">
</antcall>
</target>
@@ -73,14 +73,14 @@
<param name="appclient.application.args" value="400 10 5 250"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
index 2c87087..c398a41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
@@ -26,7 +26,7 @@
import jakarta.ejb.CreateException;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -43,9 +43,9 @@
private int numPKs_ = 1;
private long sleepTimeInMillis_ = 100;
- public static void main(String[] args) {
+ public static void main(String[] args) {
- ReadOnlyClient client = new ReadOnlyClient();
+ ReadOnlyClient client = new ReadOnlyClient();
if( args.length == 4 ) {
@@ -54,16 +54,16 @@
int numPKs = Integer.parseInt(args[2]);
long sleepTimeInMillis = Long.parseLong(args[3]);
client.runThreadTest(numIterations, numThreads, numPKs,
- sleepTimeInMillis);
+ sleepTimeInMillis);
} else {
- client.runTestClient();
+ client.runTestClient();
}
// run the tests
-
+
}
- public void runTestClient() {
+ public void runTestClient() {
try{
stat.addDescription("Testing Bmp ReadOnlyClient app.");
@@ -85,7 +85,7 @@
}
public void runThreadTest(int numIterations, int numThreads, int numPKs,
- long sleepTimeInMillis) {
+ long sleepTimeInMillis) {
numIterations_ = numIterations;
numThreads_ = numThreads;
@@ -93,7 +93,7 @@
sleepTimeInMillis_ = sleepTimeInMillis;
try{
- stat.addDescription("Bmp ReadOnlyClient thread test");
+ stat.addDescription("Bmp ReadOnlyClient thread test");
test12();
stat.printSummary("ReadOnlyClient");
} catch (Exception ex) {
@@ -106,8 +106,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
try {
@@ -119,7 +119,7 @@
stat.addStatus("Bmp-ReadOnly Student ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -133,8 +133,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCourse");
- CourseHome cHome =
- (CourseHome) PortableRemoteObject.narrow(objref,
+ CourseHome cHome =
+ (CourseHome) PortableRemoteObject.narrow(objref,
CourseHome.class);
try {
@@ -146,7 +146,7 @@
stat.addStatus("Bmp-ReadOnly Course ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -161,8 +161,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -180,15 +180,15 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
private void test04() {
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -227,8 +227,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
@@ -250,17 +250,17 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
boolean status = enroller.canGetReadOnlyBeanLocalNotifier(true);
if (status == true) {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
stat.PASS);
} else {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewNotifier ",
stat.FAIL);
}
} catch (Exception ex) {
@@ -275,22 +275,22 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
- boolean status = enroller.testReadOnlyBeanLocalStudentRefresh("student0",
+ boolean status = enroller.testReadOnlyBeanLocalStudentRefresh("student0",
true);
if (status == true) {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
stat.PASS);
} else {
- stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocal-NewStudentRefresh ",
stat.FAIL);
}
} catch (Exception ex) {
- stat.addStatus("Bmp-ReadOnly SFSBLocalNotifierRefresh ",
+ stat.addStatus("Bmp-ReadOnly SFSBLocalNotifierRefresh ",
stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
@@ -302,17 +302,17 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHomeMutable mutableStudentHome =
- (StudentHomeMutable) PortableRemoteObject.narrow(objref,
+ StudentHomeMutable mutableStudentHome =
+ (StudentHomeMutable) PortableRemoteObject.narrow(objref,
StudentHomeMutable.class);
Student newStudent = mutableStudentHome.create("999", "Joe Schmo");
- Student readOnlyStudent =
+ Student readOnlyStudent =
readOnlyStudentHome.findByPrimaryKey("999");
String name1 = newStudent.getName();
String readOnlyName1 = readOnlyStudent.getName();
@@ -343,9 +343,9 @@
// to create a new instance of the bean and call ejbLoad on it.
// So, only use name1 and name2 to decide if test passed.
if (name1.equals(readOnlyName1) && name2.equals(readOnlyName2) &&
- name1.equals(readOnlyName1Tx) &&
+ name1.equals(readOnlyName1Tx) &&
name2.equals(readOnlyName2Tx)) {
-
+
stat.addStatus("Bmp-ReadOnly ReadMostly ", stat.PASS);
} else {
stat.addStatus("Bmp-ReadOnly ReadMostly ", stat.FAIL);
@@ -357,7 +357,7 @@
stat.addStatus("Bmp-ReadOnly ReadMostly ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private void test12() {
@@ -366,7 +366,7 @@
System.out.println("Num Iterations = " + numIterations_);
System.out.println("Num Threads = " + numThreads_);
System.out.println("Num PKs = " + numPKs_);
- System.out.println("Sleep time in milliseconds = " +
+ System.out.println("Sleep time in milliseconds = " +
sleepTimeInMillis_);
int numWriterIterations = numIterations_ / 100;
@@ -374,34 +374,34 @@
System.out.println("Num writer iterations = " +
numWriterIterations);
- System.out.println("Writer sleep time in milliseconds = " +
+ System.out.println("Writer sleep time in milliseconds = " +
writerSleepTimeInMillis);
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHomeMutable mutableStudentHome =
- (StudentHomeMutable) PortableRemoteObject.narrow(objref,
+ StudentHomeMutable mutableStudentHome =
+ (StudentHomeMutable) PortableRemoteObject.narrow(objref,
StudentHomeMutable.class);
-
+
Student[] newStudents = new Student[numPKs_];
Student[] readOnlyStudents = new Student[numPKs_];
Thread[] readers = new Thread[numThreads_ * numPKs_];
Thread[] writers = new Thread[numPKs_];
for(int i = 0; i < numPKs_; i++) {
- newStudents[i] =
+ newStudents[i] =
mutableStudentHome.create("ReaderThread" + i, "ABC" + i);
- readOnlyStudents[i] =
+ readOnlyStudents[i] =
readOnlyStudentHome.findByPrimaryKey("ReaderThread" + i);
- System.out.println("Creating student " +
+ System.out.println("Creating student " +
readOnlyStudents[i].getPrimaryKey());
- writers[i] = new WriterThread(newStudents[i],
+ writers[i] = new WriterThread(newStudents[i],
numWriterIterations,
writerSleepTimeInMillis);
for(int j = 0; j < numThreads_; j++) {
@@ -409,21 +409,21 @@
int threadIndex = i*numThreads_ + j;
System.out.println("Thread index = " + threadIndex);
readers[threadIndex] = new ReaderThread
- (readOnlyStudents[i], numIterations_,
+ (readOnlyStudents[i], numIterations_,
sleepTimeInMillis_);
}
}
-
+
for(int i = 0; i < readers.length; i++) {
System.out.println("Starting reader thread " + i);
readers[i].start();
- }
-
+ }
+
for(int i = 0; i < writers.length; i++) {
System.out.println("Starting writer thread " + i);
writers[i].start();
- }
-
+ }
+
System.out.println("Joining on " + readers.length + " readers");
for(int i = 0; i < readers.length; i++) {
readers[i].join();
@@ -432,8 +432,8 @@
for(int i = 0; i < writers.length; i++) {
writers[i].join();
}
-
-
+
+
stat.addStatus("Bmp-ReadOnly ReaderThreads ", stat.PASS);
System.out.println("Removing all students");
@@ -445,24 +445,24 @@
stat.addStatus("Bmp-ReadOnly ReaderThreads ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private class ReaderThread extends Thread {
- Student readOnlyStudent_;
+ Student readOnlyStudent_;
int numReads_;
long sleepTimeInMillis_;
- String studentPK_;
+ String studentPK_;
- ReaderThread(Student readOnlyStudent, int numReads,
+ ReaderThread(Student readOnlyStudent, int numReads,
long sleepTimeInMillis) {
- readOnlyStudent_ = readOnlyStudent;
+ readOnlyStudent_ = readOnlyStudent;
numReads_ = numReads;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
+ public void run() {
for( int i = 0; i < numReads_; i++) {
try {
if( i == 0 ) {
@@ -482,20 +482,20 @@
private class WriterThread extends Thread {
- Student mutableStudent_;
+ Student mutableStudent_;
int numWrites_;
long sleepTimeInMillis_;
String studentPK_;
- WriterThread(Student mutableStudent, int numWrites,
+ WriterThread(Student mutableStudent, int numWrites,
long sleepTimeInMillis) {
- mutableStudent_ = mutableStudent;
+ mutableStudent_ = mutableStudent;
numWrites_ = numWrites;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
- for( int i = 0; i < numWrites_; i++) {
+ public void run() {
+ for( int i = 0; i < numWrites_; i++) {
try {
if( i == 0 ) {
studentPK_ = (String) mutableStudent_.getPrimaryKey();
@@ -514,4 +514,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
index a1921fa..991ad84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
@@ -368,7 +368,7 @@
<method-params />
</method>
- <!-- methods for Student EJB -->
+ <!-- methods for Student EJB -->
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
@@ -929,6 +929,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
index e75ee64..05903fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
index f59e86b..c467939 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
@@ -105,7 +105,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-readonlyDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
index a75e2df..8060ddb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
@@ -30,12 +30,12 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
index 48f0fd4..aaedf82 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
index e1d41cb..b8d3773 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.bmp.readonly.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -26,7 +26,7 @@
import java.io.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-readonlyDB";
private DataSource ds;
@@ -62,7 +62,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -75,7 +75,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -127,11 +127,11 @@
}
public void ejbActivate() {
-
+
}
public void ejbPassivate() {
-
+
}
public void setSessionContext(SessionContext context) {
@@ -140,14 +140,14 @@
public EnrollerBean() {}
- /*********************** Database Routines *************************/
+ /*********************** Database Routines *************************/
private void insertEntry(String studentId, String courseId)
throws SQLException {
Connection con = ds.getConnection();
String insertStatement =
"insert into ReadOnlyEnrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -158,7 +158,7 @@
con.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
Connection con = ds.getConnection();
@@ -207,14 +207,14 @@
con.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
Connection con = ds.getConnection();
String selectStatement =
"select studentid " +
"from ReadOnlyEnrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -231,14 +231,14 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
Connection con = ds.getConnection();
String selectStatement =
"select courseid " +
"from ReadOnlyEnrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
@@ -283,7 +283,7 @@
}
return status;
}
-
+
public boolean testReadOnlyBeanLocalCreate(String studentId, String name) {
boolean status = false;
@@ -293,13 +293,13 @@
studentLocalHome.create(studentId, name);
System.out.println("Error. Should have gotten CreateException in"
- + " testReadOnlyBeanLocalCreate");
+ + " testReadOnlyBeanLocalCreate");
} catch(CreateException ce) {
System.out.println("Successfully got CreateException when " +
"attempting to create a read-only bean");
status = true;
} catch(Exception e) {
- System.out.println("Got unexpected exception in " +
+ System.out.println("Got unexpected exception in " +
"testReadOnlyBeanLocalCreate");
e.printStackTrace();
}
@@ -316,7 +316,7 @@
com.sun.appserv.ejb.ReadOnlyBeanNotifier
notifier = com.sun.appserv.ejb.ReadOnlyBeanHelper.
getReadOnlyBeanNotifier("java:comp/env/ejb/Student");
-
+
notifier.refresh(studentId);
status = true;
} else {
@@ -324,7 +324,7 @@
}
} catch (Exception ex) {
System.err.println("******* testReadOnlyBeanStudentRefresh ****");
- ex.printStackTrace();
+ ex.printStackTrace();
System.err.println("******* testReadOnlyBeanStudentRefresh ****");
}
@@ -341,7 +341,7 @@
com.sun.appserv.ejb.ReadOnlyBeanLocalNotifier
notifier = com.sun.appserv.ejb.ReadOnlyBeanHelper.
getReadOnlyBeanLocalNotifier("java:comp/env/ejb/StudentLocal");
-
+
notifier.refresh(studentId);
status = true;
} else {
@@ -349,7 +349,7 @@
}
} catch (Exception ex) {
System.err.println("******* testReadOnlyBeanLocalStudentRefresh ****");
- ex.printStackTrace();
+ ex.printStackTrace();
System.err.println("******* testReadOnlyBeanLocalStudentRefresh ****");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
index 0e508b2..f0bb27e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
index 245d425..1234819 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
@@ -69,10 +69,10 @@
try {
System.out.println("Notifying read-only bean of update to " +
"read-mostly Student " + name);
- ReadOnlyBeanNotifier studentNotifier =
+ ReadOnlyBeanNotifier studentNotifier =
ReadOnlyBeanHelper.getReadOnlyBeanNotifier
("java:comp/env/ejb/ReadOnlyStudent");
-
+
// Update read-only version
studentNotifier.refresh(studentId);
} catch(Exception e) {
@@ -123,7 +123,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-readonlyDB");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/Enroller");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
index 5b8c498..cda97ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
index 7d2fd28..d05703c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
@@ -20,12 +20,12 @@
import jakarta.ejb.EJBLocalObject;
public interface StudentLocal extends EJBLocalObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
- *
+ *
*/
public ArrayList getCourseIds();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
index c79588f..7fca5c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql
index f7af5c8..7ee9fcf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/create_pointbase.sql
@@ -1,45 +1,45 @@
-create table ReadOnlyStudent
-(studentid varchar(15) constraint pk_ReadOnlystudent primary key not null,
-name varchar(36));
-
-insert into ReadOnlyStudent
-values ('student0', 'Student_ID_0');
-insert into ReadOnlyStudent
-values ('student1', 'Student_ID_1');
-insert into ReadOnlyStudent
-values ('student2', 'Student_ID_2');
-insert into ReadOnlyStudent
-values ('student3', 'Student_ID_3');
-insert into ReadOnlyStudent
-values ('student4', 'Student_ID_4');
-insert into ReadOnlyStudent
-values ('student5', 'Student_ID_5');
-
-
-create table ReadOnlyCourse
-(courseid varchar(15) constraint pk_ReadOnlycourse primary key not null,
-name varchar(36));
-
-insert into ReadOnlyCourse
-values ('course0', 'Course_ID_0');
-insert into ReadOnlyCourse
-values ('course1', 'Course_ID_1');
-insert into ReadOnlyCourse
-values ('course2', 'Course_ID_2');
-insert into ReadOnlyCourse
-values ('course3', 'Course_ID_3');
-insert into ReadOnlyCourse
-values ('course4', 'Course_ID_4');
-insert into ReadOnlyCourse
-values ('course5', 'Course_ID_5');
-
-create table ReadOnlyEnrollment
-(studentid varchar(15),
-courseid varchar(15),
-constraint fk_studentid
-foreign key (studentid)
-references ReadOnlystudent(studentid),
-constraint fk_courseid
-foreign key (courseid)
-references ReadOnlycourse(courseid));
-
+create table ReadOnlyStudent
+(studentid varchar(15) constraint pk_ReadOnlystudent primary key not null,
+name varchar(36));
+
+insert into ReadOnlyStudent
+values ('student0', 'Student_ID_0');
+insert into ReadOnlyStudent
+values ('student1', 'Student_ID_1');
+insert into ReadOnlyStudent
+values ('student2', 'Student_ID_2');
+insert into ReadOnlyStudent
+values ('student3', 'Student_ID_3');
+insert into ReadOnlyStudent
+values ('student4', 'Student_ID_4');
+insert into ReadOnlyStudent
+values ('student5', 'Student_ID_5');
+
+
+create table ReadOnlyCourse
+(courseid varchar(15) constraint pk_ReadOnlycourse primary key not null,
+name varchar(36));
+
+insert into ReadOnlyCourse
+values ('course0', 'Course_ID_0');
+insert into ReadOnlyCourse
+values ('course1', 'Course_ID_1');
+insert into ReadOnlyCourse
+values ('course2', 'Course_ID_2');
+insert into ReadOnlyCourse
+values ('course3', 'Course_ID_3');
+insert into ReadOnlyCourse
+values ('course4', 'Course_ID_4');
+insert into ReadOnlyCourse
+values ('course5', 'Course_ID_5');
+
+create table ReadOnlyEnrollment
+(studentid varchar(15),
+courseid varchar(15),
+constraint fk_studentid
+foreign key (studentid)
+references ReadOnlystudent(studentid),
+constraint fk_courseid
+foreign key (courseid)
+references ReadOnlycourse(courseid));
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql
index 6b0a6e4..8067490 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/sql/drop_pointbase.sql
@@ -1,3 +1,3 @@
-drop table ReadOnlyEnrollment;
-drop table ReadOnlyStudent;
-drop table ReadOnlyCourse;
+drop table ReadOnlyEnrollment;
+drop table ReadOnlyStudent;
+drop table ReadOnlyCourse;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties
index 3feb379..9668068 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml
index a78fa40..93a24bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,34 +48,34 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java
index 5f0749e..e4bdca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/client/SimpleBMPClient.java
@@ -35,19 +35,19 @@
{
try {
stat.addDescription("Testing bmp simple app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
+
int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- SimpleBMP simpleBMP = simpleBMPHome.create(id);
- simpleBMP.foo();
-
+ System.out.println("Starting test for id: " + id);
+ SimpleBMP simpleBMP = simpleBMPHome.create(id);
+ simpleBMP.foo();
+
SimpleBMP bean = simpleBMPHome.findByPrimaryKey(new Integer(id));
- simpleBMP.foo();
- System.out.println("Done for id: " + id);
+ simpleBMP.foo();
+ System.out.println("Done for id: " + id);
stat.addStatus("bmp simple", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml
index fae4e84..cfe0d69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
index b5eb26d..e619bc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
@@ -31,148 +31,148 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbCreate....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public boolean isServicedBy(String threadPoolID) {
System.out.println("[**SimpleBMPBean**] "
- + ". Request serviced by:" + Thread.currentThread());
+ + ". Request serviced by:" + Thread.currentThread());
String threadID = Thread.currentThread().toString().toLowerCase();
- return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
+ return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
}
public void foo() {
System.out.println("[**SimpleBMPBean**] ["
- + Thread.currentThread() + "] Done with foo....");
+ + Thread.currentThread() + "] Done with foo....");
}
public Integer ejbFindByPrimaryKey(Integer key) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
- return key;
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
+ return key;
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties
index 1cf3c76..cc90249 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simple_nopackage"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml
index 59aabb9..05bc931 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Test.class, **/TestHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,21 +68,21 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml
index 58b34ae..161e383 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/ejb-jar.xml
@@ -20,28 +20,28 @@
<ejb-jar>
<enterprise-beans>
- <entity>
- <ejb-name>Test</ejb-name>
- <home>TestHome</home>
- <remote>Test</remote>
- <ejb-class>TestBMP</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>False</reentrant>
- <resource-ref>
- <res-ref-name>DataSource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- </entity>
+ <entity>
+ <ejb-name>Test</ejb-name>
+ <home>TestHome</home>
+ <remote>Test</remote>
+ <ejb-class>TestBMP</ejb-class>
+ <persistence-type>Bean</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>False</reentrant>
+ <resource-ref>
+ <res-ref-name>DataSource</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ </entity>
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
- <method>
- <ejb-name>Test</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
+ <method>
+ <ejb-name>Test</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml
index 3f74e4c..76e57e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/descriptor/sun-ejb-jar.xml
@@ -24,8 +24,8 @@
<ejb-name>Test</ejb-name>
<jndi-name>ejb/Test</jndi-name>
<resource-ref>
- <res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/__default</jndi-name>
+ <res-ref-name>DataSource</res-ref-name>
+ <jndi-name>jdbc/__default</jndi-name>
</resource-ref>
<pass-by-reference>false</pass-by-reference>
<is-read-only-bean>false</is-read-only-bean>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
index 029a59b..c2f4986 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
@@ -27,40 +27,40 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[TestBMP] Done ejbCreate()....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public void foo() {
@@ -68,100 +68,100 @@
}
public Integer ejbFindByPrimaryKey(int i) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, i);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, i);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
System.out.println("[TestBMP] Done ejbFindByPrimaryKey()....");
- return new Integer(i);
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ return new Integer(i);
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
System.out.println("[TestBMP] Done ejbLoad()....");
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[TestBMP] Done ejbStore()....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties
index 03b394d..ff3103b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-thread-pool-id"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml
index 1ae0cc2..e5b8c9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,52 +48,52 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
- <echo message="asadmin create-threadpool ${as.props} express-service-thread-pool"/>
- <exec executable="${ASADMIN}" >
- <arg line="create-threadpool "/>
- <arg line="${as.props}"/>
- <arg line="express-service-thread-pool"/>
- </exec>
- <antcall target="restart-server-instance-common"/>
- <!--<exec executable="${ASADMIN}" >
- <arg line="stop-domain"/>
- </exec>
- <exec executable="${ASADMIN}" >
- <arg line="start-domain"/>
- </exec>-->
+ <echo message="asadmin create-threadpool ${as.props} express-service-thread-pool"/>
+ <exec executable="${ASADMIN}" >
+ <arg line="create-threadpool "/>
+ <arg line="${as.props}"/>
+ <arg line="express-service-thread-pool"/>
+ </exec>
+ <antcall target="restart-server-instance-common"/>
+ <!--<exec executable="${ASADMIN}" >
+ <arg line="stop-domain"/>
+ </exec>
+ <exec executable="${ASADMIN}" >
+ <arg line="start-domain"/>
+ </exec>-->
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- <echo message="asadmin delete-threadpool ${as.props} express-service-thread-pool"/>
- <exec executable="${ASADMIN}" >
- <arg line="delete-threadpool "/>
- <arg line="${as.props}"/>
- <arg line="express-service-thread-pool"/>
- </exec>
- <antcall target="restart-server-instance-common"/>
+ <echo message="asadmin delete-threadpool ${as.props} express-service-thread-pool"/>
+ <exec executable="${ASADMIN}" >
+ <arg line="delete-threadpool "/>
+ <arg line="${as.props}"/>
+ <arg line="express-service-thread-pool"/>
+ </exec>
+ <antcall target="restart-server-instance-common"/>
<!--
<antcall target="undeploy-jdbc-common">
@@ -102,7 +102,7 @@
</antcall>
-->
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java
index 5e6ed8c..7136e4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/client/SimpleBMPClient.java
@@ -35,19 +35,19 @@
{
try {
stat.addDescription("Testing bmp simple app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
- int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- SimpleBMP simpleBMP = simpleBMPHome.create(id);
- boolean threadPoolIDTestStatus =
- simpleBMP.isServicedBy("express-service-thread-pool");
+ int id= (int) System.currentTimeMillis();
+ System.out.println("Starting test for id: " + id);
+ SimpleBMP simpleBMP = simpleBMPHome.create(id);
+
+ boolean threadPoolIDTestStatus =
+ simpleBMP.isServicedBy("express-service-thread-pool");
stat.addStatus("bmp ThreadPoolTest",
- ((threadPoolIDTestStatus == true) ? stat.PASS : stat.FAIL));
+ ((threadPoolIDTestStatus == true) ? stat.PASS : stat.FAIL));
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("bmp simple", stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml
index fae4e84..cfe0d69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
index b5eb26d..e619bc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
@@ -31,148 +31,148 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbCreate....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public boolean isServicedBy(String threadPoolID) {
System.out.println("[**SimpleBMPBean**] "
- + ". Request serviced by:" + Thread.currentThread());
+ + ". Request serviced by:" + Thread.currentThread());
String threadID = Thread.currentThread().toString().toLowerCase();
- return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
+ return (threadID.indexOf(threadPoolID.toLowerCase()) != -1);
}
public void foo() {
System.out.println("[**SimpleBMPBean**] ["
- + Thread.currentThread() + "] Done with foo....");
+ + Thread.currentThread() + "] Done with foo....");
}
public Integer ejbFindByPrimaryKey(Integer key) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
- return key;
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
+ return key;
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties
index 0eba91b..0a63f26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-twolevel"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml
index a887fe9..f600c3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/StatelessHome.class, **/Stateless.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -68,21 +68,21 @@
-->
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java
index 9e592f9..7a38712 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/client/TwoLevelClient.java
@@ -35,21 +35,21 @@
{
try {
stat.addDescription("Testing bmp twolevel app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/StatelessHome");
- StatelessHome statelessHome = (StatelessHome)
+ StatelessHome statelessHome = (StatelessHome)
javax.rmi.PortableRemoteObject.narrow(objRef, StatelessHome.class);
- Stateless stateless = statelessHome.create();
-
+ Stateless stateless = statelessHome.create();
+
int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- stateless.createBMP(new Integer(id));
- System.out.println("Done for id: " + id);
-
- System.out.println("Starting test for id: " + id+1);
- stateless.createBMPAndTest(new Integer(id+1));
- System.out.println("Done for id: " + id+1);
+ System.out.println("Starting test for id: " + id);
+ stateless.createBMP(new Integer(id));
+ System.out.println("Done for id: " + id);
+
+ System.out.println("Starting test for id: " + id+1);
+ stateless.createBMPAndTest(new Integer(id+1));
+ System.out.println("Done for id: " + id+1);
stat.addStatus("bmp twolevel", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml
index 34e654e..b2fd97b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/descriptor/ejb-jar.xml
@@ -80,6 +80,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
index 6326b5b..15aae1e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
@@ -31,41 +31,41 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int i) throws CreateException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "550-1212");
- if (ps.executeUpdate() != 1)
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "550-1212");
+ if (ps.executeUpdate() != 1)
+ throw new CreateException("Didnt create ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbCreate....");
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
- return new Integer(i);
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
+ return new Integer(i);
}
public void foo() {
@@ -73,98 +73,98 @@
}
public Integer ejbFindByPrimaryKey(Integer key) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + id);
- String phone = rs.getString(1);
- return key;
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + id);
+ String phone = rs.getString(1);
+ return key;
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbLoad() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
index 3cc403e..265831d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
@@ -34,14 +34,14 @@
public void setSessionContext(SessionContext sessionContext) {
this.sessionContext = sessionContext;
- Context context = null;
- try {
- context = new InitialContext();
- Object objRef = context.lookup("java:comp/env/ejb/SimpleBMPHome");
- bmpHome = (SimpleBMPHome) PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
- } catch (NamingException e) {
- throw new EJBException("cant find SimpleBMPHome");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ Object objRef = context.lookup("java:comp/env/ejb/SimpleBMPHome");
+ bmpHome = (SimpleBMPHome) PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
+ } catch (NamingException e) {
+ throw new EJBException("cant find SimpleBMPHome");
+ }
}
public void createBMP(Integer key)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml
index 66ec503..485fad7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/build.xml
@@ -30,10 +30,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
+ <echo>
+ Usage:
ant all (Executes all the ejb-bmp txtests tests)
-
- </echo>
+
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties
index c3aa55d..513652b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-txtests-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml
index ac976b1..6039d4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,34 +48,34 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/CustomerInfo.class, **/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java
index 6d8a907..386406f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/client/SimpleBMPClient.java
@@ -35,19 +35,19 @@
{
try {
stat.addDescription("Testing txtests simple app.");
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
+
int id= (int) System.currentTimeMillis();
- System.out.println("Starting test for id: " + id);
- SimpleBMP simpleBMP = simpleBMPHome.create(id);
- simpleBMP.getID();
-
+ System.out.println("Starting test for id: " + id);
+ SimpleBMP simpleBMP = simpleBMPHome.create(id);
+ simpleBMP.getID();
+
SimpleBMP bean = simpleBMPHome.findByPrimaryKey(new Integer(id));
- simpleBMP.getID();
- System.out.println("Done for id: " + id);
+ simpleBMP.getID();
+ System.out.println("Done for id: " + id);
stat.addStatus("txtests simple", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml
index af908be..47cf417 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
index e171eab..531c2f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
@@ -35,12 +35,12 @@
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered setEntityContext....");
this.entityContext = entityContext;
- try {
- Context context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ try {
+ Context context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Done with setEntityContext....");
}
@@ -49,31 +49,31 @@
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbCreate(" + i + ")....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
- ps.setInt(1, i);
- ps.setString(2, "Phone_" + i);
- if (ps.executeUpdate() != 1) {
- throw new CreateException("Didnt create ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "INSERT INTO O_customer (c_id, c_phone) VALUES (?,?)");
+ ps.setInt(1, i);
+ ps.setString(2, "Phone_" + i);
+ if (ps.executeUpdate() != 1) {
+ throw new CreateException("Didnt create ejb");
}
- } catch (SQLException e) {
- throw new CreateException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
- id = i;
+ } catch (SQLException e) {
+ throw new CreateException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
+ id = i;
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Done with ejbCreate(" + i + ")....");
- return new Integer(i);
+ return new Integer(i);
}
public int getID() {
@@ -92,56 +92,56 @@
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbFindByPrimaryKey(" + key.intValue() + ")....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, key.intValue());
- ResultSet rs = ps.executeQuery();
- if (!rs.next()) {
- throw new FinderException("No cust for " + id);
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, key.intValue());
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next()) {
+ throw new FinderException("No cust for " + id);
}
- } catch (SQLException e) {
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbFindByPrimaryKey(" + key.intValue() + ")....");
- return key;
+ return key;
}
public void ejbLoad() {
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbLoad()....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_phone from O_customer where c_id = ?");
- ps.setInt(1, id);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + id);
- String phone = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_phone from O_customer where c_id = ?");
+ ps.setInt(1, id);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + id);
+ String phone = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbLoad()....");
}
@@ -149,27 +149,27 @@
public void ejbStore() {
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbStore()....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
- ps.setString(1, "550-1212");
- ps.setInt(2, id);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = ?");
+ ps.setString(1, "550-1212");
+ ps.setInt(2, id);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
System.out.println("[**SimpleBMPBean**] Done with ejbStore....");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbStore()....");
}
@@ -177,25 +177,25 @@
public void ejbRemove() throws RemoveException {
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " Entered ejbRemove()....");
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM O_customer WHERE c_id = ?");
- ps.setInt(1, id);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM O_customer WHERE c_id = ?");
+ ps.setInt(1, id);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println(_debugName + "[" + Thread.currentThread() + "]"
+ " DONE ejbRemove()....");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql
index 2c4cb65..231209d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(26)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(26)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties
index 24f681b..f403c0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-txtests-stateless"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml
index c527320..0c46002 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class, **/*SLSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
index f28da27..ca6d030 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
@@ -32,8 +32,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SLSBHome home;
@@ -46,11 +46,11 @@
client.doTest();
System.out.println("[txtests] DONE doTest()...");
stat.printSummary("txtests");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
initSLSB(); //create MAX_TIMERS
@@ -106,4 +106,4 @@
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
index 65d066a..80ca7bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
@@ -22,7 +22,7 @@
extends EJBObject
{
- public boolean doRollbackTest(int id)
+ public boolean doRollbackTest(int id)
throws java.rmi.RemoteException;
public boolean doReturnParamTest(int id)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
index 2ddf9ab..e2c855f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
@@ -26,18 +26,18 @@
import javax.rmi.PortableRemoteObject;
public class SLSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext sessionCtx;
+ private SessionContext sessionCtx;
- public void ejbCreate() {}
+ public void ejbCreate() {}
- public void setSessionContext(SessionContext sc) {
- sessionCtx = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ sessionCtx = sc;
+ }
- // business method to create a timer
- public boolean doRollbackTest(int id) {
+ // business method to create a timer
+ public boolean doRollbackTest(int id) {
boolean retVal = false;
boolean doneRollback = false;
try {
@@ -48,7 +48,7 @@
sessionCtx.getUserTransaction().begin();
entityHome.create(id);
-
+
//This must be non null
SimpleBMP entity = (SimpleBMP)
entityHome.findByPrimaryKey(new Integer(id));
@@ -78,8 +78,8 @@
}
}
- return retVal;
- }
+ return retVal;
+ }
public boolean doReturnParamTest(int id) {
@@ -92,7 +92,7 @@
sessionCtx.getUserTransaction().begin();
entityHome.create(id);
-
+
//This must be non null
SimpleBMP entity = (SimpleBMP)
entityHome.findByPrimaryKey(new Integer(id));
@@ -104,7 +104,7 @@
CustomerInfo customerInfo = entity.getCustomerInfo();
retVal = (foundID == customerInfo.getCustomerID());
-
+
} catch (Throwable th) {
th.printStackTrace();
} finally {
@@ -114,13 +114,13 @@
}
}
- return retVal;
- }
+ return retVal;
+ }
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {}
+ public void ejbActivate() {}
- public void ejbPassivate() {}
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
index 9c332eb..ea84e23 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
@@ -23,6 +23,6 @@
public interface SLSBHome
extends EJBHome
{
- SLSB create()
+ SLSB create()
throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/build.xml
index 27c51c1..f114883 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/build.xml
@@ -42,17 +42,17 @@
<target name="all">
- <antcall target="setup"/>
- <antcall target="test-all"/>
- <antcall target="unsetup"/>
+ <antcall target="setup"/>
+ <antcall target="test-all"/>
+ <antcall target="unsetup"/>
<antcall target="report"/>
</target>
<target name="lite">
- <antcall target="setup"/>
- <antcall target="test-lite"/>
- <antcall target="unsetup"/>
+ <antcall target="setup"/>
+ <antcall target="test-lite"/>
+ <antcall target="unsetup"/>
<antcall target="report-lite"/>
</target>
@@ -81,7 +81,7 @@
<target name="setup">
- <antcall target="start-database"/>
+ <antcall target="start-database"/>
<ant target="startDomain"/>
<ant target="clean-result"/>
@@ -108,16 +108,16 @@
<ant dir="stubs" target="all"/>
<ant dir="txprop" target="all"/>
- <ant dir="ejbc" target="all"/>
+ <ant dir="ejbc" target="all"/>
<ant dir="ejb30" target="all"/>
- <ant dir="mdb" target="all"/>
+ <ant dir="mdb" target="all"/>
<ant dir="cli" target="all"/>
<ant dir="timer" target="all"/>
- <ant dir="bmp" target="all"/>
- <ant dir="cmp" target="all"/>
+ <ant dir="bmp" target="all"/>
+ <ant dir="cmp" target="all"/>
<ant dir="sfsb" target="all"/>
- <ant dir="allowedmethods" target="all"/>
- <ant dir="jms" target="all"/>
+ <ant dir="allowedmethods" target="all"/>
+ <ant dir="jms" target="all"/>
<ant dir="ejb32" target="all"/>
<!-- disable as it fails on hudson ...
-->
@@ -158,7 +158,7 @@
<echo message="Stopping app server instance"/>
<ant target="stopDomain"/>
- <antcall target="stop-database"/>
+ <antcall target="stop-database"/>
<record name="ejb.output" action="stop" />
@@ -166,30 +166,30 @@
</target>
<target name="orb_integration">
- <ant dir="ejb30" target="clientview"/>
- <ant dir="ejb30" target="hello"/>
+ <ant dir="ejb30" target="clientview"/>
+ <ant dir="ejb30" target="hello"/>
<ant dir="ejbc" target="all"/>
- <ant dir="txprop" target="all"/>
- <ant dir="stubs" target="all"/>
- <ant dir="bmp" target="txtests"/>
+ <ant dir="txprop" target="all"/>
+ <ant dir="stubs" target="all"/>
+ <ant dir="bmp" target="txtests"/>
<!-- gradually reenable the existing tests as features come on line
- <ant dir="bmp" target="handle"/>
+ <ant dir="bmp" target="handle"/>
-->
</target>
<target name="start-database" depends="init-common">
<echo message="Starting database --dbport ${db.port}"/>
- <!-- spawn is added to prevent a hang on Windows -->
- <exec spawn="true" executable="${ASADMIN}" failonerror="false">
+ <!-- spawn is added to prevent a hang on Windows -->
+ <exec spawn="true" executable="${ASADMIN}" failonerror="false">
<arg line="start-database --dbport ${db.port}"/>
- </exec>
+ </exec>
</target>
<target name="stop-database" depends="init-common">
<echo message="Stopping database --dbport ${db.port}"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="false">
<arg line="stop-database --dbport ${db.port}"/>
- </exec>
+ </exec>
</target>
<target name="report-result" depends="init-common">
@@ -258,7 +258,7 @@
<record name="stubs.output" action="stop" />
<antcall target="report"/>
</target>
-
+
<target name="timer">
<record name="timer.output" action="start" />
<ant dir="timer" target="all"/>
@@ -296,23 +296,23 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb tests)
ant orb_integration (Executes all ejb-related orb integration tests
- ant allowedmethods (Executes the ejb allowedmethods tests)
- ant bmp (Executes the ejb bmp tests)
- ant ejbc (Executes the ejb ejbc tests)
- ant jms (Executes the ejb jms tests)
- ant mdb (Executes the ejb mdb tests)
- ant stubs (Executes the ejb stubs tests)
- ant timer (Executes the ejb timer tests)
- ant txprop (Executes the ejb txprop tests)
- ant sfsb (Executes the ejb sfsb tests)
- ant stress (Executes the ejb stress tests)
- ant ejb30 (Executes the ejb30 tests)
- ant ejb31 (Executes the ejb31 tests)
- </echo>
+ ant allowedmethods (Executes the ejb allowedmethods tests)
+ ant bmp (Executes the ejb bmp tests)
+ ant ejbc (Executes the ejb ejbc tests)
+ ant jms (Executes the ejb jms tests)
+ ant mdb (Executes the ejb mdb tests)
+ ant stubs (Executes the ejb stubs tests)
+ ant timer (Executes the ejb timer tests)
+ ant txprop (Executes the ejb txprop tests)
+ ant sfsb (Executes the ejb sfsb tests)
+ ant stress (Executes the ejb stress tests)
+ ant ejb30 (Executes the ejb30 tests)
+ ant ejb31 (Executes the ejb31 tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties
index 3397861..791a806 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-classload-lifecycle"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml
index 55cdf02..54ec6c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,17 +47,17 @@
<target name="build" depends="compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping.xml"/>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class,GoogleMapping.xml,META-INF/wsdl/**" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -65,10 +65,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
index 4b94bf3..bf24525 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-classload-lifecycleID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -76,8 +76,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml
index 12bfde4..0971453 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/descriptor/ejb-jar.xml
@@ -35,7 +35,7 @@
<wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
<jaxrpc-mapping-file>GoogleMapping.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
+ </service-qname>
</service-ref>
<service-ref>
<description>google service ref</description>
@@ -44,7 +44,7 @@
<wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
<jaxrpc-mapping-file>GoogleMapping.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
+ </service-qname>
</service-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java
index eb45d26..bea6a33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/DirectoryCategory.java
@@ -24,27 +24,27 @@
public class DirectoryCategory {
protected java.lang.String fullViewableName;
protected java.lang.String specialEncoding;
-
+
public DirectoryCategory() {
}
-
+
public DirectoryCategory(java.lang.String fullViewableName, java.lang.String specialEncoding) {
this.fullViewableName = fullViewableName;
this.specialEncoding = specialEncoding;
}
-
+
public java.lang.String getFullViewableName() {
return fullViewableName;
}
-
+
public void setFullViewableName(java.lang.String fullViewableName) {
this.fullViewableName = fullViewableName;
}
-
+
public java.lang.String getSpecialEncoding() {
return specialEncoding;
}
-
+
public void setSpecialEncoding(java.lang.String specialEncoding) {
this.specialEncoding = specialEncoding;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
index a92bc1b..b2310e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,7 +34,7 @@
public FooBean() {}
public void ejbCreate() {
- System.out.println("In FooBean::ejbCreate()");
+ System.out.println("In FooBean::ejbCreate()");
try {
InitialContext ic = new InitialContext();
Service service = (Service) ic.lookup("java:comp/env/service/GoogleSearch_ejbCreate");
@@ -48,8 +48,8 @@
}
public void setSessionContext(SessionContext sc) {
- System.out.println("In FooBean::setSessionContext()");
- this.sc = sc;
+ System.out.println("In FooBean::setSessionContext()");
+ this.sc = sc;
}
public void callHello() {
@@ -57,7 +57,7 @@
}
public void ejbRemove() {
- System.out.println("In FooBean::ejbRemove()");
+ System.out.println("In FooBean::ejbRemove()");
try {
InitialContext ic = new InitialContext();
Service service = (Service) ic.lookup("java:comp/env/service/GoogleSearch_ejbRemove");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java
index afd0a6775..beb040e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort.java
@@ -21,10 +21,10 @@
package com.sun.s1asdev.ejb.classload.lifecycle;
public interface GoogleSearchPort extends java.rmi.Remote {
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
java.rmi.RemoteException;
- public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
+ public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
java.rmi.RemoteException;
- public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
+ public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java
index 1aa73e0..47d734a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_Impl.java
@@ -17,21 +17,21 @@
package com.sun.s1asdev.ejb.classload.lifecycle;
public class GoogleSearchPort_Impl implements com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchPort, java.rmi.Remote {
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws
java.rmi.RemoteException {
-
+
byte[] _retVal = null;
return _retVal;
}
- public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
+ public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws
java.rmi.RemoteException {
-
+
java.lang.String _retVal = null;
return _retVal;
}
- public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
+ public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws
java.rmi.RemoteException {
-
+
com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _retVal = null;
return _retVal;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java
index 7cfdacc..00edff8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_RequestStruct.java
@@ -24,27 +24,27 @@
public class GoogleSearchPort_doGetCachedPage_RequestStruct {
protected java.lang.String key;
protected java.lang.String url;
-
+
public GoogleSearchPort_doGetCachedPage_RequestStruct() {
}
-
+
public GoogleSearchPort_doGetCachedPage_RequestStruct(java.lang.String key, java.lang.String url) {
this.key = key;
this.url = url;
}
-
+
public java.lang.String getKey() {
return key;
}
-
+
public void setKey(java.lang.String key) {
this.key = key;
}
-
+
public java.lang.String getUrl() {
return url;
}
-
+
public void setUrl(java.lang.String url) {
this.url = url;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java
index ad841c1..f80fd04 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGetCachedPage_ResponseStruct.java
@@ -23,18 +23,18 @@
public class GoogleSearchPort_doGetCachedPage_ResponseStruct {
protected byte[] _return;
-
+
public GoogleSearchPort_doGetCachedPage_ResponseStruct() {
}
-
+
public GoogleSearchPort_doGetCachedPage_ResponseStruct(byte[] _return) {
this._return = _return;
}
-
+
public byte[] get_return() {
return _return;
}
-
+
public void set_return(byte[] _return) {
this._return = _return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java
index 968cbfc..206f3e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_RequestStruct.java
@@ -32,10 +32,10 @@
protected java.lang.String lr;
protected java.lang.String ie;
protected java.lang.String oe;
-
+
public GoogleSearchPort_doGoogleSearch_RequestStruct() {
}
-
+
public GoogleSearchPort_doGoogleSearch_RequestStruct(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
this.key = key;
this.q = q;
@@ -48,83 +48,83 @@
this.ie = ie;
this.oe = oe;
}
-
+
public java.lang.String getKey() {
return key;
}
-
+
public void setKey(java.lang.String key) {
this.key = key;
}
-
+
public java.lang.String getQ() {
return q;
}
-
+
public void setQ(java.lang.String q) {
this.q = q;
}
-
+
public int getStart() {
return start;
}
-
+
public void setStart(int start) {
this.start = start;
}
-
+
public int getMaxResults() {
return maxResults;
}
-
+
public void setMaxResults(int maxResults) {
this.maxResults = maxResults;
}
-
+
public boolean isFilter() {
return filter;
}
-
+
public void setFilter(boolean filter) {
this.filter = filter;
}
-
+
public java.lang.String getRestrict() {
return restrict;
}
-
+
public void setRestrict(java.lang.String restrict) {
this.restrict = restrict;
}
-
+
public boolean isSafeSearch() {
return safeSearch;
}
-
+
public void setSafeSearch(boolean safeSearch) {
this.safeSearch = safeSearch;
}
-
+
public java.lang.String getLr() {
return lr;
}
-
+
public void setLr(java.lang.String lr) {
this.lr = lr;
}
-
+
public java.lang.String getIe() {
return ie;
}
-
+
public void setIe(java.lang.String ie) {
this.ie = ie;
}
-
+
public java.lang.String getOe() {
return oe;
}
-
+
public void setOe(java.lang.String oe) {
this.oe = oe;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java
index c0b4503..194bf92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doGoogleSearch_ResponseStruct.java
@@ -23,18 +23,18 @@
public class GoogleSearchPort_doGoogleSearch_ResponseStruct {
protected com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _return;
-
+
public GoogleSearchPort_doGoogleSearch_ResponseStruct() {
}
-
+
public GoogleSearchPort_doGoogleSearch_ResponseStruct(com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _return) {
this._return = _return;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult get_return() {
return _return;
}
-
+
public void set_return(com.sun.s1asdev.ejb.classload.lifecycle.GoogleSearchResult _return) {
this._return = _return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java
index 208146b..6f5d2c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_RequestStruct.java
@@ -24,27 +24,27 @@
public class GoogleSearchPort_doSpellingSuggestion_RequestStruct {
protected java.lang.String key;
protected java.lang.String phrase;
-
+
public GoogleSearchPort_doSpellingSuggestion_RequestStruct() {
}
-
+
public GoogleSearchPort_doSpellingSuggestion_RequestStruct(java.lang.String key, java.lang.String phrase) {
this.key = key;
this.phrase = phrase;
}
-
+
public java.lang.String getKey() {
return key;
}
-
+
public void setKey(java.lang.String key) {
this.key = key;
}
-
+
public java.lang.String getPhrase() {
return phrase;
}
-
+
public void setPhrase(java.lang.String phrase) {
this.phrase = phrase;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java
index 1b56041..05432d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchPort_doSpellingSuggestion_ResponseStruct.java
@@ -23,18 +23,18 @@
public class GoogleSearchPort_doSpellingSuggestion_ResponseStruct {
protected java.lang.String _return;
-
+
public GoogleSearchPort_doSpellingSuggestion_ResponseStruct() {
}
-
+
public GoogleSearchPort_doSpellingSuggestion_ResponseStruct(java.lang.String _return) {
this._return = _return;
}
-
+
public java.lang.String get_return() {
return _return;
}
-
+
public void set_return(java.lang.String _return) {
this._return = _return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java
index 241981f..8351abc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/GoogleSearchResult.java
@@ -33,10 +33,10 @@
protected java.lang.String searchTips;
protected com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] directoryCategories;
protected double searchTime;
-
+
public GoogleSearchResult() {
}
-
+
public GoogleSearchResult(boolean documentFiltering, java.lang.String searchComments, int estimatedTotalResultsCount, boolean estimateIsExact, com.sun.s1asdev.ejb.classload.lifecycle.ResultElement[] resultElements, java.lang.String searchQuery, int startIndex, int endIndex, java.lang.String searchTips, com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] directoryCategories, double searchTime) {
this.documentFiltering = documentFiltering;
this.searchComments = searchComments;
@@ -50,91 +50,91 @@
this.directoryCategories = directoryCategories;
this.searchTime = searchTime;
}
-
+
public boolean isDocumentFiltering() {
return documentFiltering;
}
-
+
public void setDocumentFiltering(boolean documentFiltering) {
this.documentFiltering = documentFiltering;
}
-
+
public java.lang.String getSearchComments() {
return searchComments;
}
-
+
public void setSearchComments(java.lang.String searchComments) {
this.searchComments = searchComments;
}
-
+
public int getEstimatedTotalResultsCount() {
return estimatedTotalResultsCount;
}
-
+
public void setEstimatedTotalResultsCount(int estimatedTotalResultsCount) {
this.estimatedTotalResultsCount = estimatedTotalResultsCount;
}
-
+
public boolean isEstimateIsExact() {
return estimateIsExact;
}
-
+
public void setEstimateIsExact(boolean estimateIsExact) {
this.estimateIsExact = estimateIsExact;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.ResultElement[] getResultElements() {
return resultElements;
}
-
+
public void setResultElements(com.sun.s1asdev.ejb.classload.lifecycle.ResultElement[] resultElements) {
this.resultElements = resultElements;
}
-
+
public java.lang.String getSearchQuery() {
return searchQuery;
}
-
+
public void setSearchQuery(java.lang.String searchQuery) {
this.searchQuery = searchQuery;
}
-
+
public int getStartIndex() {
return startIndex;
}
-
+
public void setStartIndex(int startIndex) {
this.startIndex = startIndex;
}
-
+
public int getEndIndex() {
return endIndex;
}
-
+
public void setEndIndex(int endIndex) {
this.endIndex = endIndex;
}
-
+
public java.lang.String getSearchTips() {
return searchTips;
}
-
+
public void setSearchTips(java.lang.String searchTips) {
this.searchTips = searchTips;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] getDirectoryCategories() {
return directoryCategories;
}
-
+
public void setDirectoryCategories(com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory[] directoryCategories) {
this.directoryCategories = directoryCategories;
}
-
+
public double getSearchTime() {
return searchTime;
}
-
+
public void setSearchTime(double searchTime) {
this.searchTime = searchTime;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java
index 291df88..32c7879 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/ResultElement.java
@@ -31,10 +31,10 @@
protected java.lang.String hostName;
protected com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory directoryCategory;
protected java.lang.String directoryTitle;
-
+
public ResultElement() {
}
-
+
public ResultElement(java.lang.String summary, java.lang.String URL, java.lang.String snippet, java.lang.String title, java.lang.String cachedSize, boolean relatedInformationPresent, java.lang.String hostName, com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory directoryCategory, java.lang.String directoryTitle) {
this.summary = summary;
this.URL = URL;
@@ -46,75 +46,75 @@
this.directoryCategory = directoryCategory;
this.directoryTitle = directoryTitle;
}
-
+
public java.lang.String getSummary() {
return summary;
}
-
+
public void setSummary(java.lang.String summary) {
this.summary = summary;
}
-
+
public java.lang.String getURL() {
return URL;
}
-
+
public void setURL(java.lang.String URL) {
this.URL = URL;
}
-
+
public java.lang.String getSnippet() {
return snippet;
}
-
+
public void setSnippet(java.lang.String snippet) {
this.snippet = snippet;
}
-
+
public java.lang.String getTitle() {
return title;
}
-
+
public void setTitle(java.lang.String title) {
this.title = title;
}
-
+
public java.lang.String getCachedSize() {
return cachedSize;
}
-
+
public void setCachedSize(java.lang.String cachedSize) {
this.cachedSize = cachedSize;
}
-
+
public boolean isRelatedInformationPresent() {
return relatedInformationPresent;
}
-
+
public void setRelatedInformationPresent(boolean relatedInformationPresent) {
this.relatedInformationPresent = relatedInformationPresent;
}
-
+
public java.lang.String getHostName() {
return hostName;
}
-
+
public void setHostName(java.lang.String hostName) {
this.hostName = hostName;
}
-
+
public com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory getDirectoryCategory() {
return directoryCategory;
}
-
+
public void setDirectoryCategory(com.sun.s1asdev.ejb.classload.lifecycle.DirectoryCategory directoryCategory) {
this.directoryCategory = directoryCategory;
}
-
+
public java.lang.String getDirectoryTitle() {
return directoryTitle;
}
-
+
public void setDirectoryTitle(java.lang.String directoryTitle) {
this.directoryTitle = directoryTitle;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml
index 44c130d..4b4df5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/build.xml
@@ -40,11 +40,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-cli tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-cli tests)
- ant negative (Executes the ejb-cli negative test)
- </echo>
+ ant negative (Executes the ejb-cli negative test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties
index 8d1c287..742cc5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cli-negative"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml
index f394341..a478e1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/build.xml
@@ -45,7 +45,7 @@
<arg line="${assemble.dir}/${appname}App.ear"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
@@ -56,19 +56,19 @@
</antcall>
<antcall target="compile-client"/>
<antcall target="build-ear-common">
- <param name="application.xml"
+ <param name="application.xml"
value="descriptor/application.xml" />
- <param name="application-client.xml"
+ <param name="application-client.xml"
value="descriptor/application-client.xml" />
</antcall>
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar:${s1astest.classpath}"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java
index 3600b1c..b5949c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/AppClient.java
@@ -23,7 +23,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the remote interface of the enterprise bean
* <li>Invokes business methods
@@ -34,11 +34,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- AppClient client = new AppClient();
+ public static void main(String[] args) {
+ AppClient client = new AppClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -57,8 +57,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/MyBean");
- MyBeanRemoteIntf mybean =
- (MyBeanRemoteIntf) PortableRemoteObject.narrow(objref,
+ MyBeanRemoteIntf mybean =
+ (MyBeanRemoteIntf) PortableRemoteObject.narrow(objref,
MyBeanRemoteIntf.class);
System.out.println("invocation result: "+ mybean.getCount(1));
stat.addStatus("ejb-cli", stat.FAIL);
@@ -67,5 +67,5 @@
System.err.println("caught expected exception");
ex.printStackTrace();
}
- }
-}
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java
index c7adb13..8ffe89a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/client/NegClient.java
@@ -53,9 +53,9 @@
if (!ret.returnValue && ret.err.contains(expectedErr)) {
stat.addStatus("ejb-cli-negative-deploy", stat.PASS);
} else {
- stat.addStatus("ejb-cli-negative-deploy", stat.FAIL);
+ stat.addStatus("ejb-cli-negative-deploy", stat.FAIL);
}
-
+
//System.out.println(ret);
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
index 2671c71..dc20245 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
@@ -23,4 +23,4 @@
public int getCount(int i) {
return 1 + i;
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
index c975953..cd61b73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
@@ -21,4 +21,4 @@
@Remote
public interface MyBeanRemoteIntf {
public int getCount(int i);
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml
index 17d434e..f865ea6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/build.xml
@@ -46,11 +46,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant readonly (Executes the ejb-cmp-readonly test)
- ant ejbflushwithsqlexception (Executes the ejb-cmp-ejbflushwithsqlexception test)
- ant all (Executes all the ejb-cmp tests)
- </echo>
+ <echo>
+ Usage:
+ ant readonly (Executes the ejb-cmp-readonly test)
+ ant ejbflushwithsqlexception (Executes the ejb-cmp-ejbflushwithsqlexception test)
+ ant all (Executes all the ejb-cmp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties
index b71e79c..ebf0dec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-flush-test"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml
index f54032a..0725cc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/TestHome.class,**/Test.class,**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -64,23 +64,23 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="deleteRows" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/delete_tables.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant all
</echo>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java
index 5998200..eb0031d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/client/Client.java
@@ -40,7 +40,7 @@
public class Client {
private Test t;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -50,7 +50,7 @@
Object objref = initial.lookup("java:comp/env/ejb/T1");
TestHome thome = (TestHome)PortableRemoteObject.narrow(objref, TestHome.class);
-
+
t = thome.create();
} catch( Exception ex ) {
System.err.println("Client(): Caught an exception:");
@@ -59,7 +59,7 @@
}
public static void main(String[] args) {
-
+
try {
System.out.println("START");
@@ -78,7 +78,7 @@
stat.printSummary("ejbFlush");
}
-
+
private void checkCmp11Bean() {
try {
t.testA1();
@@ -93,7 +93,7 @@
try {
t.testA1WithFlush();
System.out.println("A1WithFlush OK");
- } catch (Exception e) {
+ } catch (Exception e) {
System.out.println("A1 FAILED " + e.getMessage());
e.printStackTrace();
stat.addStatus("ejbclient checkCmp11Bean", stat.FAIL);
@@ -152,7 +152,7 @@
try {
t.testA2WithFlush();
System.out.println("A2WithFlush OK");
- } catch (Exception e) {
+ } catch (Exception e) {
System.out.println("A2 FAILED " + e.getMessage());
e.printStackTrace();
stat.addStatus("ejbclient checkCmp20Bean", stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
index b5b7e32..0bc5ea0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
@@ -20,64 +20,64 @@
import javax.naming.*;
/**
- * 1.1 bean.
+ * 1.1 bean.
* @author mvatkina
*/
public class A1Bean implements jakarta.ejb.EntityBean {
-
+
private jakarta.ejb.EntityContext context;
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: A1Bean ejbRemove");
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbStore()
*/
@@ -93,8 +93,8 @@
name = "ABC";
return null;
}
-
- public void ejbPostCreate(java.lang.String id) throws jakarta.ejb.CreateException {
+
+ public void ejbPostCreate(java.lang.String id) throws jakarta.ejb.CreateException {
}
public void setName(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
index bd56f6d..ea34dd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
@@ -24,9 +24,9 @@
public interface A1Local extends jakarta.ejb.EJBLocalObject {
- public void setName(String name);
+ public void setName(String name);
- public void setNameWithFlush(String name);
+ public void setNameWithFlush(String name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
index 9057982..a6cf40c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
@@ -24,9 +24,9 @@
*/
public interface A1LocalHome extends jakarta.ejb.EJBLocalHome {
-
+
public A1Local findByPrimaryKey(java.lang.String pk) throws jakarta.ejb.FinderException;
-
+
public A1Local create(java.lang.String id) throws jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
index 28cc6b5..2adfb37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
@@ -20,64 +20,64 @@
import javax.naming.*;
/**
- * 2.0 bean.
+ * 2.0 bean.
* @author mvatkina
*/
public abstract class A2Bean implements jakarta.ejb.EntityBean {
-
+
private jakarta.ejb.EntityContext context;
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: A2Bean ejbRemove");
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbStore()
*/
@@ -96,8 +96,8 @@
setName("ABC");
return null;
}
-
- public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException {
+
+ public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException {
}
public void setNameWithFlush(java.lang.String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
index 0cbc08f..9b4678d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
@@ -25,8 +25,8 @@
public interface A2Local extends jakarta.ejb.EJBLocalObject {
- public void setName(String name);
-
- public void setNameWithFlush(String name);
-
+ public void setName(String name);
+
+ public void setNameWithFlush(String name);
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
index 739003c..d613fa0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
@@ -24,9 +24,9 @@
*/
public interface A2LocalHome extends jakarta.ejb.EJBLocalHome {
-
+
public A2Local findByPrimaryKey(java.lang.String pk) throws jakarta.ejb.FinderException;
-
+
public A2Local create(java.lang.String name) throws jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
index e436599..e055b6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
@@ -20,13 +20,13 @@
import java.rmi.*;
public interface Test extends EJBObject {
-
+
public void testA1() throws RemoteException;
-
+
public void testA1WithFlush() throws RemoteException;
-
+
public void testA2() throws RemoteException;
-
+
public void testA2WithFlush() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
index 68162d1..e79f1ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
@@ -27,21 +27,21 @@
private A2Local a2bean = null;
// SessionBean methods
-
+
public void ejbCreate() throws CreateException {
System.out.println("TestBean ejbCreate");
try {
a1Home = lookupA1();
a2Home = lookupA2();
-
+
} catch (NamingException ex) {
throw new EJBException(ex.getMessage());
}
- }
-
+ }
+
public void ejbActivate() {
System.out.println("TestBean ejbActivate");
- }
+ }
public void ejbPassivate() {
a1Home = null;
@@ -55,13 +55,13 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/A1FL");
return (A1LocalHome) objref;
- }
+ }
private A2LocalHome lookupA2() throws NamingException {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/A2FL");
return (A2LocalHome) objref;
- }
+ }
String msg = "Update succeeded with flush enabled";
@@ -72,7 +72,7 @@
throw new RuntimeException (e.getMessage(), e);
}
-//PG-> a1bean.setName("A12345678901234567890");
+//PG-> a1bean.setName("A12345678901234567890");
}
public void testA2() {
@@ -81,14 +81,14 @@
} catch (CreateException e) {
throw new RuntimeException (e.getMessage());
}
-//PG-> a2bean.setName("A12345678901234567890");
+//PG-> a2bean.setName("A12345678901234567890");
}
public void testA1WithFlush() {
boolean success = true;
try {
a1bean = a1Home.create("B1");
- a1bean.setNameWithFlush("A12345678901234567890");
+ a1bean.setNameWithFlush("A12345678901234567890");
success = false;
} catch (Exception e) {
System.out.println(e.toString());
@@ -102,7 +102,7 @@
boolean success = true;
try {
a2bean = a2Home.create("B2");
- a2bean.setNameWithFlush("A12345678901234567890");
+ a2bean.setNameWithFlush("A12345678901234567890");
success = false;
} catch (Exception e) {
System.out.println(e.toString());
@@ -112,4 +112,4 @@
throw new RuntimeException(msg);
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
index 4e903cc..ce4e186 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
@@ -20,6 +20,6 @@
import java.rmi.*;
public interface TestHome extends EJBHome {
-
+
Test create() throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql
index cd88480..4133c3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/create_pointbase.sql
@@ -1,13 +1,13 @@
-Drop table A1;
-Drop table A2;
-
-CREATE TABLE A1 (
- id char(3) not null constraint pk_A1_id primary key,
- name char(5)
-);
-
-CREATE TABLE A2 (
- id char(3) not null constraint pk_A2_id primary key,
- name char(5)
-);
-
+Drop table A1;
+Drop table A2;
+
+CREATE TABLE A1 (
+ id char(3) not null constraint pk_A1_id primary key,
+ name char(5)
+);
+
+CREATE TABLE A2 (
+ id char(3) not null constraint pk_A2_id primary key,
+ name char(5)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql
index 81765dc..e069170 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table A1;
-Drop table A2;
+Drop table A1;
+Drop table A2;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml
index 594b4ad..c686730 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/build.xml
@@ -82,17 +82,17 @@
</target>
<target name="usage">
- <echo> Usage:
- ant customer (Executes the customer tests)
- ant all (Executes all the ejb cmp tests)
- ant clean (cleans all the ejb cmp tests)
- ant build (builds all the ejb cmp tests)
- ant setup (sets up all resources for cmp tests)
- ant deploy (deploys all the ejb cmp apps)
- ant run (Executes all the ejb cmp tests)
- ant undeploy (undeploys all the cmp apps)
- ant unsetup (unsets all resources for cmp tests)
- </echo>
+ <echo> Usage:
+ ant customer (Executes the customer tests)
+ ant all (Executes all the ejb cmp tests)
+ ant clean (cleans all the ejb cmp tests)
+ ant build (builds all the ejb cmp tests)
+ ant setup (sets up all resources for cmp tests)
+ ant deploy (deploys all the ejb cmp apps)
+ ant run (Executes all the ejb cmp tests)
+ ant undeploy (undeploys all the cmp apps)
+ ant unsetup (unsets all resources for cmp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties
index 04f01eb..d63a23e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp"/>
-<property name="appname" value="${module}-customer"/>
+<property name="appname" value="${module}-customer"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar-customer.xml" value="descriptor/ejb-jar-customer.xml"/>
<property name="sun-ejb-jar-customer.xml" value="descriptor/sun-ejb-jar-customer.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="sql/PreselectSchema.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml
index 71554df..4f71336 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/build.xml
@@ -35,8 +35,8 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
- <target name="compile" depends="clean">
+
+ <target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
@@ -50,27 +50,27 @@
<antcall target="package-customer-jar"/>
<antcall target="appclient-jar-common"/>
<antcall target="package-ear"/>
- </target>
+ </target>
<target name="package-customer-jar">
<antcall target="package-ejbjar-common">
<param name="ejb-jar.xml" value="${ejb-jar-customer.xml}"/>
<param name="sun-ejb-jar.xml" value="${sun-ejb-jar-customer.xml}"/>
- <param name="ejbjar.files" value="${build.classes.dir}"/>
+ <param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
- </target>
+ </target>
<target name="package-ear">
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </ear>
+ </ear>
</target>
<target name="sql" depends="init-common">
@@ -91,14 +91,14 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="execute-sql-common">
@@ -107,15 +107,15 @@
<antcall target="delete-persistence-resource-common"/>
<antcall target="undeploy-jdbc-common"/>
<antcall target="reconfig-common"/>
- </target>
-
+ </target>
+
<target name="sql-create" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
- <target name="sql-drop" depends="init-common">
+ <target name="sql-drop" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java
index 5df501a..c1bb77b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/client/PreselectClient.java
@@ -26,39 +26,39 @@
public class PreselectClient {
-
+
private static SimpleReporterAdapter status =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
try {
- System.out.println("Starting preselect....");
- System.out.println("Customer Bob has added 3 items to his shopping cart :");
- System.out.println(" The items are : 1> Dark Chocolate $40, 2> Milk Chocolate $30, 3> White Chocolate $20");
+ System.out.println("Starting preselect....");
+ System.out.println("Customer Bob has added 3 items to his shopping cart :");
+ System.out.println(" The items are : 1> Dark Chocolate $40, 2> Milk Chocolate $30, 3> White Chocolate $20");
status.addDescription("Testing cmp preselect app.");
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleCustomer");
- CustomerHome home =
- (CustomerHome)PortableRemoteObject.narrow(objref,
+ CustomerHome home =
+ (CustomerHome)PortableRemoteObject.narrow(objref,
CustomerHome.class);
CustomerRemote myCustomer = home.create("1","Bob");
- System.out.println("Let us select all items that Bob bought whose price is below $100");
- int items = myCustomer.getItemsForLess();
+ System.out.println("Let us select all items that Bob bought whose price is below $100");
+ int items = myCustomer.getItemsForLess();
- if (items == 0) {
- System.out.println("No items available below $100 for this customer. ejbStore() was called before ejbSelect() and it modified the price of each item to $200");
- status.addStatus("cmp preselect:getSomeInfo", status.PASS);
- } else {
- System.out.println("Found " + items + " items with price less than 100. ejbStore was not called before ejbSelect. Hence the price of the items was not modified to $200");
- status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
- }
-
+ if (items == 0) {
+ System.out.println("No items available below $100 for this customer. ejbStore() was called before ejbSelect() and it modified the price of each item to $200");
+ status.addStatus("cmp preselect:getSomeInfo", status.PASS);
+ } else {
+ System.out.println("Found " + items + " items with price less than 100. ejbStore was not called before ejbSelect. Hence the price of the items was not modified to $200");
+ status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
+ }
+
status.printSummary("preselectAppID");
System.exit(0);
} catch (Throwable ex) {
- status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
+ status.addStatus("cmp preselect:getSomeInfo", status.FAIL);
System.err.println("Caught an exception in main: " + ex.toString());
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
index bfa035c..1b1a74d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
@@ -44,7 +44,7 @@
<ejb-ref-type>Entity</ejb-ref-type>
<local-home>com.sun.s1peqe.ejb.cmp.preselect.ejb.ItemLocalHome</local-home>
<local>com.sun.s1peqe.ejb.cmp.preselect.ejb.ItemLocal</local>
- <ejb-link>Item</ejb-link>
+ <ejb-link>Item</ejb-link>
</ejb-local-ref>
<query>
<query-method>
@@ -54,7 +54,7 @@
</method-params>
</query-method>
<ejb-ql>SELECT OBJECT(item) FROM ItemSchema item WHERE item.price < 100
- </ejb-ql>
+ </ejb-ql>
</query>
</entity>
<entity>
@@ -100,8 +100,8 @@
<multiplicity>Many</multiplicity>
<relationship-role-source>
<ejb-name>Item</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
+ </relationship-role-source>
+ </ejb-relationship-role>
</ejb-relation>
</relationships>
<assembly-descriptor>
@@ -163,7 +163,7 @@
<method-name>create</method-name>
<method-params>
<method-param>java.lang.String</method-param>
- <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
</method-params>
</method>
<method>
@@ -267,7 +267,7 @@
</container-transaction>
<container-transaction>
<method>
- <ejb-name>Item</ejb-name>
+ <ejb-name>Item</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
index fa37d56..b817c46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
@@ -29,10 +29,10 @@
// Access methods for persistent fields
public abstract String getId();
public abstract void setId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
-
+
// Access methods for relationship fields
public abstract Collection getItems();
public abstract void setItems(Collection items);
@@ -44,39 +44,39 @@
// Business methods
public int getItemsForLess() throws FinderException, RemoteException {
int count = 0;
- CustomerLocal customer =
+ CustomerLocal customer =
(CustomerLocal)context.getEJBLocalObject();
- try {
- InitialContext initial = new InitialContext();
- Object objref = initial.lookup("java:comp/env/ejb/SimpleItem");
- ItemLocalHome itemHome =
- (ItemLocalHome)PortableRemoteObject.narrow(objref,
+ try {
+ InitialContext initial = new InitialContext();
+ Object objref = initial.lookup("java:comp/env/ejb/SimpleItem");
+ ItemLocalHome itemHome =
+ (ItemLocalHome)PortableRemoteObject.narrow(objref,
ItemLocalHome.class);
- ItemLocal item = itemHome.create("Dark Chocolate", "1", 20.00);
- getItems().add(item);
-
- item = itemHome.create("Milk Chocolate", "2", 30.00);
- getItems().add(item);
+ ItemLocal item = itemHome.create("Dark Chocolate", "1", 20.00);
+ getItems().add(item);
- item = itemHome.create("White Chocolate", "3", 40.00);
- getItems().add(item);
+ item = itemHome.create("Milk Chocolate", "2", 30.00);
+ getItems().add(item);
- System.out.println("calling ejbSelectItemsLessThan100...");
- Collection items = ejbSelectItemsLessThan100(customer);
+ item = itemHome.create("White Chocolate", "3", 40.00);
+ getItems().add(item);
- if (items != null) {
-
- for (Iterator iterator = items.iterator(); iterator.hasNext();) {
- System.out.println("Item.price < 100 : " +
- ((ItemLocal)iterator.next()).getId());
- count++;
- }
- }
- return count;
+ System.out.println("calling ejbSelectItemsLessThan100...");
+ Collection items = ejbSelectItemsLessThan100(customer);
- } catch (Exception e) {
- throw new EJBException(e.getMessage());
- }
+ if (items != null) {
+
+ for (Iterator iterator = items.iterator(); iterator.hasNext();) {
+ System.out.println("Item.price < 100 : " +
+ ((ItemLocal)iterator.next()).getId());
+ count++;
+ }
+ }
+ return count;
+
+ } catch (Exception e) {
+ throw new EJBException(e.getMessage());
+ }
}
// EntityBean methods
@@ -85,34 +85,34 @@
System.out.print("CustomerBean ejbCreate");
setId(id);
setName(name);
- return null;
+ return null;
}
-
+
public void ejbPostCreate (String id, String name) throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
System.out.print("CustomerBean ejbRemove");
}
-
+
public void ejbLoad() {
System.out.print("CustomerBean ejbLoad");
}
-
+
public void ejbStore() {
System.out.print("CustomerBean ejbStore");
}
-
+
public void ejbPassivate() { }
-
+
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
index f9c6a10..e3ee0a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
@@ -21,9 +21,9 @@
import java.rmi.RemoteException;
public interface CustomerHome extends EJBHome {
-
+
public CustomerRemote create (String id, String name) throws RemoteException, CreateException;
-
+
public CustomerRemote findByPrimaryKey (String id)
- throws FinderException, RemoteException;
+ throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
index 5d0c2bb..eb28e91 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
@@ -20,9 +20,9 @@
import jakarta.ejb.*;
public interface CustomerLocalHome extends EJBLocalHome {
-
+
public CustomerLocal create (String id, String name) throws CreateException;
-
+
public CustomerLocal findByPrimaryKey (String id)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
index 38e2294..8972711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
@@ -27,13 +27,13 @@
// Access methods for persistent fields
public abstract String getId();
public abstract void setId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
public abstract double getPrice();
public abstract void setPrice(double price);
-
+
// Business methods
public void modifyPrice(double newPrice) {
@@ -47,39 +47,39 @@
System.out.print("ItemBean ejbCreate");
setId(id);
setName(name);
- setPrice(price);
- return null;
+ setPrice(price);
+ return null;
}
-
+
public void ejbPostCreate (String id, String name, double price) throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
System.out.print("ItemBean ejbRemove");
}
-
+
public void ejbLoad() {
System.out.print("ItemBean ejbLoad");
}
-
+
public void ejbStore() {
System.out.print("ItemBean ejbStore");
- ItemLocal item = (ItemLocal)context.getEJBLocalObject();
-
- System.out.println("Item price less than $100 : " +
- item.getId());
- System.out.println("Modifying its price to $200...");
- item.modifyPrice(200.00);
+ ItemLocal item = (ItemLocal)context.getEJBLocalObject();
+
+ System.out.println("Item price less than $100 : " +
+ item.getId());
+ System.out.println("Modifying its price to $200...");
+ item.modifyPrice(200.00);
}
-
+
public void ejbPassivate() { }
-
+
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
index 1061db6..4619976 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
@@ -21,9 +21,9 @@
import java.rmi.RemoteException;
public interface ItemHome extends EJBHome {
-
+
public ItemRemote create (String id, String name, double price) throws CreateException, RemoteException;
-
+
public ItemRemote findByPrimaryKey (String id)
- throws FinderException, RemoteException;
+ throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
index beecd09..792102a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
@@ -22,5 +22,5 @@
public interface ItemLocal extends EJBLocalObject, java.io.Serializable {
public String getId();
public double getPrice();
- public void modifyPrice(double newPrice);
+ public void modifyPrice(double newPrice);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
index 06c57cd..193a859 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
@@ -21,9 +21,9 @@
public interface ItemLocalHome extends EJBLocalHome {
-
+
public ItemLocal create (String id, String name, double price) throws CreateException;
-
+
public ItemLocal findByPrimaryKey (String id)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
index 4656e05..26f2d2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
@@ -21,5 +21,5 @@
import java.rmi.RemoteException;
public interface ItemRemote extends EJBObject {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql
index 62e615a..5bc079b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/sql/create_pointbase.sql
@@ -1,20 +1,20 @@
DROP TABLE Customer;
DROP TABLE Item;
-CREATE TABLE Customer
+CREATE TABLE Customer
(
- CUSTOMER_ID VARCHAR(255) PRIMARY KEY,
- name VARCHAR(255)
+ CUSTOMER_ID VARCHAR(255) PRIMARY KEY,
+ name VARCHAR(255)
);
-CREATE TABLE Item
+CREATE TABLE Item
(
- item_Id VARCHAR(255) PRIMARY KEY,
- name VARCHAR(255) ,
- price DOUBLE PRECISION NOT NULL ,
- CUSTOMER_ID VARCHAR(255) ,
- FOREIGN KEY (CUSTOMER_ID) REFERENCES Customer (CUSTOMER_ID)
+ item_Id VARCHAR(255) PRIMARY KEY,
+ name VARCHAR(255) ,
+ price DOUBLE PRECISION NOT NULL ,
+ CUSTOMER_ID VARCHAR(255) ,
+ FOREIGN KEY (CUSTOMER_ID) REFERENCES Customer (CUSTOMER_ID)
);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties
index 87c889b..995ca72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp-readonly"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="sql/readonly.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml
index f08d0a0..48f7052 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,25 +48,25 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*.dbschema" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
- <target name="deploy" depends="init-common">
+ <target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-common">
+ <antcall target="runclient-common">
</antcall>
</target>
@@ -75,10 +75,10 @@
<param name="appclient.application.args" value="100 10 1 100"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="execute-ejb-sql-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
index 0547214..4b1c24f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
@@ -28,7 +28,7 @@
import java.rmi.RemoteException;
/**
- * A simple java client will:
+ * A simple java client will:
* <ul>
* <li>Locates the home interface of the enterprise bean
* <li>Gets a reference to the remote interface
@@ -45,9 +45,9 @@
private int numPKs_ = 1;
private long sleepTimeInMillis_ = 100;
- public static void main(String[] args) {
+ public static void main(String[] args) {
- ReadOnlyClient client = new ReadOnlyClient();
+ ReadOnlyClient client = new ReadOnlyClient();
if( args.length == 4 ) {
@@ -56,22 +56,22 @@
int numPKs = Integer.parseInt(args[2]);
long sleepTimeInMillis = Long.parseLong(args[3]);
client.runThreadTest(numIterations, numThreads, numPKs,
- sleepTimeInMillis);
+ sleepTimeInMillis);
} else {
- client.runTestClient();
+ client.runTestClient();
}
// run the tests
-
+
}
- public void runTestClient() {
+ public void runTestClient() {
try{
stat.addDescription("Testing Cmp CMPReadOnlyClient app.");
test11();
- test01();
+ test01();
test05();
test12();
@@ -83,7 +83,7 @@
}
public void runThreadTest(int numIterations, int numThreads, int numPKs,
- long sleepTimeInMillis) {
+ long sleepTimeInMillis) {
numIterations_ = numIterations;
numThreads_ = numThreads;
@@ -91,7 +91,7 @@
sleepTimeInMillis_ = sleepTimeInMillis;
try{
- stat.addDescription("Cmp CMPReadOnlyClient thread test");
+ stat.addDescription("Cmp CMPReadOnlyClient thread test");
test12();
stat.printSummary("CMPReadOnlyClient");
} catch (Exception ex) {
@@ -104,8 +104,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
try {
@@ -118,7 +118,7 @@
stat.addStatus("CMPReadOnlyClient Student ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -131,8 +131,8 @@
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
try {
@@ -145,7 +145,7 @@
stat.addStatus("CMPReadOnlyClient Student ", stat.FAIL);
System.err.println("Caught an exception!");
ex.printStackTrace();
- //Expected
+ //Expected
}
} catch (Throwable th) {
System.err.println("Caught an unexpected exception!");
@@ -176,20 +176,20 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHome mutableStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome mutableStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Student newStudent = mutableStudentHome.create("999", "Joe Schmo");
Student newStudent2 = mutableStudentHome.create("998", "Jill Schmo");
readOnlyStudentHome.testFind("999");
readOnlyStudentHome.testFind("998");
-
+
readOnlyStudentHome.testLocalFind("999");
readOnlyStudentHome.testLocalFind("998");
@@ -198,9 +198,9 @@
readOnlyStudentHome.findBar("999");
readOnlyStudentHome.findBar("998");
- Student readOnlyStudent =
+ Student readOnlyStudent =
readOnlyStudentHome.findByPrimaryKey("999");
- Student readOnlyStudent2 =
+ Student readOnlyStudent2 =
readOnlyStudentHome.findByPrimaryKey("998");
readOnlyStudentHome.findByRemoteStudent(readOnlyStudent);
@@ -262,9 +262,9 @@
// to create a new instance of the bean and call ejbLoad on it.
// So, only use name1 and name2 to decide if test passed.
if (name1.equals(readOnlyName1) && name2.equals(readOnlyName2) &&
- name1.equals(readOnlyName1Tx) &&
+ name1.equals(readOnlyName1Tx) &&
name2.equals(readOnlyName2Tx)) {
-
+
stat.addStatus("CMPReadOnlyClient ReadMostly ", stat.PASS);
} else {
stat.addStatus("CMPReadOnlyClient ReadMostly ", stat.FAIL);
@@ -276,7 +276,7 @@
stat.addStatus("CMPReadOnlyClient ReadMostly ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private void test12() {
@@ -285,7 +285,7 @@
System.out.println("Num Iterations = " + numIterations_);
System.out.println("Num Threads = " + numThreads_);
System.out.println("Num PKs = " + numPKs_);
- System.out.println("Sleep time in milliseconds = " +
+ System.out.println("Sleep time in milliseconds = " +
sleepTimeInMillis_);
int numWriterIterations = numIterations_ / 100;
@@ -293,30 +293,30 @@
System.out.println("Num writer iterations = " +
numWriterIterations);
- System.out.println("Writer sleep time in milliseconds = " +
+ System.out.println("Writer sleep time in milliseconds = " +
writerSleepTimeInMillis);
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleStudent");
- StudentHome readOnlyStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome readOnlyStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
objref = initial.lookup("java:comp/env/ejb/MutableStudent");
- StudentHome mutableStudentHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome mutableStudentHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
-
+
Student[] newStudents = new Student[numPKs_];
Student[] readOnlyStudents = new Student[numPKs_];
Thread[] readers = new Thread[numThreads_ * numPKs_];
Thread[] writers = new Thread[numPKs_];
for(int i = 0; i < numPKs_; i++) {
- newStudents[i] =
+ newStudents[i] =
mutableStudentHome.create("ReaderThread" + i, "ABC" + i);
- System.out.println("Creating student " +
+ System.out.println("Creating student " +
newStudents[i].getPrimaryKey());
}
@@ -324,9 +324,9 @@
readOnlyStudentHome.findFoo();
for(int i = 0; i < numPKs_; i++) {
- readOnlyStudents[i] =
+ readOnlyStudents[i] =
readOnlyStudentHome.findByPrimaryKey("ReaderThread" + i);
- writers[i] = new WriterThread(newStudents[i],
+ writers[i] = new WriterThread(newStudents[i],
numWriterIterations,
writerSleepTimeInMillis);
for(int j = 0; j < numThreads_; j++) {
@@ -334,21 +334,21 @@
int threadIndex = i*numThreads_ + j;
System.out.println("Thread index = " + threadIndex);
readers[threadIndex] = new ReaderThread
- (readOnlyStudents[i], numIterations_,
+ (readOnlyStudents[i], numIterations_,
sleepTimeInMillis_);
}
}
-
+
for(int i = 0; i < readers.length; i++) {
System.out.println("Starting reader thread " + i);
readers[i].start();
- }
-
+ }
+
for(int i = 0; i < writers.length; i++) {
System.out.println("Starting writer thread " + i);
writers[i].start();
- }
-
+ }
+
System.out.println("Joining on " + readers.length + " readers");
for(int i = 0; i < readers.length; i++) {
readers[i].join();
@@ -357,8 +357,8 @@
for(int i = 0; i < writers.length; i++) {
writers[i].join();
}
-
-
+
+
stat.addStatus("CMPReadOnlyClient ReaderThreads ", stat.PASS);
System.out.println("Removing all students");
@@ -370,24 +370,24 @@
stat.addStatus("CMPReadOnlyClient ReaderThreads ", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
- }
+ }
}
private class ReaderThread extends Thread {
- Student readOnlyStudent_;
+ Student readOnlyStudent_;
int numReads_;
long sleepTimeInMillis_;
- String studentPK_;
+ String studentPK_;
- ReaderThread(Student readOnlyStudent, int numReads,
+ ReaderThread(Student readOnlyStudent, int numReads,
long sleepTimeInMillis) {
- readOnlyStudent_ = readOnlyStudent;
+ readOnlyStudent_ = readOnlyStudent;
numReads_ = numReads;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
+ public void run() {
for( int i = 0; i < numReads_; i++) {
try {
if( i == 0 ) {
@@ -407,20 +407,20 @@
private class WriterThread extends Thread {
- Student mutableStudent_;
+ Student mutableStudent_;
int numWrites_;
long sleepTimeInMillis_;
String studentPK_;
- WriterThread(Student mutableStudent, int numWrites,
+ WriterThread(Student mutableStudent, int numWrites,
long sleepTimeInMillis) {
- mutableStudent_ = mutableStudent;
+ mutableStudent_ = mutableStudent;
numWrites_ = numWrites;
sleepTimeInMillis_ = sleepTimeInMillis;
}
- public void run() {
- for( int i = 0; i < numWrites_; i++) {
+ public void run() {
+ for( int i = 0; i < numWrites_; i++) {
try {
if( i == 0 ) {
studentPK_ = (String) mutableStudent_.getPrimaryKey();
@@ -439,4 +439,4 @@
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml
index 9793618..b4a8d45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/ejb-jar.xml
@@ -45,7 +45,7 @@
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>
+ </security-identity>
<query>
<description></description>
<query-method>
@@ -104,7 +104,7 @@
<cmp-field>
<description>no description</description>
<field-name>name</field-name>
- </cmp-field>
+ </cmp-field>
<primkey-field>studentId</primkey-field>
<ejb-ref>
<ejb-ref-name>ejb/ReadOnlyStudent</ejb-ref-name>
@@ -115,7 +115,7 @@
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>
+ </security-identity>
<query>
<description></description>
<query-method>
@@ -161,14 +161,14 @@
<unchecked />
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
- <method-name>*</method-name>
+ <method-name>*</method-name>
</method>
<method>
<ejb-name>StudentBean</ejb-name>
<method-name>*</method-name>
</method>
</method-permission>
-
+
<!-- Student EJB -->
<container-transaction>
<method>
@@ -181,7 +181,7 @@
</method-params>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
@@ -199,7 +199,7 @@
<method-params />
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>ReadOnlyStudentBean</ejb-name>
@@ -210,7 +210,7 @@
</method-params>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>StudentBean</ejb-name>
@@ -229,8 +229,8 @@
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml
index efb6c3e..07bd566 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-application-client.xml
@@ -18,7 +18,7 @@
-->
-<sun-application-client>
+<sun-application-client>
<ejb-ref>
<ejb-ref-name>ejb/SimpleStudent</ejb-ref-name>
<jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
@@ -26,5 +26,5 @@
<ejb-ref>
<ejb-ref-name>ejb/MutableStudent</ejb-ref-name>
<jndi-name>ejb/ejb_cmp_readonly_Student</jndi-name>
- </ejb-ref>
+ </ejb-ref>
</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml
index d78966f..cb69a7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/descriptor/sun-ejb-jar.xml
@@ -21,10 +21,10 @@
<sun-ejb-jar>
<enterprise-beans>
- <name>ejb-cmp-readonly-ejb.jar</name>
+ <name>ejb-cmp-readonly-ejb.jar</name>
<ejb>
<ejb-name>ReadOnlyStudentBean</ejb-name>
- <jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
+ <jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
<is-read-only-bean>true</is-read-only-bean>
<refresh-period-in-seconds>60</refresh-period-in-seconds>
</ejb>
@@ -34,7 +34,7 @@
<ejb-ref>
<ejb-ref-name>ejb/ReadOnlyStudent</ejb-ref-name>
<jndi-name>ejb/ejb_cmp_readonly_ReadOnlyStudent</jndi-name>
- </ejb-ref>
+ </ejb-ref>
</ejb>
<cmp-resource>
<jndi-name>jdbc/__default</jndi-name>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
index 88f7fe6..9f2c79a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
@@ -53,10 +53,10 @@
try {
System.out.println("Notifying read-only bean of update to " +
"read-mostly Student " + name);
- ReadOnlyBeanNotifier studentNotifier =
+ ReadOnlyBeanNotifier studentNotifier =
ReadOnlyBeanHelper.getReadOnlyBeanNotifier
("java:comp/env/ejb/ReadOnlyStudent");
-
+
// Update read-only version
studentNotifier.refresh(getStudentId());
} catch(Exception e) {
@@ -121,12 +121,12 @@
System.out.println("2nd query of " + pk + " took " +
(after2 - after) + " nano secs");
-
+
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
-
+
}
public void ejbHomeTestLocalFind(String pk) {
@@ -149,17 +149,17 @@
System.out.println("2nd query of " + pk + " took " +
(after2 - after) + " nano secs");
-
+
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
-
+
}
public void ejbHomeTestLocalRemove(String pk) {
-
-
+
+
StudentLocalHome localHome = (StudentLocalHome)
context.getEJBLocalHome();
@@ -180,7 +180,7 @@
System.out.println("Successfully caught exception while trying " +
" to do a remove on a read-only cmp Home");
}
-
+
boolean removeSucceeded = false;
try {
StudentLocal student = localHome.findByPrimaryKey(pk);
@@ -202,34 +202,34 @@
" to do a remove on a read-only cmp ");
}
-
+
}
-
+
public void ejbRemove() {
System.out.println("StudentBean.ejbRemove called");
}
public void setEntityContext(EntityContext context) {
- this.context = context;
+ this.context = context;
}
- public void unsetEntityContext() {
+ public void unsetEntityContext() {
this.context = null;
}
- public void ejbActivate() {
+ public void ejbActivate() {
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
}
- public void ejbLoad() {
+ public void ejbLoad() {
}
- public void ejbStore() {
+ public void ejbStore() {
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
index 29b022d..9f8ec27 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
@@ -36,8 +36,8 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
public java.util.Collection findFoo() throws FinderException, RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
index 555eed5..574ff9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
@@ -20,7 +20,7 @@
import jakarta.ejb.EJBLocalObject;
public interface StudentLocal extends EJBLocalObject {
-
+
/**
* Returns the Name of a student.
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
index 59b6166..22c4067 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
@@ -36,11 +36,11 @@
* @exception throws FinderException.
*
*/
-
- public StudentLocal findByPrimaryKey(String studentId)
+
+ public StudentLocal findByPrimaryKey(String studentId)
throws FinderException;
public StudentLocal findByLocalStudent(StudentLocal student) throws FinderException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql
index 9365e01..6d0e7f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
CREATE TABLE STUDENT (
-STUDENTID VARCHAR(256) NOT NULL PRIMARY KEY,
-NAME VARCHAR(256)
+STUDENTID VARCHAR(256) NOT NULL PRIMARY KEY,
+NAME VARCHAR(256)
)
;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml
index 3d86d06..fec2950 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/build.xml
@@ -47,11 +47,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ee tests)
- ant methodcheckpoint (Executes the ejb-ee-methodcheckpoint test)
- ant txcheckpoint (Executes the ejb-ee-txcheckpoint test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ee tests)
+ ant methodcheckpoint (Executes the ejb-ee-methodcheckpoint test)
+ ant txcheckpoint (Executes the ejb-ee-txcheckpoint test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java
index 7f3cbe5..c98e320 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/main/java/com/acme/HttpClient.java
@@ -72,10 +72,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(2+i);
@@ -105,10 +105,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(5+i);
@@ -121,7 +121,7 @@
System.out.println("Failed " + info);
}
}
-
+
/*
System.out.println("Restarting inst1...");
proc = Runtime.getRuntime().exec(ASADMIN + " start-instance inst1");
@@ -146,14 +146,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -220,7 +220,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index 6e663ce..3643389 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -32,8 +32,8 @@
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -47,7 +47,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -63,13 +63,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -80,9 +80,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -95,7 +95,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties
index 7a8f104..3271c26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ha-web"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml
index 53c7612..38a57c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -72,11 +72,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
index 65a1430..5e36340 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
@@ -116,7 +116,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -134,7 +134,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -169,7 +169,7 @@
result = result && prev.getJsessionCookie().equals(current.getJsessionCookie());
result = result && prev.getHttpCounter() < current.getHttpCounter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java
index e9d391b..f4876f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/main/java/com/acme/HttpClient.java
@@ -117,7 +117,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -135,7 +135,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -202,7 +202,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml
index 2abf55d..0245098 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
index 9d67812..e752213 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index c408fdd..c11bafa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -76,13 +76,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBMethodCheckpointDriver/SimpleSessionBean");
sfsb2 = (CheckpointedBean) ctx.lookup("java:global/SFSBMethodCheckpointDriver/CheckpointedBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -113,13 +113,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -130,9 +130,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -145,7 +145,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java
index 01502bd..f840194 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/main/java/com/acme/HttpClient.java
@@ -72,9 +72,9 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
- }
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(2+i);
@@ -105,9 +105,9 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
- }
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(5+i);
@@ -120,7 +120,7 @@
System.out.println("Failed " + info);
}
}
-
+
/*
System.out.println("Restarting inst1...");
proc = Runtime.getRuntime().exec(ASADMIN + " start-instance inst1");
@@ -144,14 +144,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -172,21 +172,21 @@
if (! "null".equals(val.trim())) {
tmpSessState.setHttpCounter(Integer.valueOf(val.trim()));
}
- } else if (tokens[0].startsWith("<h1>From")) {
+ } else if (tokens[0].startsWith("<h1>From")) {
if (tokens[2].startsWith("SFSB[1]")) {
- Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb1StateNew(! retrieved);
+ Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb1StateNew(! retrieved);
} else if (tokens[2].startsWith("SFSB[2]")) {
- Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb2StateNew(! retrieved);
+ Boolean retrieved = Boolean.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb2StateNew(! retrieved);
}
} else if (tokens[0].startsWith("<h1>Retrieved")) {
if (tokens[1].startsWith("SFSB[1]")) {
- int state1 = Integer.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb1Counter(state1);
+ int state1 = Integer.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb1Counter(state1);
} else if (tokens[2].startsWith("SFSB[2]")) {
- int state2 = Integer.valueOf(tokens[tokens.length - 2]);
- tmpSessState.setEjb2Counter(state2);
+ int state2 = Integer.valueOf(tokens[tokens.length - 2]);
+ tmpSessState.setEjb2Counter(state2);
}
}
}
@@ -213,11 +213,11 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
- if (isFirstAccessAfterFailover) {
+ if (isFirstAccessAfterFailover) {
result = result && current.getEjb2Counter() == 3;
- } else {
+ } else {
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
- }
+ }
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
index 6dab359..8a63173 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java
index fb02577..c86be6c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/main/java/com/acme/HttpClient.java
@@ -46,96 +46,96 @@
public HttpClient(String[] args) {
host = "localhost";
- canProceed = (args.length == 6);
- if (canProceed) {
+ canProceed = (args.length == 6);
+ if (canProceed) {
for (int i=0; i<3; i++) {
- instanceNames[i] = args[2 * i];
- port[i] = args[2 * i + 1];
+ instanceNames[i] = args[2 * i];
+ port[i] = args[2 * i + 1];
}
- }
+ }
}
public void doTest() {
- if (! canProceed) {
- System.err.println("Usage: java -cp <cp> com.acme.HttpClient <inst_0_name> <port0> <inst_1_name> <port1> <inst_2_name> <port2> ");
+ if (! canProceed) {
+ System.err.println("Usage: java -cp <cp> com.acme.HttpClient <inst_0_name> <port0> <inst_1_name> <port1> <inst_2_name> <port2> ");
} else {
try {
String url = "http://" + host + ":" + port[0] +
"/" + appName + "/" + servletName;
-
+
System.out.println("invoking webclient servlet at " + url);
-
+
URL u = new URL(url);
URLConnection uc = u.openConnection();
-
+
stateInfo = extractSessionStates(uc);
stateInfo.setAccessCount(1);
jsessionIDCookie = stateInfo.getJsessionCookie();
-
+
stopAndAccessAndStart(instanceNames[0], port[1]);
stopAndAccessAndStart(instanceNames[1], port[2]);
stopAndAccessAndStart(instanceNames[2], port[0]);
-
+
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }
}
private void stopAndAccessAndStart(String instance, String port) {
try { Thread.sleep(3*1000); } catch (Exception ex) {}
- stopInstance(instance);
+ stopInstance(instance);
String url = "http://" + host + ":" + port +
"/" + appName + "/" + servletName;
System.out.println("** ACCESSING URL : " + url);
for (int i = 0; i < 3; i++) {
if (! accessApplication(url)) {
- break;
- }
+ break;
+ }
}
- startInstance(instance);
+ startInstance(instance);
url = "http://" + host + ":" + port +
"/" + appName + "/" + servletName;
for (int i = 0; i < 3; i++) {
if (! accessApplication(url)) {
- break;
- }
+ break;
+ }
}
}
private void stopInstance(String instName) {
- try {
- System.out.println("Executing stop-instance " + instName);
- Thread.sleep(3 * 1000);
- Process proc = Runtime.getRuntime().exec(ASADMIN + " stop-instance " + instName);
- proc.waitFor();
- System.out.println("Process stop-instance " + instName + " finished...");
- } catch (Exception ex) {
- System.err.println("Error while stopping instance " + instName);
- }
+ try {
+ System.out.println("Executing stop-instance " + instName);
+ Thread.sleep(3 * 1000);
+ Process proc = Runtime.getRuntime().exec(ASADMIN + " stop-instance " + instName);
+ proc.waitFor();
+ System.out.println("Process stop-instance " + instName + " finished...");
+ } catch (Exception ex) {
+ System.err.println("Error while stopping instance " + instName);
+ }
}
private void startInstance(String instName) {
- try {
- System.out.println("Executing start-instance " + instName);
- Process proc = Runtime.getRuntime().exec(ASADMIN + " start-instance " + instName);
- proc.waitFor();
- System.out.println("Process start-instance " + instName + " finished...");
- Thread.sleep(3 * 1000);
- } catch (Exception ex) {
- System.err.println("Error while starting instance " + instName);
- }
+ try {
+ System.out.println("Executing start-instance " + instName);
+ Process proc = Runtime.getRuntime().exec(ASADMIN + " start-instance " + instName);
+ proc.waitFor();
+ System.out.println("Process start-instance " + instName + " finished...");
+ Thread.sleep(3 * 1000);
+ } catch (Exception ex) {
+ System.err.println("Error while starting instance " + instName);
+ }
}
private boolean accessApplication(String urlStr) {
- try {
+ try {
URL url = new URL(urlStr);
URLConnection uc = url.openConnection();
- for (String cookie : responseCookies) {
+ for (String cookie : responseCookies) {
uc.setRequestProperty("Cookie", cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(++_accessCount);
@@ -145,7 +145,7 @@
System.out.println("Passed " + stateInfo);
} else {
System.out.println("Failed " + info);
- return false;
+ return false;
}
} catch (Exception e) {
e.printStackTrace();
@@ -166,14 +166,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
@@ -240,7 +240,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml
index 331c6de..94d4211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
index 04e2bd8..63ce435 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -863,7 +863,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -902,7 +902,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -929,7 +929,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -955,7 +955,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index e47657b..6170966 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -76,13 +76,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -110,13 +110,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -127,9 +127,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -142,7 +142,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml
index 570c712..d5e2bfa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
index 18c57d8..ccbe604 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -863,7 +863,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -902,7 +902,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -929,7 +929,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -955,7 +955,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java
index 4a529a4..5334c13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SimpleSFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -76,13 +76,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SimpleSFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleShoppingCartBean) ctx.lookup("java:global/SimpleSFSBDriver/SimpleShoppingCartBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -110,13 +110,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -127,9 +127,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -142,7 +142,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
index bb21a6f..1df3d3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
@@ -72,10 +72,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(2+i);
@@ -105,10 +105,10 @@
System.out.println("Connecting for the " + i + " time....");
u = new URL(url);
uc = u.openConnection();
- for (String cookie : responseCookies) {
- uc.setRequestProperty("Cookie", cookie);
+ for (String cookie : responseCookies) {
+ uc.setRequestProperty("Cookie", cookie);
System.out.println("==>Setting Cookie: " + cookie);
- }
+ }
uc.connect();
SessionStateInfo info = extractSessionStates(uc);
info.setAccessCount(5+i);
@@ -121,7 +121,7 @@
System.out.println("Failed " + info);
}
}
-
+
/*
System.out.println("Restarting inst1...");
proc = Runtime.getRuntime().exec(ASADMIN + " start-instance inst1");
@@ -146,14 +146,14 @@
responseCookies.add(cookie);
System.out.println("JUST READ COOKIE: " + cookie);
if (cookie.startsWith("JSESSIONID=")) {
- jsessionIDCookie = cookie;
+ jsessionIDCookie = cookie;
}
}
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(jsessionIDCookie);
- responseCookies.add(jsessionIDCookie);
+ tmpSessState.setJsessionCookie(jsessionIDCookie);
+ responseCookies.add(jsessionIDCookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -220,7 +220,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml
index 5e3f315..e6448da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/build.xml
@@ -47,9 +47,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ee tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ee tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties
index 758dfb8..f18ae80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-methodcheckpoint-multi"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml
index 4c56fa0..2cc10ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
index bd1e4ef..1e4b11f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
@@ -28,7 +28,7 @@
private static final int INCREMENT_VAL = 60000;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SFSBHome home;
@@ -44,20 +44,20 @@
client.doTest();
System.out.println("[multiClient] DONE doTest()...");
stat.printSummary("multi");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- createSFSB(); //create SFSBs
+ createSFSB(); //create SFSBs
initialStateTest(); //access the SFBS
- nonTxNonCheckpointTest();
- nonTxCheckpointTest();
+ nonTxNonCheckpointTest();
+ nonTxCheckpointTest();
}
private void createSFSB() {
- String testCaseName = "ee.multiClient createSFSB ";
+ String testCaseName = "ee.multiClient createSFSB ";
try {
Context ic = new InitialContext();
Object objref = ic.lookup("java:comp/env/ejb/SFSBHome");
@@ -65,92 +65,92 @@
(objref, SFSBHome.class);
sfsb = (SFSB) home.create(accountName, 4000);
System.out.println("[multi] Initalization done");
- stat.addStatus(testCaseName, stat.PASS);
+ stat.addStatus(testCaseName, stat.PASS);
} catch(Exception e) {
e.printStackTrace();
//stat.addStatus("ejbclient localEntityGetEJBObject(-)" , stat.PASS);
System.out.println("[multiClient] Exception in init....");
e.printStackTrace();
- stat.addStatus(testCaseName, stat.FAIL);
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
public void initialStateTest() {
- String testCaseName = "ee.multiClient initialStateTest ";
+ String testCaseName = "ee.multiClient initialStateTest ";
try {
- boolean nameOK = true;
- nameOK = accountName.equals(sfsb.getAccountHolderName());
- int preBalance = sfsb.getBalance();
- int preCheckpointedBalance = sfsb.getCheckpointedBalance();
- boolean balanceOK = (preBalance != preCheckpointedBalance);
- if (!balanceOK) {
- System.out.println(testCaseName + " failing because: "
- + preBalance + " == " + preCheckpointedBalance
- + " failed");
- }
- stat.addStatus(testCaseName,
- ((nameOK && balanceOK) ? stat.PASS : stat.FAIL));
+ boolean nameOK = true;
+ nameOK = accountName.equals(sfsb.getAccountHolderName());
+ int preBalance = sfsb.getBalance();
+ int preCheckpointedBalance = sfsb.getCheckpointedBalance();
+ boolean balanceOK = (preBalance != preCheckpointedBalance);
+ if (!balanceOK) {
+ System.out.println(testCaseName + " failing because: "
+ + preBalance + " == " + preCheckpointedBalance
+ + " failed");
+ }
+ stat.addStatus(testCaseName,
+ ((nameOK && balanceOK) ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- stat.addStatus(testCaseName, stat.FAIL);
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
public void nonTxNonCheckpointTest() {
- String testCaseName = "ee.multiClient nonTxNonCheckpointTest ";
+ String testCaseName = "ee.multiClient nonTxNonCheckpointTest ";
try {
- int preBalance = sfsb.getBalance();
- int preCheckpointedBalance = sfsb.getCheckpointedBalance();
- sfsb.incrementBalance(INCREMENT_VAL);
- sfsb.nonTxNonCheckpointedMethod();
- int postBalance = sfsb.getBalance();
- int postCheckpointedBalance = sfsb.getCheckpointedBalance();
+ int preBalance = sfsb.getBalance();
+ int preCheckpointedBalance = sfsb.getCheckpointedBalance();
+ sfsb.incrementBalance(INCREMENT_VAL);
+ sfsb.nonTxNonCheckpointedMethod();
+ int postBalance = sfsb.getBalance();
+ int postCheckpointedBalance = sfsb.getCheckpointedBalance();
- boolean ok = (preBalance+INCREMENT_VAL== postBalance)
- && (preCheckpointedBalance == postCheckpointedBalance);
- if (!ok) {
- System.out.println(testCaseName + " failing because: "
- + "(" + preBalance + " + " + INCREMENT_VAL
- + " == " + postBalance + ")"
- + " && (" + preCheckpointedBalance + " == "
- + postCheckpointedBalance + ")"
- + " failed");
- }
- stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
+ boolean ok = (preBalance+INCREMENT_VAL== postBalance)
+ && (preCheckpointedBalance == postCheckpointedBalance);
+ if (!ok) {
+ System.out.println(testCaseName + " failing because: "
+ + "(" + preBalance + " + " + INCREMENT_VAL
+ + " == " + postBalance + ")"
+ + " && (" + preCheckpointedBalance + " == "
+ + postCheckpointedBalance + ")"
+ + " failed");
+ }
+ stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus(testCaseName, stat.FAIL);
+ ex.printStackTrace();
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
public void nonTxCheckpointTest() {
- String testCaseName = "ee.multiClient nonTxCheckpointTest ";
+ String testCaseName = "ee.multiClient nonTxCheckpointTest ";
try {
- int preBalance = sfsb.getBalance();
- int preCheckpointedBalance = sfsb.getCheckpointedBalance();
- sfsb.incrementBalance(INCREMENT_VAL);
- sfsb.nonTxCheckpointedMethod();
- int postBalance = sfsb.getBalance();
- int postCheckpointedBalance = sfsb.getCheckpointedBalance();
+ int preBalance = sfsb.getBalance();
+ int preCheckpointedBalance = sfsb.getCheckpointedBalance();
+ sfsb.incrementBalance(INCREMENT_VAL);
+ sfsb.nonTxCheckpointedMethod();
+ int postBalance = sfsb.getBalance();
+ int postCheckpointedBalance = sfsb.getCheckpointedBalance();
- boolean ok = (preBalance+INCREMENT_VAL == postBalance)
- && (preCheckpointedBalance != postCheckpointedBalance)
- && (postBalance == postCheckpointedBalance);
- stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
+ boolean ok = (preBalance+INCREMENT_VAL == postBalance)
+ && (preCheckpointedBalance != postCheckpointedBalance)
+ && (postBalance == postCheckpointedBalance);
+ stat.addStatus(testCaseName, (ok ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus(testCaseName, stat.FAIL);
+ ex.printStackTrace();
+ stat.addStatus(testCaseName, stat.FAIL);
}
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml
index c138ede..c56f4b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/descriptor/sun-ejb-jar.xml
@@ -23,14 +23,14 @@
<ejb>
<ejb-name>SFSBEJB</ejb-name>
<jndi-name>ejb/ejb_ee_methodcheckpoint_multi_SFSB</jndi-name>
- <checkpoint-at-end-of-method>
- <method>
- <method-name>nonTxCheckpointedMethod</method-name>
- </method>
- <method>
- <method-name>txCheckpointedMethod</method-name>
- </method>
- </checkpoint-at-end-of-method>
+ <checkpoint-at-end-of-method>
+ <method>
+ <method-name>nonTxCheckpointedMethod</method-name>
+ </method>
+ <method>
+ <method-name>txCheckpointedMethod</method-name>
+ </method>
+ </checkpoint-at-end-of-method>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
index 69b1e1f..6369ac1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
@@ -24,30 +24,30 @@
{
public String getAccountHolderName()
- throws RemoteException;
+ throws RemoteException;
public int getBalance()
- throws RemoteException;
+ throws RemoteException;
public void incrementBalance(int val)
- throws RemoteException;
+ throws RemoteException;
public int getCheckpointedBalance()
- throws RemoteException;
+ throws RemoteException;
public void nonTxNonCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
public void nonTxCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
public void txNonCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
public void txCheckpointedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
index 149c2ca..9927ab5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
@@ -30,18 +30,18 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private SessionContext sessionCtx;
-
+
private String accountHolderName;
- private transient int balance;
- private int checkpointedBalance;
+ private transient int balance;
+ private int checkpointedBalance;
public void ejbCreate(String accountHolderName, int balance) {
this.accountHolderName = accountHolderName;
- this.balance = balance;
+ this.balance = balance;
}
public void setSessionContext(SessionContext sc) {
@@ -51,11 +51,11 @@
public void ejbRemove() {}
public void ejbActivate() {
- balance = checkpointedBalance;
+ balance = checkpointedBalance;
}
public void ejbPassivate() {
- checkpointedBalance = balance;
+ checkpointedBalance = balance;
}
public String getAccountHolderName() {
@@ -63,15 +63,15 @@
}
public int getBalance() {
- return balance;
+ return balance;
}
public void incrementBalance(int val) {
- balance += val;
+ balance += val;
}
public int getCheckpointedBalance() {
- return checkpointedBalance;
+ return checkpointedBalance;
}
public void nonTxNonCheckpointedMethod() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
index f623efb..226d7ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public SFSB create(String accountHolderName, int balance)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties
index 8162c70..c7ce4b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-methodcheckpoint-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml
index 3d6b8ec..afdf56a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
index b420d80..bcb278f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SFSBHome home;
@@ -44,13 +44,13 @@
client.doTest();
System.out.println("[simpletxClient] DONE doTest()...");
stat.printSummary("simpletx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
}
@@ -76,26 +76,26 @@
public void accessSFSB() {
try {
- boolean actCountOK = true;
- System.out.println("ActivateCount[0]: " + sfsb.getActivateCount());
- actCountOK = sfsb.getActivateCount() == 0;
+ boolean actCountOK = true;
+ System.out.println("ActivateCount[0]: " + sfsb.getActivateCount());
+ actCountOK = sfsb.getActivateCount() == 0;
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- System.out.println("ActivateCount[1]: " + sfsb.getActivateCount());
- actCountOK = (sfsb.getActivateCount() == 1);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ System.out.println("ActivateCount[1]: " + sfsb.getActivateCount());
+ actCountOK = (sfsb.getActivateCount() == 1);
- System.out.println("ActivateCount[2]: " + sfsb.getActivateCount());
- sfsb.getPassivateCount();
- actCountOK = (sfsb.getActivateCount() == 1);
+ System.out.println("ActivateCount[2]: " + sfsb.getActivateCount());
+ sfsb.getPassivateCount();
+ actCountOK = (sfsb.getActivateCount() == 1);
- System.out.println("ActivateCount[3]: " + sfsb.getActivateCount());
- sfsb.getPassivateCount();
- actCountOK = (sfsb.getActivateCount() == 1);
+ System.out.println("ActivateCount[3]: " + sfsb.getActivateCount());
+ sfsb.getPassivateCount();
+ actCountOK = (sfsb.getActivateCount() == 1);
- System.out.println("ActivateCount[4]: " + sfsb.getActivateCount());
- sfsb.getPassivateCount();
- actCountOK = (sfsb.getActivateCount() == 1);
+ System.out.println("ActivateCount[4]: " + sfsb.getActivateCount());
+ sfsb.getPassivateCount();
+ actCountOK = (sfsb.getActivateCount() == 1);
if (nameOK && actCountOK) {
stat.addStatus("ejbclient accessSFSB ", stat.PASS);
@@ -109,14 +109,14 @@
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml
index 3949042..40c9033 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/descriptor/sun-ejb-jar.xml
@@ -23,11 +23,11 @@
<ejb>
<ejb-name>SFSBEJB</ejb-name>
<jndi-name>ejb/ejb_ee_methodcheckpoint_simple_SFSB</jndi-name>
- <checkpoint-at-end-of-method>
- <method>
- <method-name>getName</method-name>
- </method>
- </checkpoint-at-end-of-method>
+ <checkpoint-at-end-of-method>
+ <method>
+ <method-name>getName</method-name>
+ </method>
+ </checkpoint-at-end-of-method>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
index cbfd931..2767e4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
@@ -24,12 +24,12 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
index 98cc749..433efd8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -58,21 +58,21 @@
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
index a3f4a97..6f22dbd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public SFSB create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties
index b0ec730..444bdbb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-autotimer"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml
index 45a2a4f..ccf3d08 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/build.xml
@@ -126,11 +126,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java
index bb3527b..032ec51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends AdminBaseDevTest {
@@ -165,7 +165,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
index 6f1240f..9cc817f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String param = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.timeoutReceived(param));
+ out.println("RESULT:" + bean.timeoutReceived(param));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties
index 6f9871e..ef1b548 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
cluster-name is set to cluster1 in appserv-tests/config, and seems hard
to override. So still use cluster1
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml
index 7004d5e..5f9b44d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/build.xml
@@ -28,7 +28,7 @@
<project name="devtests.ejb.ee.timer" default="usage" basedir=".">
<property file="build.properties"/>
-
+
&commonSetup;
&commonBuild;
&eecommonBuild;
@@ -148,12 +148,12 @@
<target name="compile" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${build.classes.dir}:${env.S1AS_HOME}/lib/javaee.jar:${env.APS_HOME}/lib/reportbuilder.jar:${env.APS_HOME}/lib/reporter.jar"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/AdminBaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${build.classes.dir}:${env.S1AS_HOME}/lib/javaee.jar:${env.APS_HOME}/lib/reportbuilder.jar:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="src" includes="**/*.java">
</javac>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java
index 3ec3075..9d74e2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/MigrateTimersTest.java
@@ -38,7 +38,7 @@
migrateTimersOutsideCluster();
} finally {
//all associated timers will be removed upon undeploy, even if some
- //instances are offline.
+ //instances are offline.
undeployEjb(cluster_name);
}
stat.printSummary();
@@ -48,7 +48,7 @@
//from the same cluster
public void migrateTimers() {
String testName = "migrateTimers";
-
+
//no automatic migration when stopping a instance since gms has been disabled
asadmin("stop-instance", instance_name_1);
AsadminReturn output = asadminWithOutput("migrate-timers", instance_name_1);
@@ -79,7 +79,7 @@
public void migrateTimersOutsideCluster() {
String testName = "migrateTimersOutsideCluster";
-
+
//no automatic migration when stopping a instance since gms has been disabled
asadmin("stop-instance", instance_name_1);
asadmin("start-instance", instance_name_3);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties
index 8129575..18f74cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-domaindeployment"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml
index a303ee2..3ef73ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/build.xml
@@ -203,11 +203,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java
index 992fe83..a6ca556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends AdminBaseDevTest {
@@ -148,7 +148,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
index a3ec2b1..d61cf7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
out.println("<html>");
out.println("<head>");
@@ -51,7 +51,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.countTimers());
+ out.println("RESULT:" + bean.countTimers());
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties
index fe64c1e..78d6213 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-timer-failover"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml
index d51d96e..de57dc7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/build.xml
@@ -137,11 +137,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java
index 9d86b53..582ba02 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends AdminBaseDevTest {
@@ -165,7 +165,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
index 6f1240f..9cc817f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String param = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.timeoutReceived(param));
+ out.println("RESULT:" + bean.timeoutReceived(param));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties
index f5c09d2..17a3279 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-getalltimers"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml
index 58623d3..63f9cd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/build.xml
@@ -129,11 +129,11 @@
</target>
<target name="compile-client" >
- <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
+ <javac fork="true" includeAntRuntime="false" destdir="${build.classes.dir}" debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/*BaseDevTest.java">
</javac>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java
index b14150c..cb21209 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/client/Client.java
@@ -133,7 +133,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
index a65e267..adfedc6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
@@ -44,7 +44,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String param = req.getQueryString();
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties
index 681a385..73ba256 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-txcheckpoint-bmtcmttx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml
index 2b113ae..b39bbea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
index 12edff9..8887a9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
@@ -30,7 +30,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private BMTSessionHome home;
@@ -48,16 +48,16 @@
client.doTest();
System.out.println("[bmttx] DONE doTest()...");
stat.printSummary("bmttx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSB(); //create SFSBs
+ initSFSB(); //create SFSBs
nonTxAccessCheck(); //access the SFBS
txAccessCheck(); //access the SFBS
- txBMTCMTAccess();
+ txBMTCMTAccess();
}
private void initSFSB() {
@@ -86,15 +86,15 @@
public void nonTxAccessCheck() {
try {
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- boolean actCountOK = (sfsb.getActivateCount() == 0);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ boolean actCountOK = (sfsb.getActivateCount() == 0);
if (nameOK && actCountOK) {
- retrievedName = cmtSfsb.getName();
- nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- actCountOK = (cmtSfsb.getActivateCount() == 0);
- }
+ retrievedName = cmtSfsb.getName();
+ nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ actCountOK = (cmtSfsb.getActivateCount() == 0);
+ }
if (nameOK && actCountOK) {
stat.addStatus("bmtcmttx nonTxAccessCheck", stat.PASS);
@@ -109,21 +109,21 @@
public void txAccessCheck() {
try {
- String retrievedName = sfsb.getName();
- sfsb.startTx();
- sfsb.incrementCount();
- sfsb.commitTx();
+ String retrievedName = sfsb.getName();
+ sfsb.startTx();
+ sfsb.incrementCount();
+ sfsb.commitTx();
- boolean actCountOK = (sfsb.getActivateCount() == 1);
+ boolean actCountOK = (sfsb.getActivateCount() == 1);
if (actCountOK) {
stat.addStatus("bmtcmttx BMTtxAccessCheck", stat.PASS);
} else {
stat.addStatus("bmtcmttx BMTtxAccessCheck", stat.FAIL);
}
- cmtSfsb.incrementCount();
- int val = cmtSfsb.getActivateCount();
- actCountOK = (cmtSfsb.getActivateCount() == 1);
+ cmtSfsb.incrementCount();
+ int val = cmtSfsb.getActivateCount();
+ actCountOK = (cmtSfsb.getActivateCount() == 1);
if (actCountOK) {
stat.addStatus("bmtcmttx CMTtxAccessCheck", stat.PASS);
} else {
@@ -137,28 +137,28 @@
private void txBMTCMTAccess() {
try {
- boolean passed = true;
+ boolean passed = true;
- CMTSession cmt = sfsb.getCMTSession();
+ CMTSession cmt = sfsb.getCMTSession();
- int prevCount = sfsb.getActivateCount();
- int prevCMTCount = cmt.getActivateCount();
-
- sfsb.startTx();
+ int prevCount = sfsb.getActivateCount();
+ int prevCMTCount = cmt.getActivateCount();
- sfsb.incrementCount();
- passed = passed && (sfsb.getActivateCount() == prevCount);
+ sfsb.startTx();
- sfsb.accessCMTBean();
- passed = passed && (sfsb.getActivateCount() == prevCount);
+ sfsb.incrementCount();
+ passed = passed && (sfsb.getActivateCount() == prevCount);
- cmt = sfsb.getCMTSession();
- passed = passed && (sfsb.getActivateCount() == prevCount);
+ sfsb.accessCMTBean();
+ passed = passed && (sfsb.getActivateCount() == prevCount);
- sfsb.commitTx();
+ cmt = sfsb.getCMTSession();
+ passed = passed && (sfsb.getActivateCount() == prevCount);
- passed = passed && (sfsb.getActivateCount() == (prevCount+1));
- passed = passed && (cmt.getActivateCount() == (prevCMTCount+1));
+ sfsb.commitTx();
+
+ passed = passed && (sfsb.getActivateCount() == (prevCount+1));
+ passed = passed && (cmt.getActivateCount() == (prevCMTCount+1));
if (passed) {
stat.addStatus("bmtcmttx txBMTCMTAccess", stat.PASS);
@@ -171,14 +171,14 @@
}
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml
index db42b4a..264cd5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/ejb-jar.xml
@@ -35,7 +35,7 @@
<ejb-ref-type>Session</ejb-ref-type>
<home>com.sun.s1asdev.ejb.ee.ejb.CMTSessionHome</home>
<remote>com.sun.s1asdev.ejb.ee.ejb.CMTSession</remote>
- <ejb-link>CMTSession</ejb-link>
+ <ejb-link>CMTSession</ejb-link>
</ejb-ref>
<security-identity>
<use-caller-identity/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml
index 5598b5d..8880823 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_ee_bmtcmttx_BMTSession</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
<ejb>
@@ -33,7 +33,7 @@
<jndi-name>ejb/ejb_ee_bmtcmttx_CMTSession</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
index 8b8837d..385bf74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
@@ -24,29 +24,29 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
public void startTx()
- throws RemoteException;
+ throws RemoteException;
public void commitTx()
- throws RemoteException;
+ throws RemoteException;
public void rollbackTx()
- throws RemoteException;
+ throws RemoteException;
public void incrementCount()
- throws RemoteException;
+ throws RemoteException;
public void accessCMTBean()
- throws RemoteException;
+ throws RemoteException;
public CMTSession getCMTSession()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
index 0c801dd..9a31987 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class BMTSessionBean
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -39,11 +39,11 @@
private int activateCount;
private int passivateCount;
- private int count;
+ private int count;
private SessionContext sessionCtx;
private String sfsbName;
- private UserTransaction userTx;
+ private UserTransaction userTx;
private CMTSessionHome cmtHome;
private CMTSession cmtSfsb;
@@ -55,19 +55,19 @@
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
this.sfsbName = sfsbName;
- try {
- InitialContext ic = new InitialContext();
- Object objref = ic.lookup("java:comp/env/ejb/CMTSessionHome");
- cmtHome = (CMTSessionHome)PortableRemoteObject.narrow(
- objref, CMTSessionHome.class);
- cmtSfsb = (CMTSession) cmtHome.create(sfsbName);
+ try {
+ InitialContext ic = new InitialContext();
+ Object objref = ic.lookup("java:comp/env/ejb/CMTSessionHome");
+ cmtHome = (CMTSessionHome)PortableRemoteObject.narrow(
+ objref, CMTSessionHome.class);
+ cmtSfsb = (CMTSession) cmtHome.create(sfsbName);
- for (int i=0; i<MAX_SIZE; i++) {
- cmtSessions[i] = (CMTSession) cmtHome.create(sfsbName + i);
- }
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ for (int i=0; i<MAX_SIZE; i++) {
+ cmtSessions[i] = (CMTSession) cmtHome.create(sfsbName + i);
+ }
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public String getName() {
@@ -80,63 +80,63 @@
}
public void startTx() {
- try {
- userTx = sessionCtx.getUserTransaction();
- userTx.begin();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx = sessionCtx.getUserTransaction();
+ userTx.begin();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void commitTx() {
- try {
- userTx.commit();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.commit();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void rollbackTx() {
- try {
- userTx.rollback();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.rollback();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void incrementCount() {
- count++;
+ count++;
}
public void accessCMTBean()
- throws java.rmi.RemoteException
+ throws java.rmi.RemoteException
{
- cmtSfsb.incrementCount();
- for (int i=0; i<MAX_SIZE; i++) {
- cmtSessions[i].incrementCount();
- }
+ cmtSfsb.incrementCount();
+ for (int i=0; i<MAX_SIZE; i++) {
+ cmtSessions[i].incrementCount();
+ }
}
public CMTSession getCMTSession() {
- return cmtSfsb;
+ return cmtSfsb;
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
index 5af1269..239bad6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public BMTSession create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
index 8105e44..a1c1eb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
@@ -24,15 +24,15 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
public void incrementCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
index b6b78eb..06ec1c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class CMTSessionBean
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -39,7 +39,7 @@
private int activateCount;
private int passivateCount;
- private int count;
+ private int count;
private SessionContext sessionCtx;
private String sfsbName;
@@ -59,25 +59,25 @@
}
public void incrementCount() {
- count++;
+ count++;
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
index 1b72c60..5e6e187 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public CMTSession create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties
index 3c09bd3..5cef791 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-txcheckpoint-bmttx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml
index e9c69142..64b8d4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
index 1b3aea0..8aa45bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private BMTSessionHome home;
@@ -44,14 +44,14 @@
client.doTest();
System.out.println("[bmttx] DONE doTest()...");
stat.printSummary("bmttx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSB(); //create SFSBs
- checkPersistedFirstTime();
+ initSFSB(); //create SFSBs
+ checkPersistedFirstTime();
txAccessCheck(); //access the SFBS
}
@@ -76,96 +76,96 @@
public void checkPersistedFirstTime() {
try {
- int prevActCount = sfsb.getActivateCount();
- int nowActCount = sfsb.getActivateCount();
+ int prevActCount = sfsb.getActivateCount();
+ int nowActCount = sfsb.getActivateCount();
- sfsb.startTx();
- sfsb.getTxName();
- sfsb.commitTx();
+ sfsb.startTx();
+ sfsb.getTxName();
+ sfsb.commitTx();
- sfsb.startTx();
- sfsb.getTxName();
- sfsb.commitTx();
+ sfsb.startTx();
+ sfsb.getTxName();
+ sfsb.commitTx();
- stat.addStatus("ejbclient checkPersistedFirstTime"
- + "(" + prevActCount + " : " + nowActCount + " : "
- + sfsb.getActivateCount() + ")", stat.PASS);
- } catch (Exception ex) {
- stat.addStatus("ejbclient checkPersistedFirstTime", stat.FAIL);
- }
+ stat.addStatus("ejbclient checkPersistedFirstTime"
+ + "(" + prevActCount + " : " + nowActCount + " : "
+ + sfsb.getActivateCount() + ")", stat.PASS);
+ } catch (Exception ex) {
+ stat.addStatus("ejbclient checkPersistedFirstTime", stat.FAIL);
+ }
}
public void txAccessCheck() {
try {
- int prevActCount = 0;
- int nowActCount = 0;
-
- prevActCount = sfsb.getActivateCount();
- sfsb.getName();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient NonTxNonCheckpointedMethod"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ int prevActCount = 0;
+ int nowActCount = 0;
- prevActCount = sfsb.getActivateCount();
- sfsb.checkpoint();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient NonTxCheckpointedMethod"
- + " (" + prevActCount + " != " + nowActCount + ")",
- ((prevActCount != nowActCount) ? stat.PASS : stat.FAIL));
+ prevActCount = sfsb.getActivateCount();
+ sfsb.getName();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient NonTxNonCheckpointedMethod"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- prevActCount = nowActCount;
- sfsb.startTx();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient utBeginCheck"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ prevActCount = sfsb.getActivateCount();
+ sfsb.checkpoint();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient NonTxCheckpointedMethod"
+ + " (" + prevActCount + " != " + nowActCount + ")",
+ ((prevActCount != nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.incrementCount();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient TxBusinessMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ prevActCount = nowActCount;
+ sfsb.startTx();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient utBeginCheck"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.getTxName();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient TxMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.incrementCount();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient TxBusinessMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.getName();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient NonTxMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.getTxName();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient TxMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.checkpoint();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient checkpointedMethodInsideTx"
- + " (" + prevActCount + " == " + nowActCount + ")",
- ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.getName();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient NonTxMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
- sfsb.commitTx();
- nowActCount = sfsb.getActivateCount();
- stat.addStatus("ejbclient commitTxCheck"
- + " (" + prevActCount + " == " + nowActCount + ")",
- (((prevActCount+1) == nowActCount) ? stat.PASS : stat.FAIL));
+ sfsb.checkpoint();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient checkpointedMethodInsideTx"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ ((prevActCount == nowActCount) ? stat.PASS : stat.FAIL));
+
+ sfsb.commitTx();
+ nowActCount = sfsb.getActivateCount();
+ stat.addStatus("ejbclient commitTxCheck"
+ + " (" + prevActCount + " == " + nowActCount + ")",
+ (((prevActCount+1) == nowActCount) ? stat.PASS : stat.FAIL));
} catch (Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
stat.addStatus("ejbclient txAccessCheck", stat.FAIL);
}
}
private void sleepFor(int seconds) {
- System.out.println("Waiting for " + seconds + " seconds before accessing...");
- for (int i=0; i<seconds; i++) {
- System.out.println("" + (seconds - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for " + seconds + " seconds before accessing...");
+ for (int i=0; i<seconds; i++) {
+ System.out.println("" + (seconds - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml
index be15662..25ab282 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/descriptor/sun-ejb-jar.xml
@@ -25,16 +25,16 @@
<jndi-name>ejb/ejb_ee_bmttx_BMTSession</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
- <checkpoint-at-end-of-method>
- <method>
- <method-name>checkpoint</method-name>
- </method>
- <method>
- <method-name>checkpoint2</method-name>
- </method>
- </checkpoint-at-end-of-method>
+ <checkpoint-at-end-of-method>
+ <method>
+ <method-name>checkpoint</method-name>
+ </method>
+ <method>
+ <method-name>checkpoint2</method-name>
+ </method>
+ </checkpoint-at-end-of-method>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
index 117d1cc..d2dc5dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
@@ -24,33 +24,33 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public String getTxName()
- throws RemoteException;
+ throws RemoteException;
public void checkpoint()
- throws RemoteException;
+ throws RemoteException;
public void checkpoint2()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
public void startTx()
- throws RemoteException;
+ throws RemoteException;
public void commitTx()
- throws RemoteException;
+ throws RemoteException;
public void rollbackTx()
- throws RemoteException;
+ throws RemoteException;
public void incrementCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
index adcc198..a838ad0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class BMTSessionBean
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -39,11 +39,11 @@
private int activateCount;
private int passivateCount;
- private int count;
+ private int count;
private SessionContext sessionCtx;
private String sfsbName;
- private UserTransaction userTx;
+ private UserTransaction userTx;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -70,50 +70,50 @@
}
public void startTx() {
- try {
- userTx = sessionCtx.getUserTransaction();
- userTx.begin();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx = sessionCtx.getUserTransaction();
+ userTx.begin();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void commitTx() {
- try {
- userTx.commit();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.commit();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void rollbackTx() {
- try {
- userTx.rollback();
- } catch (Exception ex) {
- throw new EJBException(ex.toString());
- }
+ try {
+ userTx.rollback();
+ } catch (Exception ex) {
+ throw new EJBException(ex.toString());
+ }
}
public void incrementCount() {
- count++;
+ count++;
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
index 5af1269..239bad6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public BMTSession create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml
index d286e90..6c36e60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/build.xml
@@ -53,9 +53,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ee tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ee tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties
index 7c9bfa2..3fc6f69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ee-txcheckpoint-simpletx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml
index ef16a26..75c7008 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
index e3917bf..5f1ebb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private SFSBHome home;
@@ -44,17 +44,17 @@
client.doTest();
System.out.println("[simpletxClient] DONE doTest()...");
stat.printSummary("simpletx");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
cmtNonTxAccess(); //access the SFBS
cmtTxAccess(); //access the SFBS
cmtNonTxAccess(sfsb); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -78,12 +78,12 @@
public void cmtTxAccess() {
try {
- int prevCount = sfsb.getActivateCount();
- String retrievedName = sfsb.getTxName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- int nowCount = sfsb.getActivateCount();
- boolean actCountOK = (prevCount+1 == nowCount);
- String msg = "(" + prevCount + "+1 == " + nowCount + ")";
+ int prevCount = sfsb.getActivateCount();
+ String retrievedName = sfsb.getTxName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ int nowCount = sfsb.getActivateCount();
+ boolean actCountOK = (prevCount+1 == nowCount);
+ String msg = "(" + prevCount + "+1 == " + nowCount + ")";
if (nameOK && actCountOK) {
stat.addStatus("ejbclient cmtTxAccess " + msg, stat.PASS);
} else {
@@ -97,12 +97,12 @@
public void cmtNonTxAccess() {
try {
- int prevCount = sfsb.getActivateCount();
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- int nowCount = sfsb.getActivateCount();
- boolean actCountOK = (prevCount == nowCount);
- String msg = "(" + prevCount + " == " + nowCount + ")";
+ int prevCount = sfsb.getActivateCount();
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ int nowCount = sfsb.getActivateCount();
+ boolean actCountOK = (prevCount == nowCount);
+ String msg = "(" + prevCount + " == " + nowCount + ")";
if (nameOK && actCountOK) {
stat.addStatus("ejbclient cmtNonTxAccess " + msg, stat.PASS);
} else {
@@ -116,63 +116,63 @@
public void cmtNonTxAccess(SFSB sfsb) {
for (int i=0; i<200; i++) {
- try {
- int prevCount = sfsb.getActivateCount();
- String retrievedName = sfsb.getName();
- boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
- int nowCount = sfsb.getActivateCount();
- boolean actCountOK = (prevCount == nowCount);
- String msg = "(" + prevCount + " == " + nowCount + ")";
+ try {
+ int prevCount = sfsb.getActivateCount();
+ String retrievedName = sfsb.getName();
+ boolean nameOK = _sfsbPrefix.equalsIgnoreCase(retrievedName);
+ int nowCount = sfsb.getActivateCount();
+ boolean actCountOK = (prevCount == nowCount);
+ String msg = "(" + prevCount + " == " + nowCount + ")";
if (nameOK && actCountOK) {
stat.addStatus("ejbclient cmtNonTxAccess_2 " + msg, stat.PASS);
} else {
- stat.addStatus("ejbclient cmtNonTxAccess_2", stat.FAIL);
+ stat.addStatus("ejbclient cmtNonTxAccess_2", stat.FAIL);
}
- System.out.println("[" + i + "] cmtNonTxAccess_2 status: " + (nameOK && actCountOK));
+ System.out.println("[" + i + "] cmtNonTxAccess_2 status: " + (nameOK && actCountOK));
} catch (Exception ex) {
stat.addStatus("ejbclient cmtNonTxAccess_2", stat.FAIL);
}
- sleepFor(1, false);
- }
+ sleepFor(1, false);
+ }
}
public void removeTest() {
- SFSB sfsb = null;
- boolean passed = false;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getTxName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- sfsb.remove();
- try {
- sfsb.getTxName();
- passed = false; //Expecting an exception
- } catch (Exception ex) {
- passed = true;
- }
+ SFSB sfsb = null;
+ boolean passed = false;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getTxName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ sfsb.remove();
+ try {
+ sfsb.getTxName();
+ passed = false; //Expecting an exception
+ } catch (Exception ex) {
+ passed = true;
+ }
if (passed) {
stat.addStatus("ejbclient removeTest_1 ", stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest_1", stat.FAIL);
+ stat.addStatus("ejbclient removeTest_1", stat.FAIL);
}
- passed = false;
- myName = "_4_" + _sfsbPrefix + "_4_";
- sfsb = (SFSB) home.create(myName);
- retrievedName = sfsb.getName();
- nameOK = myName.equalsIgnoreCase(retrievedName);
- sfsb.remove();
- try {
- sfsb.getName();
- passed = false; //Expecting an exception
- } catch (Exception ex) {
- passed = true;
- }
+ passed = false;
+ myName = "_4_" + _sfsbPrefix + "_4_";
+ sfsb = (SFSB) home.create(myName);
+ retrievedName = sfsb.getName();
+ nameOK = myName.equalsIgnoreCase(retrievedName);
+ sfsb.remove();
+ try {
+ sfsb.getName();
+ passed = false; //Expecting an exception
+ } catch (Exception ex) {
+ passed = true;
+ }
if (passed) {
stat.addStatus("ejbclient removeTest_2 ", stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest_2", stat.FAIL);
+ stat.addStatus("ejbclient removeTest_2", stat.FAIL);
}
} catch (Exception ex) {
@@ -181,22 +181,22 @@
}
private void sleepFor(int seconds) {
- sleepFor(seconds, true);
+ sleepFor(seconds, true);
}
private void sleepFor(int seconds, boolean verbose) {
- if (verbose) {
- System.out.println("Waiting for " + seconds + " before accessing...");
- }
- for (int i=0; i<seconds; i++) {
- if (verbose) {
- System.out.println("" + (seconds - i) + " seconds left...");
- }
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ if (verbose) {
+ System.out.println("Waiting for " + seconds + " before accessing...");
+ }
+ for (int i=0; i<seconds; i++) {
+ if (verbose) {
+ System.out.println("" + (seconds - i) + " seconds left...");
+ }
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
}
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml
index 872d74c..3fccde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/descriptor/sun-ejb-jar.xml
@@ -25,8 +25,8 @@
<jndi-name>ejb/ejb_ee_txcheckpoint_simpletx_SFSB</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
- <removal-timeout-in-seconds>60</removal-timeout-in-seconds>
+ <resize-quantity>4</resize-quantity>
+ <removal-timeout-in-seconds>60</removal-timeout-in-seconds>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
index 50288b5..939c12b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
@@ -24,15 +24,15 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public String getTxName()
- throws RemoteException;
+ throws RemoteException;
public int getActivateCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivateCount()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
index 253149b..b4b2388 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -60,21 +60,21 @@
}
public int getActivateCount() {
- return activateCount;
+ return activateCount;
}
public int getPassivateCount() {
- return passivateCount;
+ return passivateCount;
}
public void ejbRemove() {}
public void ejbActivate() {
- activateCount++;
+ activateCount++;
}
public void ejbPassivate() {
- passivateCount++;
+ passivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
index 82a15e9..fe8bd43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
@@ -24,6 +24,6 @@
extends EJBHome
{
public SFSB create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties
index d873ee2..a0941b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb30-allowed"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml
index 58cefeb..7d62159 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,14 +47,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class, **/*Operation.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -62,10 +62,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
index 8f45ca5..592ea3b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,39 +34,39 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-allowed-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sless sless;
public void doTest() {
try {
- sless.sayHello();
+ sless.sayHello();
stat.addStatus("local setup", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("local setup", stat.FAIL);
}
- boolean result = false;
+ boolean result = false;
try {
- result = sless.lookupUserTransactionFromBMTBean();
- } catch (Exception ex) {
+ result = sless.lookupUserTransactionFromBMTBean();
+ } catch (Exception ex) {
stat.addStatus("local BMTOp_Ex", stat.FAIL);
- }
+ }
stat.addStatus("local BMTUserTx",
- (result ? stat.PASS : stat.FAIL));
+ (result ? stat.PASS : stat.FAIL));
try {
- result = sless.lookupUserTransactionFromCMTBean();
- } catch (Exception ex) {
+ result = sless.lookupUserTransactionFromCMTBean();
+ } catch (Exception ex) {
stat.addStatus("local CMTOp_Ex", stat.FAIL);
- }
+ }
stat.addStatus("local CMTUserTx",
- (result ? stat.PASS : stat.FAIL));
+ (result ? stat.PASS : stat.FAIL));
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
index d26cd03..46862ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -30,15 +30,15 @@
private CMTOperation cmtOp;
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean lookupUserTransactionFromCMTBean() {
- return cmtOp.lookupUserTransaction();
+ return cmtOp.lookupUserTransaction();
}
public boolean lookupUserTransactionFromBMTBean() {
- return bmtOp.lookupUserTransaction();
+ return bmtOp.lookupUserTransaction();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml
index bbfda43..f117638 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/build.xml
@@ -29,12 +29,12 @@
&reporting;
<target name="all">
- <!--- currently use SE client . switch back to appclient -->
+ <!--- currently use SE client . switch back to appclient -->
<antcall target="allowed"/>
<antcall target="clientview"/>
<antcall target="hello"/>
<antcall target="interceptors"/>
- <antcall target="persistence"/>
+ <antcall target="persistence"/>
</target>
@@ -69,9 +69,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30 tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30 tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties
index dc9d71c..74989f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-clientview-adapted"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.ejb30.clientview.adapted.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml
index 0f964b0..43ffc4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Common*.class,**/Dummy*.class,**/Hello*.class,**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/DummySless*.class,**/DummyRemote*.class,**/Hello.class,**/SfulRemoteHome.class,**/SlessRemoteHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
</target>
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -71,10 +71,10 @@
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
index a9a712c..358488e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
static final int NUM_EXTRA_HELLOS = 6;
@@ -41,26 +41,26 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-clientview-adaptedID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
Set<Hello> hellos = new HashSet<Hello>();
try {
- String lookupStr =
- "java:comp/env/com.sun.s1asdev.ejb.ejb30.clientview.adapted.client.Client/hr";
+ String lookupStr =
+ "java:comp/env/com.sun.s1asdev.ejb.ejb30.clientview.adapted.client.Client/hr";
- if( hr == null ) {
- System.out.println("In stand-alone mode");
- lookupStr = "ejb/ejb_ejb30_clientview_adapted_Hello";
- hr = (Hello) new InitialContext().lookup(lookupStr);
- }
+ if( hr == null ) {
+ System.out.println("In stand-alone mode");
+ lookupStr = "ejb/ejb_ejb30_clientview_adapted_Hello";
+ hr = (Hello) new InitialContext().lookup(lookupStr);
+ }
hellos.add(hr);
InitialContext ic = new InitialContext();
@@ -76,23 +76,23 @@
int numPassivatedActivated = 0;
for(Hello next : hellos) {
-
-
- if( next.hasBeenPassivatedActivated() ) {
+
+
+ if( next.hasBeenPassivatedActivated() ) {
numPassivatedActivated++;
}
-
+
System.out.println("Running test for " + next);
// do something right here
System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
next.warmup(Common.STATEFUL);
runTests(Common.STATEFUL, next);
-
+
System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
next.warmup(Common.STATEFUL);
runTests(Common.STATELESS, next);
-
+
next.shutdown();
}
@@ -100,26 +100,26 @@
throw new Exception("Passivation/Activation could not be tested. No Passivation/Activation occurred");
}
- System.out.println("Hellos.size() : " + hellos.size() + " passivationCount: " + numPassivatedActivated);
-
- stat.addStatus("local main", stat.PASS);
+ System.out.println("Hellos.size() : " + hellos.size() + " passivationCount: " + numPassivatedActivated);
- boolean refResult1 = hr.checkSlessLocalReferences();
- stat.addStatus("local checkSlessReferences",
- (refResult1 == true) ? stat.PASS : stat.FAIL);
+ stat.addStatus("local main", stat.PASS);
- boolean refResult2 = hr.checkSfulLocalReferences();
- stat.addStatus("local checkSfulLocalReferences",
- (refResult2 == true) ? stat.PASS : stat.FAIL);
-
+ boolean refResult1 = hr.checkSlessLocalReferences();
+ stat.addStatus("local checkSlessReferences",
+ (refResult1 == true) ? stat.PASS : stat.FAIL);
+
+ boolean refResult2 = hr.checkSfulLocalReferences();
+ stat.addStatus("local checkSfulLocalReferences",
+ (refResult2 == true) ? stat.PASS : stat.FAIL);
+
boolean refSlessResult = hr.checkSlessRemoteReferences();
- stat.addStatus("local checkSlessRemoteReferences",
- (refSlessResult == true) ? stat.PASS : stat.FAIL);
-
+ stat.addStatus("local checkSlessRemoteReferences",
+ (refSlessResult == true) ? stat.PASS : stat.FAIL);
+
boolean refResult3 = hr.checkSfulRemoteReferences();
- stat.addStatus("local checkSfulRemoteReferences",
- (refResult3 == true) ? stat.PASS : stat.FAIL);
-
+ stat.addStatus("local checkSfulRemoteReferences",
+ (refResult3 == true) ? stat.PASS : stat.FAIL);
+
DummyRemote ref1 = hr.getSfulRemoteBusiness(1);
DummyRemote ref2 = hr.getSfulRemoteBusiness(2);
boolean refResult4 = ref1.equals(ref1);
@@ -130,7 +130,7 @@
boolean refResult9 = hr.compareRemoteRefs(ref1, ref2);
boolean refResult10 = hr.compareRemoteRefs(ref1, hr);
boolean refResult11 = hr.compareRemoteRefs(ref1, null);
-
+
boolean refResultSummary = (refResult4 == true)
&& (refResult5 == true)
&& (refResult6 == false)
@@ -139,34 +139,34 @@
&& (refResult9 == false)
&& (refResult10 == false)
&& (refResult11 == false);
-
+
stat.addStatus("local compareRemoteReferences",
- (refResult3 == true) ? stat.PASS : stat.FAIL);
-
+ (refResult3 == true) ? stat.PASS : stat.FAIL);
+
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
-
+
private void runTests(int type, Hello hr)
- throws Exception
+ throws Exception
{
-
+
hr.notSupported(type, true);
hr.notSupported(type, false);
hr.supports(type, true);
- hr.supports(type, false);
+ hr.supports(type, false);
hr.required(type, true);
- hr.required(type, false);
+ hr.required(type, false);
hr.requiresNew(type, true);
- hr.requiresNew(type, false);
+ hr.requiresNew(type, false);
hr.mandatory(type, true);
- hr.never(type, false);
+ hr.never(type, false);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml
index 39a4b78..1635486 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_ejb30_clientview_adapted_Hello</jndi-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>5</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
index c5c7ae2..70b5fb0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
@@ -18,7 +18,7 @@
import jakarta.ejb.*;
-public interface Common
+public interface Common
{
public static final int STATELESS = 0;
public static final int STATEFUL = 1;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java
index 010d7e7..c7e0725 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/CommonRemoteLocalBusinessSuper.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
-public interface CommonRemoteLocalBusinessSuper
+public interface CommonRemoteLocalBusinessSuper
{
void sharedRemoteLocalBusinessSuper(boolean expectTx);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
index 55b0525..8e0a4c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
@@ -38,15 +38,15 @@
boolean checkSlessLocalReferences();
boolean checkSfulLocalReferences();
-
+
public boolean checkSlessRemoteReferences();
-
+
public boolean checkSfulRemoteReferences();
public DummyRemote getSfulRemoteBusiness(int num);
-
+
public DummyRemote2 getSfulRemoteBusiness2(int num);
-
+
public boolean compareRemoteRefs(Object ref1, Object ref2);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
index 3a17bce..db122eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
@@ -38,13 +38,13 @@
context = sc;
}
- @EJB private SlessBusiness2 slessBusiness2;
+ @EJB private SlessBusiness2 slessBusiness2;
@EJB private SfulBusiness2 sfulBusiness2;
- @EJB protected SlessRemoteBusiness2 slessRemoteBusiness2;
+ @EJB protected SlessRemoteBusiness2 slessRemoteBusiness2;
@EJB public SfulRemoteBusiness2 sfulRemoteBusiness2;
@EJB public SfulHome sfulHome;
- public Sful sful;
+ public Sful sful;
@EJB public SfulBusiness sfulBusiness;
@@ -54,7 +54,7 @@
@EJB public SlessBusiness slessBusiness;
@EJB public SfulRemoteHome sfulRemoteHome;
- public SfulRemote sfulRemote;
+ public SfulRemote sfulRemote;
@EJB public SfulRemoteBusiness sfulRemoteBusiness;
@@ -70,30 +70,30 @@
jakarta.transaction.UserTransaction ut;
- @EJB private SlessBusiness refSless_1;
- @EJB private SlessBusiness refSless_2;
- @EJB private SlessBusiness2 refSless2_1;
- @EJB private SlessBusiness2 refSless2_2;
+ @EJB private SlessBusiness refSless_1;
+ @EJB private SlessBusiness refSless_2;
+ @EJB private SlessBusiness2 refSless2_1;
+ @EJB private SlessBusiness2 refSless2_2;
- @EJB private SfulBusiness refSful_1;
- @EJB private SfulBusiness refSful_2;
- @EJB private SfulBusiness2 refSful2_1;
- @EJB private SfulBusiness2 refSful2_2;
-
- @EJB private DummySlessRemote refRemoteSless_1;
- @EJB private DummySlessRemote refRemoteSless_2;
- @EJB private DummySlessRemote2 refRemoteSless2_1;
- @EJB private DummySlessRemote2 refRemoteSless2_2;
-
- @EJB private DummyRemote refRemoteSful_1;
- @EJB private DummyRemote refRemoteSful_2;
- @EJB private DummyRemote2 refRemoteSful2_1;
- @EJB private DummyRemote2 refRemoteSful2_2;
+ @EJB private SfulBusiness refSful_1;
+ @EJB private SfulBusiness refSful_2;
+ @EJB private SfulBusiness2 refSful2_1;
+ @EJB private SfulBusiness2 refSful2_2;
+
+ @EJB private DummySlessRemote refRemoteSless_1;
+ @EJB private DummySlessRemote refRemoteSless_2;
+ @EJB private DummySlessRemote2 refRemoteSless2_1;
+ @EJB private DummySlessRemote2 refRemoteSless2_2;
+
+ @EJB private DummyRemote refRemoteSful_1;
+ @EJB private DummyRemote refRemoteSful_2;
+ @EJB private DummyRemote2 refRemoteSful2_1;
+ @EJB private DummyRemote2 refRemoteSful2_2;
@PostConstruct
public void create() {
- try {
+ try {
slessBusiness2.foo();
sfulBusiness2.foo();
@@ -114,10 +114,10 @@
sfulRemoteBusiness2.bar();
sful = sfulHome.create();
- System.out.println("Created local sful objs via homes.");
+ System.out.println("Created local sful objs via homes.");
sless = slessHome.create();
- System.out.println("Created local sless objs via homes.");
+ System.out.println("Created local sless objs via homes.");
// There are two create<METHOD> methods with the same signature.
// The first is mapped to an @Init method that ignores its input
@@ -143,18 +143,18 @@
}
slessRemote = slessRemoteHome.create();
- System.out.println("Created remote sless objs via homes.");
+ System.out.println("Created remote sless objs via homes.");
ut = context.getUserTransaction();
-
- System.out.println("**1** refSlessBusiness_1 : " + refSless_1);
- System.out.println("**1** refSlessBusiness_2 : " + refSless_2);
- System.out.println("**1** refSlessBusiness2_1 : " + refSless2_1);
- System.out.println("**1** refSlessBusiness2_2 : " + refSless2_2);
- System.out.println("**1** checkLocalReferences() ==> " + checkSlessLocalReferences());
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+
+ System.out.println("**1** refSlessBusiness_1 : " + refSless_1);
+ System.out.println("**1** refSlessBusiness_2 : " + refSless_2);
+ System.out.println("**1** refSlessBusiness2_1 : " + refSless2_1);
+ System.out.println("**1** refSlessBusiness2_2 : " + refSless2_2);
+ System.out.println("**1** checkLocalReferences() ==> " + checkSlessLocalReferences());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
@PrePassivate public void prePassivate() {
@@ -165,12 +165,12 @@
@PostActivate public void postActivate() {
System.out.println("In HelloEJB::postActivate");
- // @@@ temporary workaround until UserTransaction serialization is fixed
- ut = context.getUserTransaction();
+ // @@@ temporary workaround until UserTransaction serialization is fixed
+ ut = context.getUserTransaction();
activateCount++;
}
-
+
public void shutdown() throws EJBException {
try {
@@ -185,7 +185,7 @@
}
try {
- sfulBusiness.remove();
+ sfulBusiness.remove();
throw new EJBException("2nd sfulBusiness remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -194,7 +194,7 @@
sful.remove();
try {
- sful.remove();
+ sful.remove();
throw new EJBException("2nd sful remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -216,7 +216,7 @@
}
try {
- sfulRemoteBusiness.remove();
+ sfulRemoteBusiness.remove();
throw new EJBException("2nd sfulRemoteBusiness remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -225,7 +225,7 @@
sfulRemote.remove();
try {
- sfulRemote.remove();
+ sfulRemote.remove();
throw new EJBException("2nd sfulRemote remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -235,7 +235,7 @@
// Doesn't matter how many times we call slessRemote remove()
slessRemote.remove();
slessRemote.remove();
-
+
} catch(Exception e) {
EJBException ejbEx = new EJBException();
@@ -273,85 +273,85 @@
warmup(type, true, false);
warmup(type, false, true);
warmup(type, false, false);
-
- // Measure looping and timing overhead
+
+ // Measure looping and timing overhead
long begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
}
long end = System.currentTimeMillis();
overhead = end - begin;
-
+
ut = context.getUserTransaction();
-
+
testLocalObjects(sful, sless);
testEJBObjects(sfulRemote, slessRemote);
-
+
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
}
- private void warmup(int type, boolean tx, boolean businessView)
+ private void warmup(int type, boolean tx, boolean businessView)
throws Exception {
- // get Hotspot warmed up
- Common bean = pre(type, tx, businessView);
- CommonRemote beanRemote = preRemote(type, tx, businessView);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
+ // get Hotspot warmed up
+ Common bean = pre(type, tx, businessView);
+ CommonRemote beanRemote = preRemote(type, tx, businessView);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
beanRemote.requiresNew();
- bean.notSupported();
+ bean.notSupported();
beanRemote.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
beanRemote.required();
- if ( tx ) {
- bean.mandatory();
+ if ( tx ) {
+ bean.mandatory();
beanRemote.mandatory();
} else {
- bean.never();
+ bean.never();
beanRemote.never();
}
- bean.supports();
+ bean.supports();
beanRemote.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
}
- private Common pre(int type, boolean tx, boolean businessView)
+ private Common pre(int type, boolean tx, boolean businessView)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
- ex.printStackTrace();
- }
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ ex.printStackTrace();
+ }
- if ( type == Common.STATELESS )
+ if ( type == Common.STATELESS )
return businessView ? slessBusiness : sless;
- else
+ else
return businessView ? sfulBusiness : sful;
}
- private CommonRemote preRemote(int type, boolean tx, boolean businessView)
- {
- if ( type == Common.STATELESS ) {
- return businessView ? slessRemoteBusiness : slessRemote;
+ private CommonRemote preRemote(int type, boolean tx, boolean businessView)
+ {
+ if ( type == Common.STATELESS ) {
+ return businessView ? slessRemoteBusiness : slessRemote;
} else {
- return businessView ? sfulRemoteBusiness : sfulRemote;
+ return businessView ? sfulRemoteBusiness : sfulRemote;
}
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
- ex.printStackTrace();
- }
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ ex.printStackTrace();
+ }
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -381,7 +381,7 @@
return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -407,11 +407,11 @@
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
- }
- return post(begin, end, tx);
+ }
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -433,16 +433,16 @@
for ( int i=0; i<ITERATIONS; i++ ) {
beanRemoteBusiness.required();
}
-
+
end = System.currentTimeMillis();
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -451,7 +451,7 @@
Common busBean = pre(type, tx, true);
CommonRemote beanRemote = preRemote(type, tx, false);
CommonRemote beanRemoteBusiness = preRemote(type, tx, true);
- begin = System.currentTimeMillis();
+ begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
bean.mandatory();
}
@@ -470,7 +470,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
public float never(int type, boolean tx)
@@ -500,10 +500,10 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -531,7 +531,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
// assumes lo1 and lo2 are do not have same client identity
@@ -575,11 +575,11 @@
if( o1.isIdentical(o2) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( o2.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( !o1.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
@@ -607,7 +607,7 @@
if( md == null ) {
throw new EJBException("null md");
}
- System.out.println("md = " + md);
+ System.out.println("md = " + md);
HomeHandle hh = home.getHomeHandle();
if( hh == null ) {
@@ -633,18 +633,18 @@
}
o1.hashCode();
-
+
o2.hashCode();
-
+
o1.toString();
o2.toString();
-
+
}
-
+
public boolean checkSlessLocalReferences() {
boolean result = (refSless_1 != null);
-
+
result = result && refSless_1.equals(refSless_1);
result = result && refSless_1.equals(refSless_2);
result = result && (! refSless_1.equals(refSless2_1));
@@ -655,7 +655,7 @@
result = result && (! refSless_1.equals(sfulBusiness));
result = result && (! refSless_1.equals(sfulRemote));
result = result && (! refSless_1.equals(sfulRemoteHome));
-
+
result = result && (refSless_2 != null);
result = result && refSless_2.equals(refSless_1);
result = result && refSless_2.equals(refSless_2);
@@ -667,7 +667,7 @@
result = result && (! refSless_2.equals(sfulBusiness));
result = result && (! refSless_2.equals(sfulRemote));
result = result && (! refSless_2.equals(sfulRemoteHome));
-
+
result = result && (refSless2_1 != null);
result = result && refSless2_1.equals(refSless2_1);
result = result && refSless2_1.equals(refSless2_2);
@@ -679,7 +679,7 @@
result = result && (! refSless2_1.equals(sfulBusiness));
result = result && (! refSless2_1.equals(sfulRemote));
result = result && (! refSless2_1.equals(sfulRemoteHome));
-
+
result = result && (refSless2_2 != null);
result = result && refSless2_2.equals(refSless2_2);
result = result && refSless2_2.equals(refSless2_1);
@@ -691,13 +691,13 @@
result = result && (! refSless2_2.equals(sfulBusiness));
result = result && (! refSless2_2.equals(sfulRemote));
result = result && (! refSless2_2.equals(sfulRemoteHome));
-
+
return result;
}
-
+
public boolean checkSfulLocalReferences() {
boolean result = (refSful_1 != null);
-
+
result = result && (refSful_1.equals(refSful_1));
result = result && (! refSful_1.equals(refSful_2));
result = result && (! refSful_1.equals(refSful2_1));
@@ -709,7 +709,7 @@
result = result && (! refSful_1.equals(sfulRemote));
result = result && (! refSful_1.equals(sfulRemoteHome));
result = result && (! refSful_1.equals(new Object()));
-
+
result = result && (refSful_2 != null);
result = result && (! refSful_2.equals(refSful_1));
result = result && (refSful_2.equals(refSful_2));
@@ -722,7 +722,7 @@
result = result && (! refSful_2.equals(sfulRemote));
result = result && (! refSful_2.equals(sfulRemoteHome));
result = result && (! refSful_2.equals(new Object()));
-
+
result = result && (refSful2_1 != null);
result = result && (refSful2_1.equals(refSful2_1));
result = result && (! refSful2_1.equals(refSful2_2));
@@ -735,7 +735,7 @@
result = result && (! refSful2_1.equals(sfulRemote));
result = result && (! refSful2_1.equals(sfulRemoteHome));
result = result && (! refSful2_1.equals(new Object()));
-
+
result = result && (refSful2_2 != null);
result = result && (refSful2_2.equals(refSful2_2));
result = result && (! refSful2_2.equals(refSful2_1));
@@ -750,10 +750,10 @@
result = result && (! refSful2_2.equals(new Object()));
return result;
}
-
+
public boolean checkSlessRemoteReferences() {
boolean result = (refRemoteSless_1 != null);
-
+
result = result && (refRemoteSless_1.equals(refRemoteSless_1));
result = result && (refRemoteSless_1.equals(refRemoteSless_2));
result = result && (! refRemoteSless_1.equals(refRemoteSless2_1));
@@ -765,7 +765,7 @@
result = result && (! refRemoteSless_1.equals(sfulRemote));
result = result && (! refRemoteSless_1.equals(sfulRemoteHome));
result = result && (! refRemoteSless_1.equals(new Object()));
-
+
result = result && (refRemoteSless_2 != null);
result = result && (refRemoteSless_2.equals(refRemoteSless_1));
result = result && (refRemoteSless_2.equals(refRemoteSless_2));
@@ -778,7 +778,7 @@
result = result && (! refRemoteSless_2.equals(sfulRemote));
result = result && (! refRemoteSless_2.equals(sfulRemoteHome));
result = result && (! refRemoteSless_2.equals(new Object()));
-
+
result = result && (refRemoteSless2_1 != null);
result = result && (refRemoteSless2_1.equals(refRemoteSless2_1));
result = result && (refRemoteSless2_1.equals(refRemoteSless2_2));
@@ -791,7 +791,7 @@
result = result && (! refRemoteSless2_1.equals(sfulRemote));
result = result && (! refRemoteSless2_1.equals(sfulRemoteHome));
result = result && (! refRemoteSless2_1.equals(new Object()));
-
+
result = result && (refRemoteSless2_2 != null);
result = result && (refRemoteSless2_2.equals(refRemoteSless2_2));
result = result && (refRemoteSless2_2.equals(refRemoteSless2_1));
@@ -806,10 +806,10 @@
result = result && (! refRemoteSless2_2.equals(new Object()));
return result;
}
-
+
public boolean checkSfulRemoteReferences() {
boolean result = (refRemoteSful_1 != null);
-
+
result = result && (refRemoteSful_1.equals(refRemoteSful_1));
result = result && (! refRemoteSful_1.equals(refRemoteSful_2));
result = result && (! refRemoteSful_1.equals(refRemoteSful2_1));
@@ -821,7 +821,7 @@
result = result && (! refRemoteSful_1.equals(sfulRemote));
result = result && (! refRemoteSful_1.equals(sfulRemoteHome));
result = result && (! refRemoteSful_1.equals(new Object()));
-
+
result = result && (refRemoteSful_2 != null);
result = result && (! refRemoteSful_2.equals(refRemoteSful_1));
result = result && (refRemoteSful_2.equals(refRemoteSful_2));
@@ -834,7 +834,7 @@
result = result && (! refRemoteSful_2.equals(sfulRemote));
result = result && (! refRemoteSful_2.equals(sfulRemoteHome));
result = result && (! refRemoteSful_2.equals(new Object()));
-
+
result = result && (refRemoteSful2_1 != null);
result = result && (refRemoteSful2_1.equals(refRemoteSful2_1));
result = result && (! refRemoteSful2_1.equals(refRemoteSful2_2));
@@ -847,7 +847,7 @@
result = result && (! refRemoteSful2_1.equals(sfulRemote));
result = result && (! refRemoteSful2_1.equals(sfulRemoteHome));
result = result && (! refRemoteSful2_1.equals(new Object()));
-
+
result = result && (refRemoteSful2_2 != null);
result = result && (refRemoteSful2_2.equals(refRemoteSful2_2));
result = result && (! refRemoteSful2_2.equals(refRemoteSful2_1));
@@ -862,19 +862,19 @@
result = result && (! refRemoteSful2_2.equals(new Object()));
return result;
}
-
+
public DummyRemote getSfulRemoteBusiness(int num) {
return (num == 1)
? refRemoteSful_1 : refRemoteSful_2;
}
-
+
public DummyRemote2 getSfulRemoteBusiness2(int num) {
return (num == 1)
? refRemoteSful2_1 : refRemoteSful2_2;
}
-
+
public boolean compareRemoteRefs(Object ref1, Object ref2) {
return ref1.equals(ref2);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java
index 5625a39..2481d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulBusiness.java
@@ -23,10 +23,10 @@
// so it's not a problem to define a method that happens to have the
// same signature as one of EJBLocalObject's methods. remove() is
// a likely name for a method that has @Remove behavior so it needs
- // to work.
+ // to work.
public void remove();
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
public SfulBusiness2 getSfulBusiness2();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
index 0e03859..2cc1e32 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
@@ -103,7 +103,7 @@
// Ignore input parameter. client will use resulting unset state to
// ensure correct mapping of @Init
- System.out.println("In SfulEJB::adaptedCreate1(int ignore) method. "
+ System.out.println("In SfulEJB::adaptedCreate1(int ignore) method. "
+ "**ignoring** state=" + state);
System.out.println("Caller principal = " + ctx.getCallerPrincipal());
@@ -113,7 +113,7 @@
@Init("createFoo")
public void adaptedCreate2(int argument1) {
state = argument1;
- System.out.println("In SfulEJB::adaptedCreate2(int arg) method "
+ System.out.println("In SfulEJB::adaptedCreate2(int arg) method "
+ "state=" + state);
System.out.println("Caller principal = " + ctx.getCallerPrincipal());
@@ -154,7 +154,7 @@
public void remove() {}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
if( throwException ) {
throw new Exception("exception from retainIfException. " +
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
index c1507c1..57d99be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
@@ -20,7 +20,7 @@
public interface SfulRemote extends CommonRemote, EJBObject
{
-
+
public int getState() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java
index 3e69169..1acc78a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteBusiness.java
@@ -22,14 +22,14 @@
public interface SfulRemoteBusiness extends CommonRemote
{
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
// The remote business interface has no relationship to EJBObject
// so it's not a problem to define a method that happens to have the
// same signature as one of EJBObject's methods. remove() is
// a likely name for a method that has @Remove behavior so it needs
- // to work.
+ // to work.
public void remove() throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
index 6c25145..7ed2b77 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
@@ -70,7 +70,7 @@
/**
* Business method declared on a super interface extended by both
* remote and local business interface. Test that tx attribute is
- * set appropriately for local vs. remote.
+ * set appropriately for local vs. remote.
*/
public void sharedRemoteLocalBusinessSuper(boolean expectTx) {
@@ -78,10 +78,10 @@
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
- // TODO check this, it worked inV2 new InitialContext().lookup("java:pm/TransactionManager");
- new InitialContext().lookup("java:appserver/TransactionManager");
+ // TODO check this, it worked inV2 new InitialContext().lookup("java:pm/TransactionManager");
+ new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check whether there is a tx.
// A portable application couldn't make this check
@@ -93,13 +93,13 @@
} catch(Exception e) {
throw new EJBException(e);
}
-
+
if( expectTx && hasTx ) {
System.out.println("Successfully verified tx");
} else if( !expectTx && !hasTx ) {
System.out.println("Successfully verified there is no tx");
} else {
- throw new EJBException("Invalid tx status. ExpectTx = " +
+ throw new EJBException("Invalid tx status. ExpectTx = " +
expectTx + " hasTx = " + hasTx);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java
index 14813f5..1c3e97a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteBusiness2.java
@@ -21,6 +21,6 @@
public interface SlessRemoteBusiness2 extends CommonRemoteLocalBusinessSuper
{
public void foo();
-
+
public void bar();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml
index 29392e8..f6230cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/build.xml
@@ -60,9 +60,9 @@
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-clientview tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-clientview tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties
index dfbaefd..0d8fc3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-clientview-core"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.ejb30.clientview.core.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml
index 16e9901..32ef0a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Common*.class,**/Helper*.class,**/Hello*.class,**/Bmp*.class,**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Helper*.class,**/SfulRemote.class,**/SlessRemote.class,**/Client.class,**/Hello.class,**/CommonRemote*.class,**/BmpRemote.class,**/BmpRemoteHome*.class,**/SfulRemoteHome*.class,**/SlessRemoteHome*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,17 +63,17 @@
</target>
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
index 414604d..03eebba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
@@ -26,12 +26,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@EJB private static Hello hr;
@EJB private static BmpRemoteHome bmpRemoteHome;
-
+
private static SfulRemoteHome sfulRemoteHome;
@EJB public static void setStatefulRemoteHome(SfulRemoteHome srh) {
@@ -40,7 +40,7 @@
private static SlessRemoteHome slessRemoteHome;
- @EJB(beanName="SlessBean")
+ @EJB(beanName="SlessBean")
private static void setStatelessRemoteHome(SlessRemoteHome srh) {
slessRemoteHome = srh;
}
@@ -51,25 +51,25 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-clientview-coreID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- if( hr == null ) {
+ if( hr == null ) {
- System.out.println("In stand-alone mode");
- InitialContext ic = new InitialContext();
- hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_core_CoreApp");
- bmpRemoteHome = (BmpRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Bmp");
- sfulRemoteHome = (SfulRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sful");
- slessRemoteHome = (SlessRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sless");
+ System.out.println("In stand-alone mode");
+ InitialContext ic = new InitialContext();
+ hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_core_CoreApp");
+ bmpRemoteHome = (BmpRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Bmp");
+ sfulRemoteHome = (SfulRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sful");
+ slessRemoteHome = (SlessRemoteHome) ic.lookup("ejb/ejb_ejb30_clientview_core_Sless");
- }
+ }
System.out.println("testing injected BmpRemoteHome");
@@ -77,8 +77,8 @@
bmpRemote = bmpRemoteHome.findByPrimaryKey("client1");
EJBMetaData md = bmpRemoteHome.getEJBMetaData();
- System.out.println("metadata = " + md);
-
+ System.out.println("metadata = " + md);
+
System.out.println("testing injected SlessRemoteHome");
SlessRemote slessRemote = slessRemoteHome.create();
slessRemote.required();
@@ -86,12 +86,12 @@
System.out.println("testing injected SfulRemoteHome");
SfulRemote sfulRemote = sfulRemoteHome.createSful();
sfulRemote.required();
-
+
System.out.println("testing Remote 3.0 Hello intf");
hr.testPassByRef();
- // invoke method on the EJB
- doProxyTest(hr);
+ // invoke method on the EJB
+ doProxyTest(hr);
testExceptions(hr);
@@ -103,8 +103,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
private void testExceptions(Hello h) throws Exception {
@@ -113,7 +113,7 @@
h.throwException();
} catch(Exception e) {
if( e.getClass() == Exception.class ) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
} else {
throw e;
@@ -124,7 +124,7 @@
h.throwAppException1();
throw new Exception("didn't get exception for testException2");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -132,7 +132,7 @@
h.throwAppException2();
throw new Exception("didn't get exception for testException3");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -158,36 +158,36 @@
}
}
- private void doProxyTest(Hello hr)
- throws Exception
+ private void doProxyTest(Hello hr)
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATEFUL, hr);
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATEFUL, hr);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATELESS, hr);
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATELESS, hr);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
- hr.warmup(Common.BMP);
- runTests(Common.BMP, hr);
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ hr.warmup(Common.BMP);
+ runTests(Common.BMP, hr);
}
private void runTests(int type, Hello hr)
- throws Exception
+ throws Exception
{
-
+
hr.notSupported(type, true);
hr.notSupported(type, false);
hr.supports(type, true);
- hr.supports(type, false);
+ hr.supports(type, false);
hr.required(type, true);
- hr.required(type, false);
+ hr.required(type, false);
hr.requiresNew(type, true);
- hr.requiresNew(type, false);
+ hr.requiresNew(type, false);
hr.mandatory(type, true);
- hr.never(type, false);
+ hr.never(type, false);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml
index e102171..0ac2b13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/descriptor/ejb-jar.xml
@@ -48,7 +48,7 @@
</session>
<session>
<ejb-name>SfulBean</ejb-name>
- <home>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulRemoteHome</home>
+ <home>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulRemoteHome</home>
<remote>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulRemote</remote>
<local-home>com.sun.s1asdev.ejb.ejb30.clientview.core.SfulHome</local-home>
<local>com.sun.s1asdev.ejb.ejb30.clientview.core.Sful</local>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
index db989ed..4fa7433 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
@@ -27,7 +27,7 @@
public String ejbCreate(String s) {
System.out.println("ec_ == " + ec_);
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -47,10 +47,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -63,7 +63,7 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
public void testException1() throws Exception {
@@ -101,7 +101,7 @@
}
public void testPassByRef4(CommonRemote cr) {
-
+
}
public Helper1 testPassByRef5() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
index 244fe3e..9a36517 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
@@ -21,5 +21,5 @@
public interface BmpHome extends BmpHomeSuper
{
- Bmp findByPrimaryKey(String s) throws CreateException;
+ Bmp findByPrimaryKey(String s) throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
index a9c4baa..a49991a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
@@ -21,5 +21,5 @@
public interface BmpRemoteHome extends BmpRemoteHomeSuper
{
- BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
+ BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
index 7bf7814..2d204f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
@@ -53,7 +53,7 @@
@EJB public BmpHome bmpHome;
- @EJB(beanName="BmpBean")
+ @EJB(beanName="BmpBean")
public BmpHomeSuper bmpHomeSuper;
private Bmp bmp;
@@ -62,7 +62,7 @@
private BmpRemote bmpRemote;
private long overhead;
-
+
private static final String pkey = "A BMP Bean";
@Resource jakarta.transaction.UserTransaction ut;
@@ -70,27 +70,27 @@
@PostConstruct
public void create() {
- try {
+ try {
sful = sfulHome.createSful();
sfulRemote = sfulRemoteHome.createSful();
- System.out.println("Created loca/remote sful objs via homes.");
+ System.out.println("Created loca/remote sful objs via homes.");
bmp = bmpHome.create(pkey);
bmpRemote = (BmpRemote)
bmpRemoteHome.findByPrimaryKey(pkey);
- System.out.println("Created BMP bean.");
+ System.out.println("Created BMP bean.");
sless = slessHome.create();
slessRemote = slessRemoteHome.create();
- System.out.println("Created loca/remote sless objs via homes.");
+ System.out.println("Created loca/remote sless objs via homes.");
// ut = context.getUserTransaction();
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
private void testRemove() throws RemoteException {
@@ -99,7 +99,7 @@
System.out.println("Created BMP bean.");
bmpHome.remove(bmp2.getPrimaryKey());
System.out.println("Successfully removed local entity bean");
- } catch(Exception e) {
+ } catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
@@ -127,9 +127,9 @@
try {
((EJBLocalObject)sful).remove();
-
+
try {
- ((EJBLocalObject)sful).remove();
+ ((EJBLocalObject)sful).remove();
throw new EJBException("2nd sful remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -139,7 +139,7 @@
((EJBLocalObject)sless).remove();
- ((EJBLocalObject)bmp).remove();
+ ((EJBLocalObject)bmp).remove();
} catch(Exception e) {
EJBException ejbEx = new EJBException();
@@ -160,52 +160,52 @@
public void throwAppException2() throws FinderException {
throw new ObjectNotFoundException("throwAppException2");
}
-
+
public void warmup(int type) {
try {
warmup(type, true);
warmup(type, false);
-
- // Measure looping and timing overhead
+
+ // Measure looping and timing overhead
long begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
}
long end = System.currentTimeMillis();
overhead = end - begin;
-
+
String pkey2 = (String) ((EJBLocalObject)bmp).getPrimaryKey();
if( !pkey2.equals(pkey) ) {
throw new EJBException("pkey2 " + pkey2 + " doesn't match " + pkey);
}
-
+
ut = context.getUserTransaction();
-
+
testLocalObjects(((EJBLocalObject)sful), ((EJBLocalObject)sless));
testLocalObjects(((EJBLocalObject)sful), ((EJBLocalObject)bmp));
testLocalObjects(((EJBLocalObject)sless),((EJBLocalObject)bmp));
-
+
testEJBObjects(sfulRemote, slessRemote);
testEJBObjects(sfulRemote, bmpRemote);
testEJBObjects(slessRemote, bmpRemote);
-
+
testNotImplemented(sful);
testNotImplemented(sless);
testNotImplemented(bmp);
-
+
testNotImplemented(sfulRemote);
testNotImplemented(slessRemote);
testNotImplemented(bmpRemote);
-
+
testRemove();
-
+
// skip testExceptions for sfsb since throwing a runtime exception
// will cause the bean to be removed
// testExceptions(sful);
-
+
testExceptions(sless);
testExceptions(bmp);
-
+
testExceptions(slessRemote);
testExceptions(bmpRemote);
} catch(Exception e) {
@@ -213,14 +213,14 @@
throw new EJBException(e);
}
}
-
+
private void testExceptions(Common c) {
try {
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -228,7 +228,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(EJBException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -236,10 +236,10 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
private void testExceptions(CommonRemote c) throws RemoteException {
@@ -248,7 +248,7 @@
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -256,7 +256,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(RemoteException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -264,7 +264,7 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -272,10 +272,10 @@
c.testException4();
throw new EJBException("didn't get exception for testException4");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
public Object testPassByRef() {
@@ -283,15 +283,15 @@
System.out.println("Doing pass by ref tests for slessRemote " +
", passbyref = true");
_testPassByRef(slessRemote, true);
-
+
System.out.println("Doing pass by ref tests for sfulRemote " +
", passbyref = false");
_testPassByRef(sfulRemote, false);
-
+
System.out.println("Doing pass by ref tests for bmpRemote " +
", passbyref = false");
_testPassByRef(bmpRemote, false);
-
+
// uncomment to see exception that is thrown when non-serializable
// object is passed over non-collocated remote call
//return new Helper2();
@@ -303,9 +303,9 @@
return null;
}
- private void _testPassByRef(CommonRemote c, boolean passByRef)
+ private void _testPassByRef(CommonRemote c, boolean passByRef)
throws Exception {
-
+
int intVal = 1;
String stringVal = "HelloEJB::_testPassByRef";
@@ -321,7 +321,7 @@
if( passByRef ) {
if( (h1.a == intVal) || h1.b.equals(stringVal) ) {
throw new EJBException("h1 mutations not present " + h1);
- }
+ }
} else {
if( (h1.a != intVal) || !h1.b.equals(stringVal) ) {
throw new EJBException("error : h1 was mutated " + h1);
@@ -338,23 +338,23 @@
System.out.println("After testPassByRef3 : " + h2);
if( (h2.a == intVal) || h2.b.equals(stringVal) ) {
throw new EJBException("h2 mutations not present " + h2);
- }
+ }
} else {
try {
c.testPassByRef3(h2);
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"passing non-serializable data " + h2);
-
+
/* DON'T TREAT AS FATAL ERROR WHILE WE INVESTIGATE WHETHER
* THIS WAS INTENDED BEHAVIOR FOR THE ORB
- throw new EJBException("Error : Expected exception when " +
- "passing non-serializable data " +
+ throw new EJBException("Error : Expected exception when " +
+ "passing non-serializable data " +
h2);
*/
} catch(EJBException ejbex) {
throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" passing non-serializable data" +
e.toString());
}
@@ -369,16 +369,16 @@
} else {
try {
Helper2 h6 = c.testPassByRef6();
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"returning non-serializable data " + h6);
- /* see comment for testPassByRef3 above
- throw new EJBException("Error : Expected exception when " +
+ /* see comment for testPassByRef3 above
+ throw new EJBException("Error : Expected exception when " +
"returning non-serializable data ");
*/
} catch(EJBException ejbex) {
- throw ejbex;
+ throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" returning non-serializable data" +
e.toString());
}
@@ -410,52 +410,52 @@
}
private void warmup(int type, boolean tx) {
- // get Hotspot warmed up
- Common bean = pre(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ // get Hotspot warmed up
+ Common bean = pre(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
}
- private Common pre(int type, boolean tx)
+ private Common pre(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
- if ( type == Common.STATELESS )
- return sless;
- else if ( type == Common.STATEFUL )
- return sful;
- else
- return bmp;
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
+ if ( type == Common.STATELESS )
+ return sless;
+ else if ( type == Common.STATEFUL )
+ return sful;
+ else
+ return bmp;
}
- private CommonRemote preRemote(int type, boolean tx)
- {
- if ( type == Common.STATELESS )
- return slessRemote;
- else if ( type == Common.STATEFUL )
- return sfulRemote;
- else
- return bmpRemote;
+ private CommonRemote preRemote(int type, boolean tx)
+ {
+ if ( type == Common.STATELESS )
+ return slessRemote;
+ else if ( type == Common.STATEFUL )
+ return sfulRemote;
+ else
+ return bmpRemote;
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -477,7 +477,7 @@
return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -495,11 +495,11 @@
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
- }
- return post(begin, end, tx);
+ }
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -513,23 +513,23 @@
for ( int i=0; i<ITERATIONS; i++ ) {
beanRemote.required();
}
-
+
end = System.currentTimeMillis();
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
long begin = 0;
long end = 0;
try {
Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- begin = System.currentTimeMillis();
+ begin = System.currentTimeMillis();
for ( int i=0; i<ITERATIONS; i++ ) {
bean.mandatory();
}
@@ -541,7 +541,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
public float never(int type, boolean tx)
@@ -563,10 +563,10 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
long begin = 0;
long end = 0;
@@ -585,7 +585,7 @@
e.printStackTrace();
throw new EJBException(e);
}
- return post(begin, end, tx);
+ return post(begin, end, tx);
}
// assumes lo1 and lo2 are do not have same client identity
@@ -629,11 +629,11 @@
if( o1.isIdentical(o2) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( o2.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( !o1.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
@@ -686,12 +686,12 @@
}
System.out.println("o1.hashCode() = " + o1.hashCode());
-
+
System.out.println("o2.hashCode() = " + o2.hashCode());
-
+
System.out.println("o1.toString() = " + o1.toString());
System.out.println("o2.toString() = " + o2.toString());
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
index 1520c06..3129c97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
@@ -50,15 +50,15 @@
}
@PreDestroy
- public void ejbRemove()
- {
+ public void ejbRemove()
+ {
System.out.println("In SfulEJB.ejbRemove(). about to throw exception");
throw new RuntimeException("test cleanup for case where " +
"ejbRemove throws an exception");
}
@PrePassivate
- public void ejbActivate()
+ public void ejbActivate()
{}
@PostActivate
@@ -115,7 +115,7 @@
Helper2 h2 = new Helper2();
h2.a = 1;
h2.b = "SfulEJB::testPassByRef6";
- return h2;
+ return h2;
}
public CommonRemote testPassByRef7() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
index 303abf5..3fafce3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
@@ -40,10 +40,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -70,7 +70,7 @@
}
public void testPassByRef1(int a) {
-
+
}
public void testPassByRef2(Helper1 helper1) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties
index 8487956..0aec84c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-clientview-exceptions"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.ejb30.clientview.exceptions.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml
index 06abb53..5bbad02 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class,**/Sful*.class,**/Sless*.class,**/*Exception.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Hello.class,**/S*Business*.class,**/*Exception.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,17 +63,17 @@
</target>
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
index 8cd7114..6eb7101 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
@@ -27,12 +27,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@EJB static private Hello hr;
- @EJB static protected SlessRemoteBusiness2 slessRemoteBusiness2;
+ @EJB static protected SlessRemoteBusiness2 slessRemoteBusiness2;
@EJB static public SfulRemoteBusiness2 sfulRemoteBusiness2;
@EJB static public SlessRemoteBusiness slessRemoteBusiness;
@@ -44,28 +44,28 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-clientview-exceptionsID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- if( hr == null ) {
+ if( hr == null ) {
- System.out.println("In stand-alone mode");
- InitialContext ic = new InitialContext();
- hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Hello");
- sfulRemoteBusiness2 = (SfulRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness2");
- slessRemoteBusiness2 = (SlessRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness2");
- sfulRemoteBusiness = (SfulRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness");
- slessRemoteBusiness = (SlessRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness");
+ System.out.println("In stand-alone mode");
+ InitialContext ic = new InitialContext();
+ hr = (Hello) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Hello");
+ sfulRemoteBusiness2 = (SfulRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness2");
+ slessRemoteBusiness2 = (SlessRemoteBusiness2) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness2");
+ sfulRemoteBusiness = (SfulRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sful#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SfulRemoteBusiness");
+ slessRemoteBusiness = (SlessRemoteBusiness) ic.lookup("ejb/ejb_ejb30_clientview_exceptions_Sless#com.sun.s1asdev.ejb.ejb30.clientview.exceptions.SlessRemoteBusiness");
- }
+ }
- // TODO enable when hr.runAccessDeniedExceptionTest();
+ // TODO enable when hr.runAccessDeniedExceptionTest();
hr.runTxRequiredTest();
@@ -88,7 +88,7 @@
runConcurrentAccessTest();
- return;
+ return;
}
private void runTxRequiredTest() {
@@ -99,30 +99,30 @@
sfulRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
- }
-
+ }
+
try {
slessRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
- numEx++;
- }
+ numEx++;
+ }
try {
sfulRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
try {
slessRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 4 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runTxRequiredTest");
}
@@ -131,75 +131,75 @@
}
public void runConcurrentAccessTest() {
- try {
- MyThread thread = new MyThread(sfulRemoteBusiness);
- thread.start();
+ try {
+ MyThread thread = new MyThread(sfulRemoteBusiness);
+ thread.start();
- sleepFor(5);
- sfulRemoteBusiness.ping();
- stat.addStatus("local concurrentAccess[1.1]", stat.FAIL);
- } catch (jakarta.ejb.ConcurrentAccessException conEx) {
- stat.addStatus("local concurrentAccess[1.1]", stat.PASS);
- } catch (Throwable th) {
- System.out.println("Argggggg: Got: " + th);
- stat.addStatus("local concurrentAccess[1.2]", stat.FAIL);
- }
+ sleepFor(5);
+ sfulRemoteBusiness.ping();
+ stat.addStatus("local concurrentAccess[1.1]", stat.FAIL);
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
+ stat.addStatus("local concurrentAccess[1.1]", stat.PASS);
+ } catch (Throwable th) {
+ System.out.println("Argggggg: Got: " + th);
+ stat.addStatus("local concurrentAccess[1.2]", stat.FAIL);
+ }
- try {
- MyThread2 thread = new MyThread2(sfulRemoteBusiness2);
- thread.start();
+ try {
+ MyThread2 thread = new MyThread2(sfulRemoteBusiness2);
+ thread.start();
- sleepFor(5);
- sfulRemoteBusiness2.pingRemote();
- stat.addStatus("local concurrentAccess[2.1]", stat.FAIL);
- } catch (java.rmi.RemoteException remEx) {
- stat.addStatus("local concurrentAccess[2.1]", stat.PASS);
- } catch (Throwable th) {
- stat.addStatus("local concurrentAccess[2.2] Got: " + th, stat.FAIL);
- }
+ sleepFor(5);
+ sfulRemoteBusiness2.pingRemote();
+ stat.addStatus("local concurrentAccess[2.1]", stat.FAIL);
+ } catch (java.rmi.RemoteException remEx) {
+ stat.addStatus("local concurrentAccess[2.1]", stat.PASS);
+ } catch (Throwable th) {
+ stat.addStatus("local concurrentAccess[2.2] Got: " + th, stat.FAIL);
+ }
}
class MyThread extends Thread {
- SfulRemoteBusiness sfulBusiness;
+ SfulRemoteBusiness sfulBusiness;
- MyThread(SfulRemoteBusiness sfulBusiness) {
- this.sfulBusiness = sfulBusiness;
- }
+ MyThread(SfulRemoteBusiness sfulBusiness) {
+ this.sfulBusiness = sfulBusiness;
+ }
- public void run() {
- try {
- sfulBusiness.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ sfulBusiness.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
class MyThread2 extends Thread {
- SfulRemoteBusiness2 sfulBusiness2;
+ SfulRemoteBusiness2 sfulBusiness2;
- MyThread2(SfulRemoteBusiness2 sfulBusiness2) {
- this.sfulBusiness2 = sfulBusiness2;
- }
+ MyThread2(SfulRemoteBusiness2 sfulBusiness2) {
+ this.sfulBusiness2 = sfulBusiness2;
+ }
- public void run() {
- try {
- sfulBusiness2.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ sfulBusiness2.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
private void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- System.out.println("[" + i + "/" + sec + "]: Sleeping....");
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ System.out.println("[" + i + "/" + sec + "]: Sleeping....");
+ }
+ } catch (Exception ex) {
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml
index 7531b55..e9cb4b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_ejb30_clientview_exceptions_Hello</jndi-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>5</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
index 3707d3a..0c6c9f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
@@ -46,7 +46,7 @@
@EJB(name="sfulBusiness") public SfulBusiness sfulBusiness;
@EJB(name="slessBusiness") public SlessBusiness slessBusiness;
- @EJB(name="slessRemoteBusiness2") protected SlessRemoteBusiness2 slessRemoteBusiness2;
+ @EJB(name="slessRemoteBusiness2") protected SlessRemoteBusiness2 slessRemoteBusiness2;
@EJB(name="sfulRemoteBusiness2") public SfulRemoteBusiness2 sfulRemoteBusiness2;
@EJB public SlessRemoteBusiness slessRemoteBusiness;
@@ -57,12 +57,12 @@
@PostConstruct
public void create() {
- try {
+ try {
ut = context.getUserTransaction();
-
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
private void setup() {
@@ -74,10 +74,10 @@
sfulRemoteBusiness = (SfulRemoteBusiness) context.lookup("com.sun.s1asdev.ejb.ejb30.clientview.exceptions.HelloEJB/sfulRemoteBusiness");
slessRemoteBusiness = (SlessRemoteBusiness) context.lookup("com.sun.s1asdev.ejb.ejb30.clientview.exceptions.HelloEJB/slessRemoteBusiness");
-
+
sfulRemoteBusiness2 = (SfulRemoteBusiness2) context.lookup("sfulRemoteBusiness2");
slessRemoteBusiness2 = (SlessRemoteBusiness2) context.lookup("slessRemoteBusiness2");
-
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -94,13 +94,13 @@
} catch(EJBAccessException eae) {
// this might be thrown by container but application
// can't depend on receiving the sub-class exception
- System.out.println("Got specific ejb30 exception " +
+ System.out.println("Got specific ejb30 exception " +
eae + " for sfulBusiness.denied()");
// bean must still exist
sfulBusiness.foo();
numEx++;
} catch(EJBException ele) {
- System.out.println("Got valid exception " +
+ System.out.println("Got valid exception " +
ele + " for sfulBusiness.denied()");
// bean must still exist
sfulBusiness.foo();
@@ -110,7 +110,7 @@
try {
sfulRemoteBusiness.denied();
} catch(EJBException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for sfulRemoteBusiness.denied()");
// bean must still exist
@@ -121,7 +121,7 @@
try {
sfulRemoteBusiness2.denied();
} catch(RemoteException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for sfulBusiness2.denied()");
// bean must still exist
@@ -132,7 +132,7 @@
try {
slessBusiness.denied();
} catch(EJBException ele) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
ele + " for slessBusiness.denied()");
numEx++;
@@ -141,7 +141,7 @@
try {
slessRemoteBusiness.denied();
} catch(EJBException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for slessRemoteBusiness.denied()");
numEx++;
}
@@ -149,15 +149,15 @@
try {
slessRemoteBusiness2.denied();
} catch(RemoteException re) {
- System.out.println("Got expected exception " +
+ System.out.println("Got expected exception " +
re + " for slessRemoteBusiness2.denied()");
numEx++;
}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runAccessDeniedExceptionTest");
}
@@ -180,7 +180,7 @@
e.printStackTrace();
}
-
+
try {
ut.begin();
ut.setRollbackOnly();
@@ -189,7 +189,7 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
try {
ut.begin();
ut.setRollbackOnly();
@@ -198,14 +198,14 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
try {
ut.begin();
ut.setRollbackOnly();
slessRemoteBusiness.forceTransactionRolledbackException();
} catch(EJBTransactionRolledbackException txre) {
try { ut.rollback(); } catch(Exception t) {}
- numEx++;
+ numEx++;
} catch(Exception e) {}
try {
@@ -216,7 +216,7 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
try {
ut.begin();
ut.setRollbackOnly();
@@ -225,17 +225,17 @@
try { ut.rollback(); } catch(Exception t) {}
numEx++;
} catch(Exception e) {}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runTxRolledbackTest");
}
}
-
+
public void runTxRequiredTest() {
setup();
@@ -246,42 +246,42 @@
sfulBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
- }
-
+ }
+
try {
slessBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
}
-
+
try {
sfulRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
numEx++;
- }
-
+ }
+
try {
slessRemoteBusiness.forceTransactionRequiredException();
} catch(EJBTransactionRequiredException txre) {
- numEx++;
- }
+ numEx++;
+ }
try {
sfulRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
try {
slessRemoteBusiness2.forceTransactionRequiredException();
} catch(TransactionRequiredException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runTxRequiredTest");
}
@@ -299,14 +299,14 @@
sfulBusiness.remove();
} catch(NoSuchEJBException nsee) {
numEx++;
- }
+ }
- sfulRemoteBusiness.remove();
+ sfulRemoteBusiness.remove();
try {
sfulRemoteBusiness.remove();
} catch(NoSuchEJBException nsee) {
numEx++;
- }
+ }
// sfulremotebusiness2
@@ -321,11 +321,11 @@
} catch(NoSuchObjectException nsoe) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 3 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runNoSuchObjectTest");
}
@@ -349,14 +349,14 @@
} catch(RuntimeAppException b) {
numEx++;
}
- }
-
+ }
+
try {
slessBusiness.throwRuntimeAppException();
} catch(RuntimeAppException txre) {
numEx++;
}
-
+
try {
sfulRemoteBusiness.throwRuntimeAppException();
} catch(RuntimeAppException a) {
@@ -368,13 +368,13 @@
} catch(RuntimeAppException b) {
numEx++;
}
- }
-
+ }
+
try {
slessRemoteBusiness.throwRuntimeAppException();
} catch(RuntimeAppException txre) {
- numEx++;
- }
+ numEx++;
+ }
try {
sfulRemoteBusiness2.throwRuntimeAppException();
@@ -388,17 +388,17 @@
numEx++;
} catch(RemoteException re) {}
} catch(RemoteException e) {}
-
+
try {
slessRemoteBusiness2.throwRuntimeAppException();
} catch(RuntimeAppException txre) {
numEx++;
} catch(RemoteException e) {}
-
+
if( numEx != 6 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runAppExceptionTest");
}
@@ -459,8 +459,8 @@
try { ut.rollback(); } catch(Exception t) {}
}
-
- try {
+
+ try {
ut.begin();
sfulRemoteBusiness.throwRuntimeAppException();
} catch(RuntimeAppException a) {
@@ -470,7 +470,7 @@
} catch(Exception e) {
} finally {
try { ut.rollback(); } catch(Exception t) {}
- }
+ }
try {
ut.begin();
@@ -484,7 +484,7 @@
try { ut.rollback(); } catch(Exception t) {}
}
-
+
try {
ut.begin();
slessRemoteBusiness.throwRuntimeAppException();
@@ -495,7 +495,7 @@
} catch(Exception e) {
} finally {
try { ut.rollback(); } catch(Exception t) {}
- }
+ }
try {
ut.begin();
@@ -565,7 +565,7 @@
if( numEx != 12 ) {
throw new RuntimeException("Didn't receive all expected " +
"exceptions : " + numEx);
-
+
} else {
System.out.println("PASS : runRollbackAppExceptionTest");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
index 38f6354..041a4d4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
@@ -23,7 +23,7 @@
@Stateful
@AccessTimeout(0)
-public class SfulEJB implements
+public class SfulEJB implements
SfulBusiness, SfulRemoteBusiness, SfulRemoteBusiness2
{
int state = 0;
@@ -55,12 +55,12 @@
}
public void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
}
public void ping() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
index 6c32446..3ecb280 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
@@ -19,7 +19,7 @@
import jakarta.ejb.Remote;
@Remote
-public interface SfulRemoteBusiness
+public interface SfulRemoteBusiness
{
void foo();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java
index 9284a18..6a7a14a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessBusiness.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
-public interface SlessBusiness
+public interface SlessBusiness
{
void forceTransactionRequiredException();
@@ -26,6 +26,6 @@
void throwRuntimeAppException() throws RuntimeAppException;
void throwRollbackAppException() throws RollbackAppException;
-
+
void denied();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
index 6dadb35..cdf90ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
@@ -20,7 +20,7 @@
import jakarta.ejb.Remote;
@Remote
-public interface SlessRemoteBusiness
+public interface SlessRemoteBusiness
{
void forceTransactionRequiredException();
@@ -30,6 +30,6 @@
void throwRuntimeAppException() throws RuntimeAppException;
void throwRollbackAppException() throws RollbackAppException;
-
+
void denied();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties
index 99051f6..54a1ff9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-ee-local_sfsb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.ee.local_sfsb.client.StandaloneClient"/>
<property name="simple.client2" value="com.sun.s1asdev.ejb.ejb30.ee.local_sfsb.client.StandaloneClient2"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml
index 011dc8e..4351096 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/SfulDriver.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
index 6e258c4..530265d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
@@ -25,10 +25,10 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@EJB(name="ejb/SfulDriverRef", beanInterface=SfulDriver.class,
- mappedName="corbaname:iiop:localhost:3702#ejb/SfulDriverRef")
+ mappedName="corbaname:iiop:localhost:3702#ejb/SfulDriverRef")
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -38,52 +38,52 @@
lookupUsingJndi();
//client.doTest();
stat.printSummary("ejb-ejb30-ee-local_sfsbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
@EJB(name="ejb/SfulDriver", beanInterface=SfulDriver.class)
private static SfulDriver driver;
public void doTest() {
- driver.initialize();
+ driver.initialize();
try {
System.out.println("invoking stateless");
String result = driver.sayHello();
stat.addStatus("local hello",
- "Hello".equals(result) ? stat.PASS : stat.FAIL);
+ "Hello".equals(result) ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local hello" , stat.FAIL);
}
- try {
+ try {
boolean result = driver.doRefAliasingTest();
stat.addStatus("local PRE_refAliasingTest",
- result ? stat.PASS : stat.FAIL);
+ result ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local refAliasingTest" , stat.FAIL);
}
- //driver.createManySfulEJBs(16);
- //createManySfulEJBs(16);
+ //driver.createManySfulEJBs(16);
+ //createManySfulEJBs(16);
- sleepFor(5);
- driver.checkGetRef();
-
- try {
+ sleepFor(5);
+ driver.checkGetRef();
+
+ try {
boolean result = driver.doRefAliasingTest();
stat.addStatus("local POST_refAliasingTest",
- result ? stat.PASS : stat.FAIL);
+ result ? stat.PASS : stat.FAIL);
- boolean greeterTest = driver.useSfulGreeter();
+ boolean greeterTest = driver.useSfulGreeter();
stat.addStatus("local GreeterRefTest",
- result ? stat.PASS : stat.FAIL);
+ result ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
@@ -95,50 +95,50 @@
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try { Thread.sleep(1000); } catch (Exception ex) {}
- System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
- }
+ while (seconds-- > 0) {
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+ System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
+ }
}
private static void createManySfulEJBs(int count) {
- while (count-- > 0) {
- try {
- SfulDriver dr = (SfulDriver) (new InitialContext()).lookup("java:comp/env/ejb/SfulDriver");
- dr.initialize();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
+ while (count-- > 0) {
+ try {
+ SfulDriver dr = (SfulDriver) (new InitialContext()).lookup("java:comp/env/ejb/SfulDriver");
+ dr.initialize();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
}
private static void lookupUsingJndi() {
- try {
+ try {
/*
- Properties props = new Properties();
- props.setProperty("java.naming.factory.initial", "com.sun.enterprise.naming.SerialInitContextFactory");
- props.setProperty("java.naming.factory.url.pkgs", "com.sun.enterprise.naming");
- props.setProperty("java.naming.factory.state", "com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
- props.setProperty("org.omg.CORBA.ORBInitialHost", "129.145.133.197");
- props.setProperty("org.omg.CORBA.ORBInitialPort", "3702");
+ Properties props = new Properties();
+ props.setProperty("java.naming.factory.initial", "com.sun.enterprise.naming.SerialInitContextFactory");
+ props.setProperty("java.naming.factory.url.pkgs", "com.sun.enterprise.naming");
+ props.setProperty("java.naming.factory.state", "com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
+ props.setProperty("org.omg.CORBA.ORBInitialHost", "129.145.133.197");
+ props.setProperty("org.omg.CORBA.ORBInitialPort", "3702");
- InitialContext ctx = new InitialContext(props);
+ InitialContext ctx = new InitialContext(props);
*/
- InitialContext ctx = new InitialContext();
- String name = "ejb/SfulDriverRef";
- name = "corbaname:iiop:129.145.133.197:3700#" + name;
+ InitialContext ctx = new InitialContext();
+ String name = "ejb/SfulDriverRef";
+ name = "corbaname:iiop:129.145.133.197:3700#" + name;
System.out.println("***Looking up SfulDriver...");
- SfulDriver driver = (SfulDriver) ctx.lookup("java:comp/env/ejb/SfulDriverRef");
+ SfulDriver driver = (SfulDriver) ctx.lookup("java:comp/env/ejb/SfulDriverRef");
System.out.println("***Got SfulDriver...");
/**/
stat.addStatus("local LookupUsingJndi", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("local LookupUsingJndi", stat.FAIL);
- ex.printStackTrace();
- }
+ ex.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
index d67e10c..d0da261 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
import jakarta.ejb.Local;
-
+
@Local
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
index 069647e..8475d7c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
@@ -38,53 +38,53 @@
}
public boolean initialize() {
- boolean result = false;
+ boolean result = false;
- ref1 = ref2 = createSful();
+ ref1 = ref2 = createSful();
ref1.setSfulRef(ref2);
- return (ref1 != null);
+ return (ref1 != null);
}
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public boolean doRefAliasingTest() {
- boolean result = false;
- for (int i=0; i<10; i++) {
- ref1.incrementCounter();
- }
+ boolean result = false;
+ for (int i=0; i<10; i++) {
+ ref1.incrementCounter();
+ }
- return (ref1.getCounter() == ref2.getCounter());
+ return (ref1.getCounter() == ref2.getCounter());
}
public void doCheckpoint() {
}
public void checkGetRef() {
- Sful ref = ref1.getSfulRef();
+ Sful ref = ref1.getSfulRef();
ref.getCounter();
}
public void createManySfulEJBs(int count) {
/*
- while (count-- > 0) {
- Sful sf = (Sful) createSful();
- }
+ while (count-- > 0) {
+ Sful sf = (Sful) createSful();
+ }
*/
}
private Sful createSful() {
- Sful sful = null;
+ Sful sful = null;
try {
- InitialContext ctx = new InitialContext();
- sful = (Sful) ctx.lookup("java:comp/env/ejb/Sful");
+ InitialContext ctx = new InitialContext();
+ sful = (Sful) ctx.lookup("java:comp/env/ejb/Sful");
} catch (Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
}
- return sful;
+ return sful;
}
public boolean useSfulGreeter() {
- return (sfulGreeter.getCounter() == ref1.getCounter());
+ return (sfulGreeter.getCounter() == ref1.getCounter());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
index c0649cb..d1bfcd7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
@@ -22,7 +22,7 @@
@Stateful
public class SfulEJB
- implements Sful, SfulGreeter
+ implements Sful, SfulGreeter
{
private Sful ref;
@@ -40,19 +40,19 @@
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void incrementCounter() {
- counter++;
+ counter++;
}
public int getCounter() {
- return counter;
+ return counter;
}
public void setSfulRef(Sful ref) {
- this.ref = ref;
+ this.ref = ref;
}
public Sful getSfulRef() {
- return ref;
+ return ref;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
index beeeefc..dcf12a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
import jakarta.ejb.Local;
-
+
@Local
public interface SfulGreeter
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties
index 199757a..68a80cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-ee-remote_client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml
index 42f113c..931b582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/SfulProxy.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
index b5d0211..c2c88f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
@@ -25,70 +25,70 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args)
- throws Exception {
+ throws Exception {
stat.addDescription("ejb-ejb30-ee-remote_sfsb");
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-ee-remote_sfsbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
@EJB
private static SfulProxy proxy;
public void doTest() {
- boolean initialized = proxy.initialize();
+ boolean initialized = proxy.initialize();
stat.addStatus("remote initialize",
- initialized ? stat.PASS : stat.FAIL);
- if (initialized) {
+ initialized ? stat.PASS : stat.FAIL);
+ if (initialized) {
try {
System.out.println("invoking stateless");
String result = proxy.sayHello();
stat.addStatus("remote hello",
- "Hello".equals(result) ? stat.PASS : stat.FAIL);
+ "Hello".equals(result) ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("remote hello" , stat.FAIL);
}
- try {
- for (int i=0; i<5; i++) {
+ try {
+ for (int i=0; i<5; i++) {
String result = proxy.sayRemoteHello();
proxy.doCheckpoint();
- }
- for (int i=0; i<5; i++) {
+ }
+ for (int i=0; i<5; i++) {
String result = proxy.sayRemoteHello();
proxy.sayHello();
- }
- for (int i=0; i<5; i++) {
+ }
+ for (int i=0; i<5; i++) {
String result = proxy.sayRemoteHello();
proxy.doCheckpoint();
- }
+ }
stat.addStatus("remote remote_hello", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("remote remote_hello" , stat.FAIL);
}
- }
+ }
System.out.println("test complete");
}
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try { Thread.sleep(1000); } catch (Exception ex) {}
- System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
- }
+ while (seconds-- > 0) {
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+ System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
index ae40678..96d9673 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
@@ -24,51 +24,51 @@
@Stateful
@EJB(name="ejb/Delegate",
- mappedName="corbaname:iiop:localhost:3700#mapped_jndi_name_for_SfulDriver",
- beanInterface=SfulDriver.class)
+ mappedName="corbaname:iiop:localhost:3700#mapped_jndi_name_for_SfulDriver",
+ beanInterface=SfulDriver.class)
public class SfulProxyEJB
- implements SfulProxy {
+ implements SfulProxy {
private SfulDriver delegate;
public boolean initialize() {
/*
- try {
- InitialContext ctx = new InitialContext();
- delegate = (SfulDriver) ctx.lookup("mappedSfulDriver__3_x_Internal_RemoteBusinessHome__");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ctx = new InitialContext();
+ delegate = (SfulDriver) ctx.lookup("mappedSfulDriver__3_x_Internal_RemoteBusinessHome__");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
- try {
- InitialContext ctx = new InitialContext();
- delegate = (SfulDriver) ctx.lookup("mappedSfulDriver");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ctx = new InitialContext();
+ delegate = (SfulDriver) ctx.lookup("mappedSfulDriver");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
*/
- try {
- InitialContext ctx = new InitialContext();
- delegate = (SfulDriver) ctx.lookup("java:comp/env/ejb/Delegate");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ctx = new InitialContext();
+ delegate = (SfulDriver) ctx.lookup("java:comp/env/ejb/Delegate");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
- return (delegate != null);
+ return (delegate != null);
}
public String sayHello() {
- return delegate.sayHello();
+ return delegate.sayHello();
}
public String sayRemoteHello() {
- return delegate.sayRemoteHello();
+ return delegate.sayRemoteHello();
}
public void doCheckpoint() {
- delegate.doCheckpoint();
+ delegate.doCheckpoint();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties
index f126714..953c3f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-ee-remote_sfsb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml
index b72c0d9..36ee781 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,21 +46,21 @@
<target name="build" depends="compile">
- <!--build and package .war first so it doesn't contain ejb bean !-->
- <!--classes that have @Stateless/@Stateul !-->
+ <!--build and package .war first so it doesn't contain ejb bean !-->
+ <!--classes that have @Stateless/@Stateul !-->
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/SfulDriver.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -68,10 +68,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
index e28c97f..a66625f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
@@ -27,21 +27,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
stat.addDescription("ejb-ejb30-ee-remote_sfsb");
Client client = new Client(args);
- //lookupRemoteUsingJndi();
+ //lookupRemoteUsingJndi();
client.doTest();
stat.printSummary("ejb-ejb30-ee-remote_sfsbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
@EJB(name="ejb/SfulDriver", beanInterface=SfulDriver.class)
private static SfulDriver driver;
@@ -52,13 +52,13 @@
System.out.println("invoking stateless");
String result = driver.sayHello();
stat.addStatus("remote hello",
- "Hello".equals(result) ? stat.PASS : stat.FAIL);
+ "Hello".equals(result) ? stat.PASS : stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("remote hello" , stat.FAIL);
}
- try {
+ try {
String result = driver.sayRemoteHello();
stat.addStatus("remote remote_hello", stat.PASS);
} catch(Exception e) {
@@ -68,24 +68,24 @@
*/
- try {
+ try {
String url = "http://" + "localhost" + ":" + "4848" +
"/ejb-ejb30-hello-session3/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
System.out.println("test complete");
}
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try { Thread.sleep(1000); } catch (Exception ex) {}
- System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
- }
+ while (seconds-- > 0) {
+ try { Thread.sleep(1000); } catch (Exception ex) {}
+ System.out.println("Sleeping for 1 second. Still " + seconds + " seconds left...");
+ }
}
private int invokeServlet(String url) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
index b150800..e4a71ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
import jakarta.ejb.Remote;
-
+
@Remote
public interface RemoteSful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
index 47fa04c..3dd85d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
@@ -19,14 +19,14 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
-
+
@Stateful
public class RemoteSfulEJB
- implements RemoteSful {
+ implements RemoteSful {
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public String sayNamaste() {
- return "Remote Hello";
+ return "Remote Hello";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
index e5c4c90..9904b36 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
@@ -39,7 +39,7 @@
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public String sayRemoteHello() {
- return remoteSful.sayNamaste();
+ return remoteSful.sayNamaste();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml
index 62b9758..5dfabcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/build.xml
@@ -33,10 +33,10 @@
<antcall target="session2"/>
<antcall target="session2full"/>
<antcall target="nopkg"/>
- <antcall target="mdb"/>
- <antcall target="mdb2"/>
+ <antcall target="mdb"/>
+ <antcall target="mdb2"/>
<antcall target="session4"/>
- <antcall target="session5"/>
+ <antcall target="session5"/>
<antcall target="session3"/>
<antcall target="session_standalone"/>
</target>
@@ -71,13 +71,13 @@
<ant dir="session2" target="deploy"/>
<ant dir="session2" target="run"/>
- <!-- needs handle support
+ <!-- needs handle support
<ant dir="dcode" target="build"/>
<ant dir="dcode" target="deploy"/>
<ant dir="dcode" target="run"/>
<ant dir="dcode" target="run"/>
<ant dir="dcode" target="undeploy"/>
- -->
+ -->
<ant dir="session2" target="undeploy"/>
<record name="session2.output" action="stop" />
</target>
@@ -113,9 +113,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-hello tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-hello tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties
index 83634fe..20fdfbe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-dcode"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml
index 834000d..116cf76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="sfulhandle"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,14 +47,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/SfulHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -62,11 +62,11 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<delete file="sfulhandle"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
index 6ee11e7..7a3108a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,13 +34,13 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-dcodeID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB SfulHome sfulHome;
-
+
private static final String HANDLE_FILE_NAME = "sfulhandle";
private Sful[] sfuls = new Sful[20];
@@ -58,11 +58,11 @@
System.out.println("handle file already exists. reconstituting stateful reference");
FileInputStream fis = new FileInputStream(handleFile);
-
+
ObjectInputStream ois = new ObjectInputStream(fis);
for(int i = 0; i < sfuls.length; i++) {
-
+
Handle sfulHandle = (Handle) ois.readObject();
sfuls[i] = (Sful) sfulHandle.getEJBObject();
@@ -79,10 +79,10 @@
stat.addStatus("dcodewithhandles main", stat.PASS);
} else {
-
+
System.out.println("handle file doesn't exist. Creating sful" +
" bean");
-
+
FileOutputStream fos = new FileOutputStream(handleFile);
ObjectOutputStream oos = new ObjectOutputStream(fos);
@@ -101,7 +101,7 @@
oos.close();
System.out.println("test complete");
-
+
stat.addStatus("dcodenohandles main", stat.PASS);
}
@@ -110,8 +110,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml
index 6dffd1e..c13bd9b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>SfulEJB</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>5</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
index c02a3c3..f6b41fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
@@ -24,7 +24,7 @@
@RemoteHome(SfulHome.class)
@Stateful
-public class SfulEJB
+public class SfulEJB
{
// reference to a Remote Business object from another application
@@ -34,7 +34,7 @@
@EJB(mappedName="ejb_ejb30_hello_session2_Sless") com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemoteHome slessHome;
com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemote slessRemote;
-
+
@Init
public void create() {
System.out.println("In SfulEJB::create");
@@ -52,20 +52,20 @@
sless.hello();
- try {
+ try {
slessRemote.hello();
- com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemote
+ com.sun.s1asdev.ejb.ejb30.hello.session2.SlessRemote
anotherRemote = slessHome.create();
-
+
anotherRemote.hello();
} catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
-
+
System.out.println("Called sless.hello()");
return "hello";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties
index 44d1963..5d63747 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.mdb.client.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
index bac2cf0..08ad617 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/I*.class,**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -77,20 +77,20 @@
</target>
<target name="run_standaloneclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
index bad36a1..c7db7b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
@@ -43,7 +43,7 @@
}
- @Resource(name="FooCF", mappedName="jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(name="FooCF", mappedName="jms/ejb_ejb30_hello_mdb_QCF")
private static QueueConnectionFactory queueConFactory;
@Resource(name="MsgBeanQueue", mappedName="jms/ejb_ejb30_hello_mdb_InQueue")
@@ -60,7 +60,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -69,15 +69,15 @@
public void doTest() {
try {
- if( queueConFactory == null ) {
+ if( queueConFactory == null ) {
- System.out.println("Java SE mode...");
- InitialContext ic = new InitialContext();
- queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/ejb_ejb30_hello_mdb_QCF");
- msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_InQueue");
- clientQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_OutQueue");
-
- }
+ System.out.println("Java SE mode...");
+ InitialContext ic = new InitialContext();
+ queueConFactory = (jakarta.jms.QueueConnectionFactory) ic.lookup("jms/ejb_ejb30_hello_mdb_QCF");
+ msgBeanQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_InQueue");
+ clientQueue = (jakarta.jms.Queue) ic.lookup("jms/ejb_ejb30_hello_mdb_OutQueue");
+
+ }
setup();
doTest(numMessages);
@@ -91,14 +91,14 @@
}
public void setup() throws Exception {
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueReceiver = queueSession.createReceiver(clientQueue);
@@ -116,18 +116,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void doTest(int num)
+ public void doTest(int num)
throws Exception {
Destination dest = msgBeanQueue;
@@ -141,7 +141,7 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java
index 861518b..fccbaed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
index 144ea80..946fbf8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
@@ -38,7 +38,7 @@
msg);
}
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
index cf45901..0c9789a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
@@ -21,7 +21,7 @@
// Hello1 interface is not annotated with @Local. If the
// bean only implements one interface it is assumed to be
// a local business interface.
-@Stateless(description="my stateless bean description")
+@Stateless(description="my stateless bean description")
public class HelloStateless implements Hello1 {
public void hello(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
index 72d0408..588c96a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
@@ -30,5 +30,5 @@
bean.mname = m.getName();
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
index e4d85c8..e6ea43e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
@@ -44,8 +44,8 @@
@EJB private Hello1 hello1;
@EJB private Hello2 hello2;
- @Resource(name="jms/MyQueueConnectionFactory",
- mappedName="jms/ejb_ejb30_hello_mdb_QCF")
+ @Resource(name="jms/MyQueueConnectionFactory",
+ mappedName="jms/ejb_ejb30_hello_mdb_QCF")
QueueConnectionFactory qcFactory;
String mname = null;
@@ -64,7 +64,7 @@
QueueConnection connection = null;
try {
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
System.out.println("Calling hello2 stateful bean");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties
index 52c6596..a669eb3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-mdb2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="glassfish-application-client.xml"
- value="descriptor/glassfish-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="glassfish-application-client.xml"\u0020
+ value="descriptor/glassfish-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml
index 50cfebe..848fc89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
index 784bca8..b3c05f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/client/Client.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static @Resource(name="FooCF")
+ private static @Resource(name="FooCF")
QueueConnectionFactory queueConFactory;
public static void main (String[] args) {
@@ -52,7 +52,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -73,17 +73,17 @@
public void setup() throws Exception {
context = new InitialContext();
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
clientQueue = (jakarta.jms.Queue)
- context.lookup("java:comp/env/jms/MsgBeanClientQueue");
+ context.lookup("java:comp/env/jms/MsgBeanClientQueue");
queueReceiver = queueSession.createReceiver(clientQueue);
@@ -101,18 +101,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void doTest(String destName, int num)
+ public void doTest(String destName, int num)
throws Exception {
Destination dest = (Destination) context.lookup(destName);
@@ -126,7 +126,7 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
index b14a8c7..90fdeff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/descriptor/ejb-jar.xml
@@ -83,7 +83,7 @@
<mapped-name>jms/ejb_ejb30_hello_mdb2_InQueue</mapped-name>
-->
<lookup-name>jms/ejb_ejb30_hello_mdb2_InQueue</lookup-name>
-
+
</message-destination>
<message-destination>
<description>description 1</description>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java
index 0df7055..e1d8fa1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
index 7afd2b7..faa92f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
@@ -40,14 +40,14 @@
}
/*
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
*/
public void setSessionContext(jakarta.ejb.SessionContext sc) {
System.out.println("In HelloStateful:setSessionContext");
try {
- SessionContext sc2 = (SessionContext)
+ SessionContext sc2 = (SessionContext)
new InitialContext().lookup("java:comp/EJBContext");
System.out.println("Got SessionContext via java:comp/env/EJBContext");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
index c1b8391..447cb4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
@@ -38,9 +38,9 @@
if( !initialized ) {
throw new EJBException("not initialized");
}
-
+
System.out.println("HelloStateless: " + s);
- timerSvc.createTimer(1, "quick timer");
+ timerSvc.createTimer(1, "quick timer");
System.out.println("Created quick timer");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
index 1627c4c..d47c26a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
@@ -32,7 +32,7 @@
System.out.println("In HelloStatelessSuper:mytimeoutmethod");
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -43,9 +43,9 @@
if( txStatus == Status.STATUS_NO_TRANSACTION ) {
System.out.println("Successfully verified tx attr = " +
"TX_NOT_SUPPORTED in mytimeoutmethod()");
-
+
timeoutHappened = true;
-
+
} else {
System.out.println("Invalid tx status for TX_NOT_SUPPORTED" +
" method " + txStatus);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
index 59fffa4..5f85747 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
@@ -47,19 +47,19 @@
import java.util.Collection;
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
-@MessageDriven(messageListenerInterface=MessageListener.class)
+@MessageDriven(messageListenerInterface=MessageListener.class)
public class MessageBean implements jakarta.ejb.MessageDrivenBean {
@EJB(name="hello1") private Hello1 hello1;
@EJB private Hello2 hello2;
-
+
boolean onMessageInterceptorCalled = false;
boolean timeoutInterceptorCalled = false;
@Resource jakarta.ejb.MessageDrivenContext ctx;
@Resource jakarta.ejb.TimerService injectedTimerService;
- @Resource(name="jms/MyQueueConnectionFactory")
+ @Resource(name="jms/MyQueueConnectionFactory")
QueueConnectionFactory qcFactory;
// Values for these will be specified in the standard deployment descriptor
@@ -81,7 +81,7 @@
@Resource int intValue2 = 1;
@Resource Integer integerValue2 = new Integer(1);
- // corresponding env-entry is specified in ejb-jar.xml,
+ // corresponding env-entry is specified in ejb-jar.xml,
// but there is no value so no injection should happen and
// the default value should be used.
int intValue3 = 3;
@@ -143,7 +143,7 @@
} else {
throw new Exception("wrong value for intValue3 = " +
intValue3);
- }
+ }
if( stringValue1.equals("undefined") ||
(intValue1 == 1) || (integerValue1.intValue() == 1) ||
@@ -160,8 +160,8 @@
(intValue2 != 1) || (integerValue2.intValue() != 1) ) {
throw new Exception("env-entry @Resource override error");
}
-
- // Proprietary way to look up tx manager.
+
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -176,7 +176,7 @@
throw new Exception("Invalid tx status for TX_NOT_SUPPORTED" +
" method " + txStatus);
}
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
@@ -203,11 +203,11 @@
System.out.println("creating timer");
- TimerService timerService = (TimerService)
+ TimerService timerService = (TimerService)
new InitialContext().lookup("java:comp/TimerService");
-
+
timerService.createTimer(7000, "created timer");
-
+
Collection timers = injectedTimerService.getTimers();
if( timers.size() != 1 ) {
throw new IllegalStateException("invalid timer count = " +
@@ -222,7 +222,7 @@
@Timeout private void timeout(jakarta.ejb.Timer t) {
- QueueConnection connection = null;
+ QueueConnection connection = null;
try {
System.out.println("In MessageBean. Got timeout callback");
@@ -246,7 +246,7 @@
InitialContext ic = new InitialContext();
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
ic.lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -289,9 +289,9 @@
@AroundInvoke
public Object intercept(InvocationContext inv)
- throws Exception
+ throws Exception
{
- System.out.println("[mdb] Interceptor invoked...");
+ System.out.println("[mdb] Interceptor invoked...");
System.out.println("method = " + inv.getMethod());
System.out.println("params = " + inv.getParameters());
int i = 0;
@@ -309,8 +309,8 @@
}
- Object o = inv.proceed();
- System.out.println("[mdb] Interceptor after proceed()...");
+ Object o = inv.proceed();
+ System.out.println("[mdb] Interceptor after proceed()...");
return o;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties
index 2f96706..39b89c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-nopkg"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml
index 7b37691..1698561 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="Sful*.class,Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="Client.class,Sful.class,Sless.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
index ff4ad8f..5a07c31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
@@ -21,7 +21,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -30,11 +30,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-nopkg-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(mappedName="Sful") Sful sful;
private static @EJB(mappedName="Sless") Sless sless;
@@ -56,8 +56,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
index 2c4073c..a8aba87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
@@ -15,7 +15,7 @@
*/
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties
index 8ef534f..721ea5f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="simple.client2" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient2"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml
index bb47a4c..e53901e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="client/Client.java"/>
</target>
-
+
<target name="compile" depends="clean">
<copy file="client/Client.java.token" tofile="client/Client.java"/>
<replace file="client/Client.java"
@@ -51,14 +51,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -69,9 +69,9 @@
<antcall target="run_standaloneclient2"/>
</target>
-
+
<target name="run_standaloneclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
@@ -80,7 +80,7 @@
</target>
<target name="run_standaloneclient2" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client2}">
@@ -96,7 +96,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
index 410c711..527c0cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,17 +34,17 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
private static @EJB Sful sful;
-
+
private static @EJB(mappedName="com.sun.s1asdev.ejb.ejb30.hello.session.Sless") Sless sless;
//
- // NOTE: Token 3700 will be replaced in @EJB annotations below
+ // NOTE: Token 3700 will be replaced in @EJB annotations below
// with the value of the port from config.properties during the build
//
private static @EJB(mappedName="corbaname:iiop:localhost:3700#com.sun.s1asdev.ejb.ejb30.hello.session.Sless") Sless sless2;
@@ -58,12 +58,12 @@
try {
// System.out.println("Creating InitialContext()");
-// InitialContext ic = new InitialContext();
+// InitialContext ic = new InitialContext();
-// org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:comp/ORB");
+// org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:comp/ORB");
-// Sful sful = (Sful) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
-// Sless sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
+// Sful sful = (Sful) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
+// Sless sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
System.out.println("invoking stateful");
sful.hello();
@@ -71,11 +71,11 @@
System.out.println("invoking stateless");
sless.hello();
System.out.println("invoking stateless2");
- sless2.hello();
+ sless2.hello();
System.out.println("invoking stateless3");
- sless3.hello();
+ sless3.hello();
System.out.println("invoking stateless4");
- sless4.hello();
+ sless4.hello();
System.out.println("test complete");
@@ -85,8 +85,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java
index d891fb7..795b936 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient.java
@@ -24,7 +24,7 @@
public class StandaloneClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,11 +33,11 @@
StandaloneClient client = new StandaloneClient(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-sessionstandaloneID");
- }
-
+ }
+
public StandaloneClient (String[] args) {
}
-
+
public void doTest() {
try {
@@ -49,7 +49,7 @@
Sful sful2 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
-
+
Sful sful3 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful#com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
@@ -58,7 +58,7 @@
Sless sless2 = (Sless) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sless#com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
-
+
System.out.println("invoking stateful");
sful1.hello();
@@ -88,8 +88,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java
index 4e6d47a..a317f8f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/StandaloneClient2.java
@@ -24,7 +24,7 @@
public class StandaloneClient2 {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,32 +33,32 @@
StandaloneClient2 client = new StandaloneClient2(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-sessionstandalone2ID");
- }
-
+ }
+
public StandaloneClient2 (String[] args) {
}
-
+
public void doTest() {
try {
Properties props = new Properties();
- props.setProperty("java.naming.factory.initial",
+ props.setProperty("java.naming.factory.initial",
"com.sun.enterprise.naming.SerialInitContextFactory");
- props.setProperty("java.naming.factory.url.pkgs",
+ props.setProperty("java.naming.factory.url.pkgs",
"com.sun.enterprise.naming");
props.setProperty("java.naming.factory.state",
"com.sun.corba.ee.impl.presentation.rmi.JNDIStateFactoryImpl");
-
+
InitialContext ic = new InitialContext(props);
-
+
Sful sful1 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
Sful sful2 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
-
+
Sful sful3 = (Sful) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sful#com.sun.s1asdev.ejb.ejb30.hello.session.Sful");
@@ -67,7 +67,7 @@
Sless sless2 = (Sless) ic.lookup
("com.sun.s1asdev.ejb.ejb30.hello.session.Sless#com.sun.s1asdev.ejb.ejb30.hello.session.Sless");
-
+
System.out.println("invoking stateful");
sful1.hello();
@@ -97,8 +97,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
index 80af5ba..dda9587 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties
index 7275002..db7df10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml
index 6690b1c..271572f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sless*.class,**/Sful*.class,**/ExternalBusiness.class,**/Foo*.class,**/MyCallbackHandler.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/ClientSuper.class,**/Client.class,**/Sless.class,**/SlessSub.class,**/Sful.class,**/ExternalBusiness.class,**/FooHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
index e556394..397c541 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
@@ -29,16 +29,16 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-@EJBs(
- { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
+@EJBs(
+ { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
beanInterface=Sless.class),
- @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
+ @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
beanInterface=Sless.class)
})
@EJB(name="ejb/TypeLevelSless3", beanInterface=SlessSub.class)
public class Client extends ClientSuper {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -47,7 +47,7 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session2ID");
- }
+ }
private static @EJB Sful sful1;
private static @EJB Sful sful2;
@@ -57,7 +57,7 @@
private static @EJB(beanName="SlessEJB") Sless sless1;
- // linked to SlessEJB2 via sun-application-client.xml
+ // linked to SlessEJB2 via sun-application-client.xml
// so no beanName disambiguation is needed
private static @EJB Sless sless2;
@@ -67,11 +67,11 @@
public Client (String[] args) {
}
-
+
public void doTest() {
try {
-
+
System.out.println("Calling superSless1");
Sless superSlessLookup = (Sless) new javax.naming.InitialContext().lookup("java:comp/env/com.sun.s1asdev.ejb.ejb30.hello.session2.client.ClientSuper/superSless1");
@@ -95,7 +95,7 @@
}
sful1.doRemoveMethodSessionSyncTests();
-
+
// Call application-defined @Remove method. This method has
// no relationship to EJBObject.remove(). It's a coincidence
// that it has the same name.
@@ -236,7 +236,7 @@
if( r1.getId().equals(r2.getId()) ) {
throw new Exception("remote param passing getId() test failed");
}
-
+
sless3.hello();
sless3.hello3();
@@ -265,8 +265,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
index d89469d..39669b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
@@ -25,7 +25,7 @@
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
index 0e4c3dd..ac8d40c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
@@ -22,7 +22,7 @@
public class MyCallbackHandler {
- @PreDestroy
+ @PreDestroy
public void myPreDestMethod(InvocationContext invCtx) {
System.out.println("In MyCallbackHandler::myPreDestMethod ");
@@ -44,7 +44,7 @@
"callback handler");
}
-
+
try {
invCtx.proceed();
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java
index 182bda6..68f57b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful.java
@@ -37,17 +37,17 @@
// for a method that has @Remove behavior so it needs to work.
public void remove();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
// Associated with an @Remove method that has retainIfException=true
@@ -55,7 +55,7 @@
// retainIfException only applies to application exceptions, so
// this bean should always be removed.
public void removeMethodThrowSysException(boolean throwException);
-
+
public void doRemoveMethodSessionSyncTests();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
index a42c24c..a86e33c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
@@ -23,17 +23,17 @@
{
public String hello();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
// Associated with an @Remove method that has retainIfException=true
@@ -41,5 +41,5 @@
// retainIfException only applies to application exceptions, so
// this bean should always be removed.
public void removeMethodThrowSysException(boolean throwException);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
index 39e46d0..d61d0c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
@@ -39,10 +39,10 @@
@Stateful
@TransactionManagement(TransactionManagementType.BEAN)
-@EJBs(
- { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
+@EJBs(
+ { @EJB(name="ejb/TypeLevelSless1", beanName="SlessEJB",
beanInterface=Sless.class),
- @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
+ @EJB(name="ejb/TypeLevelSless2", beanName="SlessEJB2",
beanInterface=Sless.class) ,
@EJB(name="ejb/SfulEJB2", beanInterface=Sful2.class)
})
@@ -51,7 +51,7 @@
@EJB(name="ejb/TypeLevelSless3", beanInterface=SlessSub.class)
@Remote({Sful.class})
// ejb is not required to put business interface in implements clause
-public class SfulEJB
+public class SfulEJB
{
private @Resource SessionContext sc;
@@ -64,7 +64,7 @@
private @EJB(beanName="SlessEJB") void setSless4(Sless sless) {
sless4 = sless;
}
-
+
private Sless sless5;
@EJB(beanName="SlessEJB2") void setSless5(Sless sless) {
sless5 = sless;
@@ -173,7 +173,7 @@
public void foo(int a, String b) {
}
- private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
+ private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
throws Exception {
String sless1Id = s1.getId();
@@ -223,7 +223,7 @@
s3.roundTrip2(c);
s3.hello3();
-
+
}
@PostConstruct
@@ -247,7 +247,7 @@
}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB " + state + " removeRetainIfException");
@@ -258,10 +258,10 @@
}
@Remove
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeNotRetainIfException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -272,7 +272,7 @@
@Remove
public void removeMethodThrowSysException(boolean throwException) {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeMethodThrowSysException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -299,7 +299,7 @@
SfulEJB2.beforeCompletionCalled &&
SfulEJB2.afterCompletionCalled ) {
System.out.println("Got expected SessionSynch behavior for " +
- "removeRetainIfException(true)");
+ "removeRetainIfException(true)");
} else {
throw new EJBException("SessionSynch failure for " +
"removeRetainIfException(true)");
@@ -320,13 +320,13 @@
!SfulEJB2.beforeCompletionCalled &&
!SfulEJB2.afterCompletionCalled ) {
System.out.println("Got expected SessionSynch behavior for " +
- "removeRetainIfException(false)");
+ "removeRetainIfException(false)");
} else {
throw new EJBException("SessionSynch failure for " +
"removeRetainIfException(true)");
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
index b2f9ddf..6b93ed5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
@@ -43,10 +43,10 @@
// use some package-local mutable static state to check whether
// session synch callbacks are called correctly for @Remove methods.
- // This provides a simple way to check the results since the bean
+ // This provides a simple way to check the results since the bean
// instance is no longer available to the caller. The caller must
// always at most one SFSBs of this bean type at a time for this
- // to work.
+ // to work.
static boolean afterBeginCalled = false;
static boolean beforeCompletionCalled = false;
static boolean afterCompletionCalled = false;
@@ -60,7 +60,7 @@
}
@Remove(retainIfException=true)
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB2 " +
@@ -72,7 +72,7 @@
}
@Remove
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB2 " +
@@ -86,7 +86,7 @@
@Remove
public void removeMethodThrowSysException(boolean throwException) {
- System.out.println("In SfulEJB2 " +
+ System.out.println("In SfulEJB2 " +
"removeMethodThrowSysException");
System.out.println("throwException = " + throwException);
if( throwException ) {
@@ -100,7 +100,7 @@
afterBeginCalled = true;
beforeCompletionCalled = false;
afterCompletionCalled = false;
-
+
System.out.println("In SfulEJB2::afterBegin()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
index 900eed2..3f86c67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
@@ -33,7 +33,7 @@
@Remote(Sless.class)
@RemoteHome(SlessRemoteHome.class)
-public class SlessEJB
+public class SlessEJB
{
@Resource(name="null") SessionContext sc;
@@ -66,11 +66,11 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB::roundTrip2 " +
+ System.out.println("In SlessEJB::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
index 5d81de3..1e5a85f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
@@ -43,7 +43,7 @@
@PostConstruct
public void ejbCreate() {
- System.out.println("In SlessEJB2::ejbCreate()");
+ System.out.println("In SlessEJB2::ejbCreate()");
postConstructCalled = true;
}
@@ -72,7 +72,7 @@
public String getId() {
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -94,7 +94,7 @@
return "SlessEJB2";
}
-
+
public Sless roundTrip(Sless s) {
System.out.println("In SlessEJB2::roundTrip " + s);
System.out.println("input Sless.getId() = " + s.getId());
@@ -102,12 +102,12 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB2::roundTrip2 " +
+ System.out.println("In SlessEJB2::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
@@ -118,10 +118,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
index 09811f3..40c6af9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
@@ -39,7 +39,7 @@
private @Resource SessionContext ejbContext2;
- @Resource(type=jakarta.ejb.SessionContext.class)
+ @Resource(type=jakarta.ejb.SessionContext.class)
private EJBContext ejbContext3;
private EJBContext ejbContext4;
@@ -78,7 +78,7 @@
private void setEJBContext6(EJBContext context) {
ejbContext6 = context;
}
-
+
@PostConstruct
public void afterCreate() {
System.out.println("In SlessEJB3::afterCreate() marked as PostConstruct");
@@ -136,13 +136,13 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB3::roundTrip2 " +
+ System.out.println("In SlessEJB3::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties
index 83429c2..77d377d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session2full"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml
index 21f06e5..e6127fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/ClientSuper.class,**/Client.class,**/Sless.class,**/SlessSub.class,**/Sful.class,**/ExternalBusiness.class,**/FooHome.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
index 2e687b2..62cb179 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
@@ -26,7 +26,7 @@
public class Client extends ClientSuper {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -35,7 +35,7 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session2fullID");
- }
+ }
private static Sful sful1;
private static Sful sful2;
@@ -44,7 +44,7 @@
private static Sless sless1;
- // linked to SlessEJB2 via sun-application-client.xml
+ // linked to SlessEJB2 via sun-application-client.xml
// so no beanName disambiguation is needed
private static Sless sless2;
@@ -54,11 +54,11 @@
public Client (String[] args) {
}
-
+
public void doTest() {
try {
-
+
System.out.println("Calling superSless1");
superSless1.hello();
System.out.println("Called superSless1");
@@ -78,7 +78,7 @@
if( get1.equals(get2) ) {
throw new Exception("SFSB get test failed");
}
-
+
// Call application-defined @Remove method. This method has
// no relationship to EJBObject.remove(). It's a coincidence
// that it has the same name.
@@ -196,7 +196,7 @@
if( r1.getId().equals(r2.getId()) ) {
throw new Exception("remote param passing getId() test failed");
}
-
+
sless3.hello();
sless3.hello3();
@@ -227,8 +227,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml
index 69216b4..20676f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/descriptor/ejb-jar.xml
@@ -234,7 +234,7 @@
<interceptor-class>com.sun.s1asdev.ejb.ejb30.hello.session2full.MyCallbackHandler</interceptor-class>
<pre-destroy>
<lifecycle-callback-method>myPreDestroyMethod</lifecycle-callback-method>
- </pre-destroy>
+ </pre-destroy>
</interceptor>
</interceptors>
<assembly-descriptor>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
index 6218d31..8a5c797 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
@@ -25,7 +25,7 @@
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java
index 21eed88..ce9abfc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sful.java
@@ -37,16 +37,16 @@
// for a method that has @Remove behavior so it needs to work.
public void remove();
- // Associated with an @Remove method that has retainIfException=true.
+ // Associated with an @Remove method that has retainIfException=true.
// If argument is true, the method will throw an exception, which should
// keep the bean from being removed. If argument is false, the bean
// should stll be removed.
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception;
- // Associated with an @Remove method that has retainIfException=false.
+ // Associated with an @Remove method that has retainIfException=false.
// Whether the argument is true or false, the bean should still be
// removed.
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
index cfe957f..12dec63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
@@ -25,7 +25,7 @@
import java.util.Collection;
import java.util.HashSet;
-public class SfulEJB
+public class SfulEJB
{
private SessionContext sc;
@@ -39,7 +39,7 @@
private void setSless4(Sless sless) {
sless4_ = sless;
}
-
+
private Sless sless5_;
void setSless5(Sless sless) {
sless5_ = sless;
@@ -108,7 +108,7 @@
public void foo(int a, String b) {
}
- private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
+ private void testSlessRefs(Sless s1, Sless s2, SlessSub s3)
throws Exception {
String sless1Id = s1.getId();
@@ -158,7 +158,7 @@
s3.roundTrip2(c);
s3.hello3();
-
+
}
public void afterCreate() {
@@ -169,7 +169,7 @@
System.out.println("In SfulEJB " + state + " @Remove method");
}
- public void removeRetainIfException(boolean throwException)
+ public void removeRetainIfException(boolean throwException)
throws Exception {
System.out.println("In SfulEJB " + state + " removeRetainIfException");
@@ -179,10 +179,10 @@
}
}
- public void removeNotRetainIfException(boolean throwException)
+ public void removeNotRetainIfException(boolean throwException)
throws Exception {
- System.out.println("In SfulEJB " + state +
+ System.out.println("In SfulEJB " + state +
"removeNotRetainIfException");
System.out.println("throwException = " + throwException);
if( throwException ) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
index 1564863..5650716 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
@@ -22,7 +22,7 @@
import java.util.Iterator;
import jakarta.transaction.UserTransaction;
-public class SlessEJB
+public class SlessEJB
{
@@ -46,11 +46,11 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB::roundTrip2 " +
+ System.out.println("In SlessEJB::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
index 9042b33..fb68203 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
@@ -53,7 +53,7 @@
public String getId() {
try {
- // Proprietary way to look up tx manager.
+ // Proprietary way to look up tx manager.
TransactionManager tm = (TransactionManager)
new InitialContext().lookup("java:appserver/TransactionManager");
// Use an implementation-specific check to ensure that there
@@ -75,7 +75,7 @@
return "SlessEJB2";
}
-
+
public Sless roundTrip(Sless s) {
System.out.println("In SlessEJB2::roundTrip " + s);
System.out.println("input Sless.getId() = " + s.getId());
@@ -83,12 +83,12 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB2::roundTrip2 " +
+ System.out.println("In SlessEJB2::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
@@ -103,10 +103,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
index 5bc4362..df3b683 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
@@ -49,7 +49,7 @@
private void setEJBContext6(EJBContext context) {
ejbContext6_ = context;
}
-
+
public String hello() {
System.out.println("In SlessEJB3:hello()");
@@ -97,13 +97,13 @@
}
public Collection roundTrip2(Collection collectionOfSless) {
- System.out.println("In SlessEJB3::roundTrip2 " +
+ System.out.println("In SlessEJB3::roundTrip2 " +
collectionOfSless);
if( collectionOfSless.size() > 0 ) {
Sless sless = (Sless) collectionOfSless.iterator().next();
- System.out.println("input Sless.getId() = " + sless.getId());
+ System.out.println("input Sless.getId() = " + sless.getId());
}
return collectionOfSless;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties
index 966e0f8..b15565e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml
index 4d680ff..147d4b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,7 +56,7 @@
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
@@ -69,7 +69,7 @@
</jar>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello**.class" />
</antcall>
@@ -82,8 +82,8 @@
</fileset>
</jar>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create.sql"/>
@@ -96,7 +96,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -106,10 +106,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
index 491c71b..a6b4717 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
@@ -31,33 +31,33 @@
import jakarta.persistence.EntityManager;
public class Client {
-
+
private String host;
private String port;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- @PersistenceUnit
+ @PersistenceUnit
private static EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private static EntityManagerFactory emf2;
public Client (String[] args) {
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
stat.addDescription("ejb-ejb30-hello-session3client");
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session3ID");
}
-
+
public void doTest() {
-
+
String env = null;
try {
@@ -81,11 +81,11 @@
}
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-ejb30-hello-session3/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("webclient main", stat.FAIL);
@@ -97,15 +97,15 @@
stat.addStatus("webclient main", stat.FAIL);
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -118,6 +118,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
index f0f17b0..f7168c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
@@ -30,10 +30,10 @@
public Person(String name){
this.name = name;
}
-
+
@Override public String toString(){
return "Person: {"+"(name = "+name+")}";
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java
index a5d933f..54bcca0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/Hello.java
@@ -19,5 +19,5 @@
public interface Hello {
public void hello();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
index af957f0..f93839c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
@@ -28,16 +28,16 @@
@Stateless public class HelloEJB implements Hello {
- @PersistenceUnit
+ @PersistenceUnit
private EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private EntityManagerFactory emf2;
@PersistenceContext
private EntityManager em1;
- @PersistenceContext(name="myem", unitName="foo")
+ @PersistenceContext(name="myem", unitName="foo")
private EntityManager em2;
public void hello() {
@@ -59,11 +59,11 @@
EntityManager lookupem2 = (EntityManager)
ic.lookup("java:comp/env/myem");
-
+
} catch(Exception e) {
throw new jakarta.ejb.EJBException(e);
}
-
+
System.out.println("HelloEJB successful injection of EMF/EM references!");
} else {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java
index d85568a..45b0d10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStateful.java
@@ -19,7 +19,7 @@
public interface HelloStateful {
public void hello();
-
+
public void sleepFor(int sec);
public void ping();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
index a3d7e90..727594c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
@@ -27,7 +27,7 @@
@AccessTimeout(0)
@Stateful public class HelloStatefulEJB implements HelloStateful {
-
+
@PersistenceContext(name="myem",
unitName="foo", type=PersistenceContextType.EXTENDED)
private EntityManager em;
@@ -42,12 +42,12 @@
public void sleepFor(int sec) {
System.out.println("In HelloStatefulEJB::sleepFor()");
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ }
+ } catch (Exception ex) {
+ }
System.out.println("Finished HelloStatefulEJB::sleepFor()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java
index a5d933f..54bcca0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Hello.java
@@ -19,5 +19,5 @@
public interface Hello {
public void hello();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java
index d85568a..45b0d10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/HelloStateful.java
@@ -19,7 +19,7 @@
public interface HelloStateful {
public void hello();
-
+
public void sleepFor(int sec);
public void ping();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
index 68bbd52..0c67042 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
@@ -80,30 +80,30 @@
}
- @PersistenceUnit
+ @PersistenceUnit
private EntityManagerFactory emf1;
- @PersistenceUnit(name="myemf", unitName="foo")
+ @PersistenceUnit(name="myemf", unitName="foo")
private EntityManagerFactory emf2;
@PersistenceContext
private EntityManager em1;
- @PersistenceContext(name="myem",
+ @PersistenceContext(name="myem",
unitName="foo", type=PersistenceContextType.TRANSACTION)
private EntityManager em2;
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In webclient::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
@@ -122,7 +122,7 @@
EntityManager lookupem2 = (EntityManager)
ic.lookup("java:comp/env/myem");
-
+
System.out.println("Servlet successful injection of EMF/EM references!");
} else {
throw new Exception("One or more EMF/EM references" +
@@ -152,17 +152,17 @@
helloStateful.hello();
helloStateful2.hello();
- Hello helloStateless3 = (Hello)
+ Hello helloStateless3 = (Hello)
ic.lookup("java:comp/env/helloStateless3");
helloStateless3.hello();
- Hello helloStateless4 = (Hello)
+ Hello helloStateless4 = (Hello)
ic.lookup("java:comp/env/helloStateless4");
helloStateless4.hello();
- HelloStateful helloStateful3 = (HelloStateful)
+ HelloStateful helloStateful3 = (HelloStateful)
ic.lookup("java:comp/env/helloStateful3");
helloStateful3.hello();
@@ -194,66 +194,66 @@
System.out.println("ds6 login timeout = " + loginTimeout);
- try {
- MyThread thread = new MyThread(helloStateful2);
- thread.start();
+ try {
+ MyThread thread = new MyThread(helloStateful2);
+ thread.start();
- sleepFor(10);
- helloStateful2.ping();
- throw new EJBException("Did not get ConcurrentAccessException");
- } catch (jakarta.ejb.ConcurrentAccessException conEx) {
- System.out.println("Got expected ConcurrentAccessException"); //Everything is fine
- } catch (Throwable th) {
- throw new EJBException("Got some wierd exception: " + th);
- }
+ sleepFor(10);
+ helloStateful2.ping();
+ throw new EJBException("Did not get ConcurrentAccessException");
+ } catch (jakarta.ejb.ConcurrentAccessException conEx) {
+ System.out.println("Got expected ConcurrentAccessException"); //Everything is fine
+ } catch (Throwable th) {
+ throw new EJBException("Got some wierd exception: " + th);
+ }
System.out.println("successfully accessed connections");
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
class MyThread extends Thread {
- HelloStateful ref;
+ HelloStateful ref;
- MyThread(HelloStateful ref) {
- this.ref = ref;
- }
+ MyThread(HelloStateful ref) {
+ this.ref = ref;
+ }
- public void run() {
- try {
- ref.sleepFor(20);
- } catch (Throwable th) {
- throw new RuntimeException("Could not invoke waitfor() method");
- }
- }
+ public void run() {
+ try {
+ ref.sleepFor(20);
+ } catch (Throwable th) {
+ throw new RuntimeException("Could not invoke waitfor() method");
+ }
+ }
}
private void sleepFor(int sec) {
- try {
- for (int i=0 ; i<sec; i++) {
- Thread.currentThread().sleep(1000);
- System.out.println("[" + i + "/" + sec + "]: Sleeping....");
- }
- } catch (Exception ex) {
- }
+ try {
+ for (int i=0 ; i<sec; i++) {
+ Thread.currentThread().sleep(1000);
+ System.out.println("[" + i + "/" + sec + "]: Sleeping....");
+ }
+ } catch (Exception ex) {
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties
index b0cb867..21b66fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session4"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml
index 5efdbca..e7c163a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,35 +46,35 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sful2.class,**/Sless.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<!-- Don't deploy client in order to test that dynamic byte code
-generation is working.
+generation is working.
<antcall target="deploy-client-common"/>
-->
</target>
<target name="run" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+ <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
<!-- Don't deploy client in order to test that dynamic byte code
-generation is working.
+generation is working.
<arg line="-client
${assemble.dir}/${appname}-clientClient.jar"/>
-->
@@ -87,15 +87,15 @@
<arg line="${appclient.application.args}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<!-- Don't deploy client in order to test that dynamic byte code
-generation is working.
+generation is working.
<antcall target="undeploy-client-common"/>
-->
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
index f8720f7..94f30b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,8 +34,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session4ID");
- }
-
+ }
+
public Client (String[] args) {
}
@@ -57,9 +57,9 @@
public void doTest() {
try {
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
- sful = (Sful) ic.lookup("ejb_ejb30_hello_session4_Sful#com.sun.s1asdev.ejb.ejb30.hello.session4.Sful");
+ sful = (Sful) ic.lookup("ejb_ejb30_hello_session4_Sful#com.sun.s1asdev.ejb.ejb30.hello.session4.Sful");
System.out.println("invoking stateful");
String sfulId = "1";
sful.setId(sfulId);
@@ -73,7 +73,7 @@
System.out.println("Expected id " + sfulId);
System.out.println("Received id " + sful_2Id);
if( !sful_2Id.equals(sfulId) ) {
- throw new Exception("sful bean id mismatch " +
+ throw new Exception("sful bean id mismatch " +
sfulId + " , " + sful_2Id);
}
@@ -83,7 +83,7 @@
System.out.println("invoking stateless");
- sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session4.Sless");
+ sless = (Sless) ic.lookup("com.sun.s1asdev.ejb.ejb30.hello.session4.Sless");
sless.hello();
System.out.println("test complete");
@@ -94,8 +94,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
index 26440ec..daa1af4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
@@ -29,5 +29,5 @@
// defined on both remote business interfaces
public void sameMethod();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
index 37493fe..a1c291f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
@@ -53,6 +53,6 @@
public void sameMethod() {
System.out.println("In SfulEJB:sameMethod()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
index 29f0c73..9879860 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
@@ -22,7 +22,7 @@
// Use @Remote without parameters. If there's only one ambiguous
// interface in implements clause, it will be treate as @Remote instead of
// @Local
-@Remote
+@Remote
@Stateless
public class SlessEJB implements Sless
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties
index b3e1096..5421032 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session5"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml
index b3bfc90..d88affb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,28 +46,28 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class,**/MyInterceptor*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful2.class,**/Sless2.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<antcall target="deploy-client-common"/>
</target>
<target name="run" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+ <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
<arg line="-client ${assemble.dir}/${appname}-clientClient.jar"/>
<arg line="-name ${appname}Client"/>
@@ -78,11 +78,11 @@
<arg line="${appclient.application.args}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
index 9cd7fa2..36fce5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,8 +34,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session5ID");
- }
-
+ }
+
/**
* This test ensures that we don't assume a remote ejb client has
* access to all the classes for all the remote business interfaces that
@@ -43,7 +43,7 @@
* remote business interfaces, but this client only uses Sful2 and
* Sless2 and does not package the Sful or Sless classes at all. The
* internal generated RMI-IIOP stubs created at runtime should not
- * cause any classloading errors in the client.
+ * cause any classloading errors in the client.
*/
public Client (String[] args) {
}
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
index ef74b3b..ff13010 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
@@ -28,7 +28,7 @@
return postConstructCalled;
}
- @PostConstruct
+ @PostConstruct
private void postConstruct(InvocationContext ctx) {
postConstructCalled = true;
System.out.println("MyInterceptor::postConstruct called");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
index 8f0c8f2..503e9b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
@@ -29,7 +29,7 @@
}
- @PostConstruct
+ @PostConstruct
private void postConstruct(InvocationContext ctx) {
postConstructCalled = true;
System.out.println("MyInterceptor2::postConstruct called");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
index 8ddd1a4..79dcce7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
@@ -50,6 +50,6 @@
System.out.println("In SfulEJB:hello2()");
return "hello2";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties
index 8d344e0..3516703 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-hello-session_standalone"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml
index 80a941a..ecc33b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,28 +46,28 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<antcall target="deploy-client-common"/>
</target>
<target name="run" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+ <echo message="appclient -client ${assemble.dir}/${appname}-clientClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
<arg line="-client ${assemble.dir}/${appname}-clientClient.jar"/>
<arg line="-name ${appname}Client"/>
@@ -78,11 +78,11 @@
<arg line="${appclient.application.args}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
index ef1eb88..13d259e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
@@ -24,7 +24,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,8 +33,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-hello-session_standaloneID");
- }
-
+ }
+
public Client (String[] args) {
}
@@ -76,8 +76,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
index 24adcc2..454f23b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
@@ -37,12 +37,12 @@
return timeoutWasCalled;
}
- @Timeout
+ @Timeout
private void timeout(Timer t) {
System.out.println("in SlessEJB:timeout");
timeoutWasCalled = true;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties
index 87ffb6c..d678c2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-bindings"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.interceptors.bindings.client.StandaloneClient"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml
index 588641e..20267ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class,**/Common*.class,**/Interceptor*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class,**/Sful2.class,**/Sless3.class,**/Sless4.class,**/Sless5.class,**/Sless6.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
index 33fa70a..2120f94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
@@ -24,7 +24,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,11 +33,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-interceptors-bindingsID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sful sful;
private static @EJB Sful2 sful2;
private static @EJB Sless3 sless3;
@@ -101,10 +101,10 @@
sless6.ag();
sless6.ag(1);
-
+
sless6.bg();
sless6.bg(1);
-
+
sless6.cg();
sless6.cg(1);
sless6.cg("foo", 1.0);
@@ -124,8 +124,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
index 85ad44f..593b350 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
@@ -29,16 +29,16 @@
static void aroundInvokeCalled(InvocationContext ctx, String id) {
- List<String> interceptors = (List<String>)
+ List<String> interceptors = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
-
+
if( interceptors == null ) {
interceptors = new LinkedList<String>();
ctx.getContextData().put(INTERCEPTORS_PROP, interceptors);
}
interceptors.add(id);
-
+
}
static void checkResults(InvocationContext ctx) {
@@ -56,9 +56,9 @@
for( char nextChar : methodNameUpper.toCharArray() ) {
expected.add(nextChar + "");
}
- }
+ }
- List<String> actual = (List<String>)
+ List<String> actual = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
String msg = "Expected " + expected + " for method " +
@@ -74,5 +74,5 @@
System.out.println("Successful interceptor chain : " + msg);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
index f24f29e..979a0bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
@@ -26,7 +26,7 @@
public class InterceptorA {
@Resource SessionContext sessionCtx;
-
+
@PostConstruct
private void postConstruct(InvocationContext ctx) {
try {
@@ -38,7 +38,7 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
// access injected environment dependency
System.out.println("invoked business interface = " +
@@ -47,10 +47,10 @@
// look up ejb-ref defined within default interceptor in ejb-jar.xml
InitialContext ic = new InitialContext();
Sless3 sless3 = (Sless3) ic.lookup("java:comp/env/ejb/Sless3");
-
-
+
+
Common.aroundInvokeCalled(ctx, "A");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
index 497bb9b..6869fb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
@@ -33,9 +33,9 @@
// around-invoke declared in ejb-jar.xml
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "B");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
index 20f6fb6..9556dda 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "C");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
index 7c1669b..d6c1ef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "D");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
index 136d2cf..89d644d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "E");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
index 772fb40..a1662f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
@@ -33,9 +33,9 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "F");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
index eb400b2..38934aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
@@ -33,7 +33,7 @@
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundInvokeCalled(ctx, "G");
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB6 ) {
@@ -41,5 +41,5 @@
}
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
index 42b3e1a..b94be8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful
{
@@ -38,7 +38,7 @@
public void cdef();
- public void abcdef();
+ public void abcdef();
public void acbdfe();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
index 3a12684..e471a51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sful2
{
@@ -29,6 +29,6 @@
public void ef();
public void cdef();
-
+
public void nothing();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
index a565ed8..5d89d05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
@@ -41,7 +41,7 @@
@ExcludeDefaultInterceptors
public void cd() {
- System.out.println("in SfulEJB:cd(). postConstruct = " +
+ System.out.println("in SfulEJB:cd(). postConstruct = " +
postConstructCalled);
if( !postConstructCalled ) {
@@ -82,16 +82,16 @@
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void cdef() {}
-
+
@ExcludeDefaultInterceptors
@ExcludeClassInterceptors
public void nothing() {}
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void abcdef() {}
// total ordering overridden in deployment descriptor
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void acbdfe() {}
// declared in ejb-jar.xml
@@ -106,5 +106,5 @@
throw new EJBException(e);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
index f5d19ed..446493d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
@@ -32,7 +32,7 @@
private boolean aroundInvokeCalled = false;
public void cd() {
- System.out.println("in SfulEJB:cd(). aroundInvokeCalled = " +
+ System.out.println("in SfulEJB:cd(). aroundInvokeCalled = " +
aroundInvokeCalled);
// a little extra checking to make sure aroundInvoke is invoked...
@@ -53,12 +53,12 @@
@ExcludeClassInterceptors
public void abef(int i) {}
- // @ExcludeDefaultInterceptors is a no-op here since it
+ // @ExcludeDefaultInterceptors is a no-op here since it
// was already excluded at class-level
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void cdef() {}
-
+
@ExcludeClassInterceptors
public void nothing() {}
@@ -74,5 +74,5 @@
throw new EJBException(e);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
index 8622ee3..ac1e93e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless3
{
@@ -35,7 +35,7 @@
public void dcef();
- public void dcbaef();
+ public void dcbaef();
public void abcdef();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
index c8e3911..abd983d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless4
{
@@ -29,6 +29,6 @@
public void ef();
public void cbdef();
-
+
public void nothing();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
index 7d24ce3..cc6b3e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless5
{
@@ -25,6 +25,6 @@
public void abdc();
public void dcfe();
-
+
public void nothing();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
index 8993276..7390129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless6
{
@@ -29,7 +29,7 @@
public void bg();
public void bg(int param);
-
+
public void cg();
public void cg(int param);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
index 480566f..fa89467 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
@@ -50,16 +50,16 @@
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void dcef() {}
-
+
@ExcludeDefaultInterceptors
@ExcludeClassInterceptors
public void nothing() {}
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void dcbaef() {}
// total ordering overridden in deployment descriptor
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
public void abcdef() {}
// binding described in deployment descriptor
@@ -71,5 +71,5 @@
Common.checkResults(ctx);
return null;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
index 724ccf6..989a4fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
@@ -35,7 +35,7 @@
private boolean aroundInvokeCalled = false;
public void cbd() {
- System.out.println("in SlessEJB4:cbd(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB4:cbd(). aroundInvokeCalled = " +
aroundInvokeCalled);
// a little extra checking to make sure aroundInvoke is invoked...
@@ -56,12 +56,12 @@
InterceptorE.class, InterceptorF.class})
public void abef(int i) {}
- // @ExcludeDefaultInterceptors is a no-op here since it
+ // @ExcludeDefaultInterceptors is a no-op here since it
// was already excluded at class-level
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
public void cbdef() {}
-
+
@ExcludeClassInterceptors
public void nothing() {}
@@ -77,7 +77,7 @@
throw new EJBException(e);
}
}
-
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
index 0a573d0..c6327f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
@@ -37,7 +37,7 @@
private boolean aroundInvokeCalled = false;
public void abdc() {
- System.out.println("in SlessEJB5:abdc(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB5:abdc(). aroundInvokeCalled = " +
aroundInvokeCalled);
// a little extra checking to make sure aroundInvoke is invoked...
@@ -68,7 +68,7 @@
throw new EJBException(e);
}
}
-
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
index ed905f6..29f501a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
@@ -35,10 +35,10 @@
{
boolean aroundInvokeCalled = false;
-
+
@Interceptors({InterceptorA.class, InterceptorG.class})
public void ag() {
- System.out.println("in SlessEJB6:ag(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:ag(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -50,17 +50,17 @@
public void ag(int param1) {
System.out.println("in SlessEJB6:ag(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( aroundInvokeCalled ) {
aroundInvokeCalled = false;
throw new EJBException("bean class aroundInvoke was incorrectly called");
}
}
- // bg() (but not bg(param)) marked through ejb-jar.xml
+ // bg() (but not bg(param)) marked through ejb-jar.xml
// as having interceptors B,G
public void bg() {
- System.out.println("in SlessEJB6:bg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:bg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -72,7 +72,7 @@
public void bg(int param1) {
System.out.println("in SlessEJB6:bg(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( aroundInvokeCalled ) {
aroundInvokeCalled = false;
throw new EJBException("bean class aroundInvoke was incorrectly called");
@@ -82,7 +82,7 @@
// overloaded version of interceptor-binding used in ejb-jar.xml to
// mark all methods with name cg as having interceptors C,G
public void cg() {
- System.out.println("in SlessEJB6:cg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:cg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -92,7 +92,7 @@
}
public void cg(int param1) {
- System.out.println("in SlessEJB6:cg(int). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:cg(int). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -102,7 +102,7 @@
}
public void cg(String param1, double param2) {
- System.out.println("in SlessEJB6:cg(String, double). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:cg(String, double). aroundInvokeCalled = " +
aroundInvokeCalled);
if( !aroundInvokeCalled ) {
@@ -112,11 +112,11 @@
}
- // Kind of like ag(), in that dg() is overloaded, but it's the
+ // Kind of like ag(), in that dg() is overloaded, but it's the
// signature that has a parameter that is assigned interceptors using
// @Interceptor.
public void dg() {
- System.out.println("in SlessEJB6:dg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:dg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( aroundInvokeCalled ) {
@@ -129,7 +129,7 @@
public void dg(int param1) {
System.out.println("in SlessEJB6:dg(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( !aroundInvokeCalled ) {
throw new EJBException("bean class aroundInvoke not called");
}
@@ -141,7 +141,7 @@
// Like dg(), except that dg(int param) is assigned its interceptor
// chain through ejb-jar.xml
public void eg() {
- System.out.println("in SlessEJB6:eg(). aroundInvokeCalled = " +
+ System.out.println("in SlessEJB6:eg(). aroundInvokeCalled = " +
aroundInvokeCalled);
if( aroundInvokeCalled ) {
@@ -153,15 +153,15 @@
public void eg(int param1) {
System.out.println("in SlessEJB6:eg(int param). " +
"aroundInvokeCalled = " + aroundInvokeCalled);
-
+
if( !aroundInvokeCalled ) {
throw new EJBException("bean class aroundInvoke not called");
}
aroundInvokeCalled = false;
}
-
+
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml
index 77ec3e9..ada25e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/build.xml
@@ -30,7 +30,7 @@
<target name="all">
<antcall target="bindings"/>
- <antcall target="session"/>
+ <antcall target="session"/>
<antcall target="inheritence"/>
<antcall target="mdb"/>
</target>
@@ -60,9 +60,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-interceptors tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-interceptors tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties
index ef0f4af..3fd98e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-session"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
+<property name="test.client"\u0020
- value="Client"/>
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -35,15 +35,15 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
+<property name="application-client.xml"\u0020
- value="descriptor/application-client.xml"/>
+ value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
+<property name="sun-application-client.xml"\u0020
- value="descriptor/sun-application-client.xml"/>
+ value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml
index 5368e66..17baaaa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/build.xml
@@ -50,7 +50,7 @@
</target>
-
+
<target name="compile" depends="clean">
@@ -74,21 +74,21 @@
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Exception.class,**/*Interceptor*.class,**/Dummy*.class,**/Sless*.class,**/Sful*.class,"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Exception.class,**/Client.class,**/Sful.class"/>
</antcall>
- </target>
+ </target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
@@ -104,13 +104,13 @@
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
index 4037f05..660a7df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
@@ -53,14 +53,14 @@
private static @EJB Sful sful9;
public void doTest() {
- doTest1();
- doTest2();
- doTest3();
- doTest4();
- doTest6();
- /** doTest7_8(); **/ // enable when we have passivation
- doTest9();
- doTest10();
+ doTest1();
+ doTest2();
+ doTest3();
+ doTest4();
+ doTest6();
+ /** doTest7_8(); **/ // enable when we have passivation
+ doTest9();
+ doTest10();
}
private void doTest1() {
@@ -68,9 +68,9 @@
System.out.println("invoking stateful");
sful.hello();
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
- System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
stat.addStatus("local test1" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -83,8 +83,8 @@
sful.throwAppException("XYZ");
stat.addStatus("local test2" , stat.FAIL);
} catch (AppException appEx) {
- System.out.println("Got expected AppException: " + appEx);
- stat.addStatus("local test2" , stat.PASS);
+ System.out.println("Got expected AppException: " + appEx);
+ stat.addStatus("local test2" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local test2" , stat.FAIL);
@@ -94,10 +94,10 @@
private void doTest3() {
try {
String result = sful.computeMid(4, 10);
- System.out.println("[Test3]: Got: " + result);
+ System.out.println("[Test3]: Got: " + result);
stat.addStatus("local test3" , stat.PASS);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got unexpected Exception: " + swapEx);
+ System.out.println("Got unexpected Exception: " + swapEx);
stat.addStatus("local test3" , stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
@@ -108,11 +108,11 @@
private void doTest4() {
try {
String result = sful.computeMid(23, 10);
- System.out.println("[Test4]: Got: " + result
- + " INSTEAD of SwapArgumentsException");
+ System.out.println("[Test4]: Got: " + result
+ + " INSTEAD of SwapArgumentsException");
stat.addStatus("local test4" , stat.FAIL);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got expected Exception: " + swapEx);
+ System.out.println("Got expected Exception: " + swapEx);
stat.addStatus("local test4" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -125,7 +125,7 @@
sful.eatException();
stat.addStatus("local test6" , stat.PASS);
} catch(Exception e) {
- System.out.println("Got unexpected Exception: " + e);
+ System.out.println("Got unexpected Exception: " + e);
e.printStackTrace();
stat.addStatus("local test6" , stat.FAIL);
}
@@ -133,30 +133,30 @@
private void doTest7_8() {
try {
- int sz = 20;
+ int sz = 20;
Context ctx = new InitialContext();
- sful.resetLifecycleCallbackCounters();
- Sful[] sfuls = new Sful[sz];
- for (int i=0; i<sz; i++) {
- sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
- int prevIndex = (i ==0) ? 0 : i-1;
- System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
- + sfuls[prevIndex].equals(sfuls[i]));
- sfuls[i].setID(i);
+ sful.resetLifecycleCallbackCounters();
+ Sful[] sfuls = new Sful[sz];
+ for (int i=0; i<sz; i++) {
+ sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
+ int prevIndex = (i ==0) ? 0 : i-1;
+ System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
+ + sfuls[prevIndex].equals(sfuls[i]));
+ sfuls[i].setID(i);
sfuls[i].getCount();
- }
- sleepFor(10);
- for (int i=0; i<sz; i++) {
- sfuls[i].getCount();
- }
- int passivationCount = sful.getPrePassivateCallbackCount();
- int activationCount = sful.getPostActivateCallbackCount();
+ }
+ sleepFor(10);
+ for (int i=0; i<sz; i++) {
+ sfuls[i].getCount();
+ }
+ int passivationCount = sful.getPrePassivateCallbackCount();
+ int activationCount = sful.getPostActivateCallbackCount();
boolean status = (passivationCount > 0) && (activationCount> 0);
System.out.println("passivation: " + passivationCount + "; "
- + "activation: " + activationCount);
+ + "activation: " + activationCount);
stat.addStatus("local test7" ,
- (status == true) ? stat.PASS : stat.FAIL);
+ (status == true) ? stat.PASS : stat.FAIL);
boolean stateRestored = true;
for (int i=0; i<sz; i++) {
@@ -175,40 +175,40 @@
}
public void doTest9() {
- try {
- sful.isInterceptorCallCounOK();
- sful.isInterceptorCallCounOK();
- sful.isInterceptorCallCounOK();
- sful.isInterceptorCallCounOK();
- String resultStr = sful.isInterceptorCallCounOK();
- boolean result = "true true true true".equals(resultStr);
- stat.addStatus("local test9 " + resultStr ,
- (result) ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
- stat.addStatus("local test9" , stat.FAIL);
- }
- }
+ try {
+ sful.isInterceptorCallCounOK();
+ sful.isInterceptorCallCounOK();
+ sful.isInterceptorCallCounOK();
+ sful.isInterceptorCallCounOK();
+ String resultStr = sful.isInterceptorCallCounOK();
+ boolean result = "true true true true".equals(resultStr);
+ stat.addStatus("local test9 " + resultStr ,
+ (result) ? stat.PASS : stat.FAIL);
+ } catch (Exception ex) {
+ stat.addStatus("local test9" , stat.FAIL);
+ }
+ }
public void doTest10() {
- try {
- String resultStr = sful.isPostConstructCallCounOK();
- boolean result = "true true true true".equals(resultStr);
- stat.addStatus("local test10 " + resultStr ,
- (result) ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
- stat.addStatus("local test10" , stat.FAIL);
- }
- }
+ try {
+ String resultStr = sful.isPostConstructCallCounOK();
+ boolean result = "true true true true".equals(resultStr);
+ stat.addStatus("local test10 " + resultStr ,
+ (result) ? stat.PASS : stat.FAIL);
+ } catch (Exception ex) {
+ stat.addStatus("local test10" , stat.FAIL);
+ }
+ }
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try {
- System.out.println("" + seconds + " left...");
- Thread.currentThread().sleep(1000);
- } catch (InterruptedException inEx) {
- }
- }
+ while (seconds-- > 0) {
+ try {
+ System.out.println("" + seconds + " left...");
+ Thread.currentThread().sleep(1000);
+ } catch (InterruptedException inEx) {
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml
index 9bc87c7..c0b7e7c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>SfulEJB</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>2</resize-quantity>
+ <resize-quantity>2</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
index c3a08d6..ae08967 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
@@ -26,7 +26,7 @@
import jakarta.ejb.PostActivate;
public class BaseInterceptor
- implements java.io.Serializable {
+ implements java.io.Serializable {
protected static final String BASE_INTERCEPTOR_NAME = "BaseInterceptor";
@@ -41,9 +41,9 @@
@PostConstruct
private void basePostConstruct(InvocationContext ctx)
- throws RuntimeException {
- postConstructList = new ArrayList<String>();
- postConstructList.add(BASE_INTERCEPTOR_NAME);
+ throws RuntimeException {
+ postConstructList = new ArrayList<String>();
+ postConstructList.add(BASE_INTERCEPTOR_NAME);
ctx.getContextData().put(getName(), this);
basePCCount++;
System.out.println("GGGG: @PostConstruct for: " + this.getClass().getName());
@@ -59,24 +59,24 @@
@AroundInvoke
public Object baseAroundInvoke(InvocationContext ctx)
- throws Exception
+ throws Exception
{
- aroundInvokeList = new ArrayList<String>();
- aroundInvokeList.add(BASE_INTERCEPTOR_NAME);
- ctx.getContextData().put(getName(), this);
- baseAICount++;
- return ctx.proceed();
+ aroundInvokeList = new ArrayList<String>();
+ aroundInvokeList.add(BASE_INTERCEPTOR_NAME);
+ ctx.getContextData().put(getName(), this);
+ baseAICount++;
+ return ctx.proceed();
}
@PrePassivate
public void prePassivate(InvocationContext ctx) {
- prePassivateCount++;
- }
+ prePassivateCount++;
+ }
@PostActivate
public void postActivate(InvocationContext ctx) {
- postActivateCount++;
- }
+ postActivateCount++;
+ }
String getName() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
index eba31f3..9a9b7dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
@@ -30,7 +30,7 @@
@PostConstruct
protected void overridablePostConstructMethod(InvocationContext ctx)
- throws RuntimeException {
+ throws RuntimeException {
postConstructList.add(LEVEL2_INTERCEPTOR_NAME);
baseLevel2PCCount++;
try {
@@ -44,8 +44,8 @@
@AroundInvoke
protected Object overridableAroundInvokeMethod(InvocationContext ctx)
- throws Throwable {
- aroundInvokeList.add(LEVEL2_INTERCEPTOR_NAME);
+ throws Throwable {
+ aroundInvokeList.add(LEVEL2_INTERCEPTOR_NAME);
baseLevel2AICount++;
return ctx.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
index f8f77cf..48ec2f2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
@@ -25,7 +25,7 @@
import jakarta.ejb.SessionContext;
public class BaseLifecycleInterceptor
- implements java.io.Serializable {
+ implements java.io.Serializable {
protected int basePrePassivateCount = 0;
protected int basePostActivateCount = 0;
@@ -36,12 +36,12 @@
@PrePassivate
private void prePassivate(InvocationContext ctx) {
- basePrePassivateCount++;
+ basePrePassivateCount++;
}
@PostActivate
private void postActivate(InvocationContext ctx) {
- basePostActivateCount++;
+ basePostActivateCount++;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
index 6545c6a..55a49b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
@@ -32,7 +32,7 @@
@PostConstruct
private void distinctPostConstruct(InvocationContext ctx) throws RuntimeException {
- postConstructList.add(DISTINCT_INTERCEPTOR_NAME);
+ postConstructList.add(DISTINCT_INTERCEPTOR_NAME);
distinctPCCount++;
try {
ctx.proceed();
@@ -46,7 +46,7 @@
@AroundInvoke
private Object distinctMethodInterceptor(InvocationContext ctx)
throws Throwable {
- aroundInvokeList.add(DISTINCT_INTERCEPTOR_NAME);
+ aroundInvokeList.add(DISTINCT_INTERCEPTOR_NAME);
distinctAICount++;
return ctx.proceed();
}
@@ -54,29 +54,29 @@
protected boolean isAICountOK() {
return (distinctAICount == baseAICount)
&& (distinctAICount == baseLevel2AICount)
- && checkForCorrectSequence(aroundInvokeList);
- }
+ && checkForCorrectSequence(aroundInvokeList);
+ }
protected boolean isPostConstructCallCounOK() {
return (distinctPCCount == basePCCount)
&& (distinctPCCount == baseLevel2PCCount)
- && checkForCorrectSequence(postConstructList);
+ && checkForCorrectSequence(postConstructList);
}
private boolean checkForCorrectSequence(List<String> list) {
- boolean result = list.size() == 3;
- if (result) {
- BASE_INTERCEPTOR_NAME.equals(list.get(0));
- LEVEL2_INTERCEPTOR_NAME.equals(list.get(1));
- DISTINCT_INTERCEPTOR_NAME.equals(list.get(2));
- }
+ boolean result = list.size() == 3;
+ if (result) {
+ BASE_INTERCEPTOR_NAME.equals(list.get(0));
+ LEVEL2_INTERCEPTOR_NAME.equals(list.get(1));
+ DISTINCT_INTERCEPTOR_NAME.equals(list.get(2));
+ }
- for(String str : list) {
- System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + str);
- }
- System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + result);
+ for(String str : list) {
+ System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + str);
+ }
+ System.out.println("**DISTINCT_INTERCEPTOR_TEST**: " + result);
- return result;
+ return result;
}
String getName() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java
index d246932..8884459 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Dummy.java
@@ -28,11 +28,11 @@
- public String isInterceptorCallCounOK();
+ public String isInterceptorCallCounOK();
- public String isPostConstructCallCounOK();
+ public String isPostConstructCallCounOK();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
index 524e27a..b447e34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
@@ -34,22 +34,22 @@
protected int dummyBaseAICount = 0;
protected int dummyBaseEJBPostConstructCount = 0;
- @AroundInvoke
- private Object dummyBaseAroundInvoke(InvocationContext ctx)
- throws Exception {
- aroundInvokeList = new ArrayList<String>();
- aroundInvokeList.add("DummyBaseEJB");
- dummyBaseAICount++;
- return ctx.proceed();
- }
+ @AroundInvoke
+ private Object dummyBaseAroundInvoke(InvocationContext ctx)
+ throws Exception {
+ aroundInvokeList = new ArrayList<String>();
+ aroundInvokeList.add("DummyBaseEJB");
+ dummyBaseAICount++;
+ return ctx.proceed();
+ }
- @PostConstruct
+ @PostConstruct
private void dummyBasePostConstruct() {
- postConstructList = new ArrayList<String>();
- postConstructList.add("DummyBaseEJB");
- dummyBaseEJBPostConstructCount++;
- System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
- }
+ postConstructList = new ArrayList<String>();
+ postConstructList.add("DummyBaseEJB");
+ dummyBaseEJBPostConstructCount++;
+ System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
index f6e2804..afb58f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
@@ -24,14 +24,14 @@
import jakarta.annotation.PostConstruct;
@Interceptors({
- com.sun.s1asdev.ejb.ejb30.interceptors.session.OverridingMethodsInterceptor.class,
- com.sun.s1asdev.ejb.ejb30.interceptors.session.DistinctMethodsInterceptor.class
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.OverridingMethodsInterceptor.class,
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.DistinctMethodsInterceptor.class
})
@Stateless
public class DummyEJB
- extends DummyLevel2EJB
- implements Dummy
+ extends DummyLevel2EJB
+ implements Dummy
{
int interceptorId;
private boolean createCalled = false;
@@ -47,13 +47,13 @@
@PostConstruct
protected void overridablePostConstruct()
{
- postConstructList.add("DummyEJB");
+ postConstructList.add("DummyEJB");
createCalled = true;
dummyEJBPostConstructCount++;
}
public String dummy() {
- return "Dummy!!";
+ return "Dummy!!";
}
public void setInterceptorId(int val) {
@@ -66,63 +66,63 @@
public String isInterceptorCallCounOK() {
- boolean beanAIResult = (beanAICount == dummyBaseAICount)
- && (beanAICount == dummyLevel2AICount)
- && checkAroundInvokeSequence();
+ boolean beanAIResult = (beanAICount == dummyBaseAICount)
+ && (beanAICount == dummyLevel2AICount)
+ && checkAroundInvokeSequence();
- return "" + distinctInterceptor.isAICountOK()
- + " " + overridingInterceptor.isAICountOK()
- + " " + beanAIResult
- + " " + checkAroundInvokeSequence();
- }
+ return "" + distinctInterceptor.isAICountOK()
+ + " " + overridingInterceptor.isAICountOK()
+ + " " + beanAIResult
+ + " " + checkAroundInvokeSequence();
+ }
public String isPostConstructCallCounOK() {
- boolean beanPCCountResult = (dummyEJBPostConstructCount == dummyBaseEJBPostConstructCount)
- && (dummyLevel2EJBPostConstructCount == 0)
- && checkPostConstructSequence();
+ boolean beanPCCountResult = (dummyEJBPostConstructCount == dummyBaseEJBPostConstructCount)
+ && (dummyLevel2EJBPostConstructCount == 0)
+ && checkPostConstructSequence();
- return "" + distinctInterceptor.isPostConstructCallCounOK()
- + " " + overridingInterceptor.isPostConstructCallCounOK()
- + " " + beanPCCountResult
- + " " + checkPostConstructSequence();
- }
+ return "" + distinctInterceptor.isPostConstructCallCounOK()
+ + " " + overridingInterceptor.isPostConstructCallCounOK()
+ + " " + beanPCCountResult
+ + " " + checkPostConstructSequence();
+ }
@AroundInvoke
Object myOwnAroundInvoke(InvocationContext ctx)
throws Exception {
- aroundInvokeList.add("DummyEJB");
- if (distinctInterceptor == null) {
- distinctInterceptor = (DistinctMethodsInterceptor)
- ctx.getContextData().get(distinctAIName);
- overridingInterceptor = (OverridingMethodsInterceptor)
- ctx.getContextData().get(overridingAIName);
- }
+ aroundInvokeList.add("DummyEJB");
+ if (distinctInterceptor == null) {
+ distinctInterceptor = (DistinctMethodsInterceptor)
+ ctx.getContextData().get(distinctAIName);
+ overridingInterceptor = (OverridingMethodsInterceptor)
+ ctx.getContextData().get(overridingAIName);
+ }
- beanAICount++;
+ beanAICount++;
return ctx.proceed();
}
private boolean checkPostConstructSequence() {
- boolean result = postConstructList.size() == 2;
- if (result) {
- "DummyBaseEJB".equals(postConstructList.get(0));
- "DummyEJB".equals(postConstructList.get(1));
- }
+ boolean result = postConstructList.size() == 2;
+ if (result) {
+ "DummyBaseEJB".equals(postConstructList.get(0));
+ "DummyEJB".equals(postConstructList.get(1));
+ }
- return result;
+ return result;
}
private boolean checkAroundInvokeSequence() {
- boolean result = aroundInvokeList.size() == 3;
- if (result) {
- "DummyBaseEJB".equals(aroundInvokeList.get(0));
- "DummyLevel2EJB".equals(aroundInvokeList.get(1));
- "DummyEJB".equals(aroundInvokeList.get(2));
- }
+ boolean result = aroundInvokeList.size() == 3;
+ if (result) {
+ "DummyBaseEJB".equals(aroundInvokeList.get(0));
+ "DummyLevel2EJB".equals(aroundInvokeList.get(1));
+ "DummyEJB".equals(aroundInvokeList.get(2));
+ }
- return result;
+ return result;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
index 199a132..a4fc622 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
@@ -25,24 +25,24 @@
public class DummyLevel2EJB
- extends DummyBaseEJB
+ extends DummyBaseEJB
{
protected int dummyLevel2AICount = 0;
- protected int dummyLevel2EJBPostConstructCount = 0;
+ protected int dummyLevel2EJBPostConstructCount = 0;
- @PostConstruct
+ @PostConstruct
protected void overridablePostConstruct() {
- postConstructList.add("DummyLevel2EJB");
- dummyLevel2EJBPostConstructCount++;
- System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
- }
+ postConstructList.add("DummyLevel2EJB");
+ dummyLevel2EJBPostConstructCount++;
+ System.out.println("GGGG: DummyLevel2EJB.postConstruct ");
+ }
- @AroundInvoke
- protected Object overridableAroundInvoke(InvocationContext ctx)
- throws Exception {
- aroundInvokeList.add("DummyLevel2EJB");
- dummyLevel2AICount++;
- return ctx.proceed();
- }
+ @AroundInvoke
+ protected Object overridableAroundInvoke(InvocationContext ctx)
+ throws Exception {
+ aroundInvokeList.add("DummyLevel2EJB");
+ dummyLevel2AICount++;
+ return ctx.proceed();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
index 0421ece..fca97fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
@@ -42,7 +42,7 @@
private static int postActivateCallbackCount = 0;
-
+
private int interceptorID;
@@ -60,7 +60,7 @@
void prePassivate(InvocationContext ctx) {
- prePassivateCallbackCount++;
+ prePassivateCallbackCount++;
}
@@ -70,7 +70,7 @@
private void postActivate(InvocationContext ctx) {
- postActivateCallbackCount++;
+ postActivateCallbackCount++;
}
@@ -80,7 +80,7 @@
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
if (ctx.getMethod().getName().equals("setID")) {
@@ -104,7 +104,7 @@
public static void resetLifecycleCallbackCounters() {
- prePassivateCallbackCount = postActivateCallbackCount = 0;
+ prePassivateCallbackCount = postActivateCallbackCount = 0;
}
@@ -112,7 +112,7 @@
public static int getPrePassivateCallbackCount() {
- return prePassivateCallbackCount;
+ return prePassivateCallbackCount;
}
@@ -120,11 +120,11 @@
public static int getPostActivateCallbackCount() {
- return postActivateCallbackCount;
+ return postActivateCallbackCount;
}
-
+
@@ -136,7 +136,7 @@
}
-
+
int getInterceptorID() {
@@ -144,17 +144,17 @@
}
-
+
boolean checkInterceptorID(int val) {
- return (val == interceptorID) &&
+ return (val == interceptorID) &&
(computedInterceptorID == 2 * val + 1);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
index f5f8bf3..2dcb167 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
@@ -24,7 +24,7 @@
import jakarta.annotation.PostConstruct;
public class OverridingMethodsInterceptor
- extends BaseLevel2Interceptor {
+ extends BaseLevel2Interceptor {
protected static final String OVERRIDING_INTERCEPTOR_NAME = "OverridingInterceptor";
@@ -34,7 +34,7 @@
@PostConstruct
protected void overridablePostConstructMethod(InvocationContext ctx)
- throws RuntimeException {
+ throws RuntimeException {
postConstructList.add(OVERRIDING_INTERCEPTOR_NAME);
pcCount++;
try {
@@ -49,38 +49,38 @@
@AroundInvoke
protected Object overridableAroundInvokeMethod(InvocationContext ctx)
- throws Throwable
+ throws Throwable
{
- aroundInvokeList.add(OVERRIDING_INTERCEPTOR_NAME);
+ aroundInvokeList.add(OVERRIDING_INTERCEPTOR_NAME);
aiCount++;
return ctx.proceed();
}
protected boolean isAICountOK() {
- return (0 == baseLevel2AICount)
- && (aiCount == baseAICount)
- && checkForCorrectSequence(aroundInvokeList);
- }
+ return (0 == baseLevel2AICount)
+ && (aiCount == baseAICount)
+ && checkForCorrectSequence(aroundInvokeList);
+ }
- protected boolean isPostConstructCallCounOK() {
- return (pcCount == basePCCount)
- && (baseLevel2PCCount == 0)
- && checkForCorrectSequence(postConstructList);
- }
+ protected boolean isPostConstructCallCounOK() {
+ return (pcCount == basePCCount)
+ && (baseLevel2PCCount == 0)
+ && checkForCorrectSequence(postConstructList);
+ }
private boolean checkForCorrectSequence(List<String> list) {
- boolean result = list.size() == 2;
- if (result) {
- BASE_INTERCEPTOR_NAME.equals(list.get(0));
- OVERRIDING_INTERCEPTOR_NAME.equals(list.get(1));
- }
- for(String str : list) {
- System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + str);
- }
- System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + result);
+ boolean result = list.size() == 2;
+ if (result) {
+ BASE_INTERCEPTOR_NAME.equals(list.get(0));
+ OVERRIDING_INTERCEPTOR_NAME.equals(list.get(1));
+ }
+ for(String str : list) {
+ System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + str);
+ }
+ System.out.println("**OVERRIDING_INTERCEPTOR_TEST**: " + result);
- return result;
+ return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
index d03bf26..ec704a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
@@ -42,13 +42,13 @@
public String computeMid(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
public String callDummy()
- throws Exception;
+ throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
index cbefc15..8f213e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
@@ -38,11 +38,11 @@
@Interceptors({
- LifecycleCallbackInterceptor.class,
+ LifecycleCallbackInterceptor.class,
- BaseLifecycleInterceptor.class
+ BaseLifecycleInterceptor.class
- })
+ })
public class SfulEJB implements Sful
@@ -80,13 +80,13 @@
private Object interceptCall(InvocationContext ctx)
- throws Exception
+ throws Exception
{
- System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
- count++;
+ count++;
try {
@@ -112,7 +112,7 @@
public int getCount() {
- return count;
+ return count;
}
@@ -132,15 +132,15 @@
public String computeMid(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- return sless.sayHello()
+ return sless.sayHello()
- + ", Midpoint of " + min + ", " + max + "; "
+ + ", Midpoint of " + min + ", " + max + "; "
- + sless.computeMidPoint(min, max);
+ + sless.computeMidPoint(min, max);
}
@@ -148,11 +148,11 @@
public String callDummy()
- throws Exception
+ throws Exception
{
- return dummy.dummy();
+ return dummy.dummy();
}
@@ -174,7 +174,7 @@
public int getPrePassivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
}
@@ -182,7 +182,7 @@
public int getPostActivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
}
@@ -190,7 +190,7 @@
public void resetLifecycleCallbackCounters() {
- LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
+ LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
}
@@ -218,51 +218,51 @@
{
- try {
+ try {
- return dummy.isInterceptorCallCounOK();
+ return dummy.isInterceptorCallCounOK();
- } catch (Exception ex) {
+ } catch (Exception ex) {
- System.out.println("*********");
+ System.out.println("*********");
- ex.printStackTrace();
+ ex.printStackTrace();
- System.out.println("*********");
+ System.out.println("*********");
- }
+ }
- return null;
+ return null;
- }
+ }
- public String isPostConstructCallCounOK()
+ public String isPostConstructCallCounOK()
- {
+ {
- try {
+ try {
- return dummy.isPostConstructCallCounOK();
+ return dummy.isPostConstructCallCounOK();
- } catch (Exception ex) {
+ } catch (Exception ex) {
- System.out.println("*********");
+ System.out.println("*********");
- ex.printStackTrace();
+ ex.printStackTrace();
- System.out.println("*********");
+ System.out.println("*********");
- }
+ }
- return null;
+ return null;
- }
+ }
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
index a2ab35a..5f98465 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
@@ -34,7 +34,7 @@
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
index 3304b90..4efd526 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
@@ -30,13 +30,13 @@
public class SlessEJB
- implements Sless
+ implements Sless
{
public String sayHello() {
- return "Hello";
+ return "Hello";
}
@@ -44,17 +44,17 @@
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- if (min > max) {
+ if (min > max) {
- throw new SwapArgumentsException("("+min+", "+max+")");
+ throw new SwapArgumentsException("("+min+", "+max+")");
- }
+ }
- return (min*1.0+max)/2.0;
+ return (min*1.0+max)/2.0;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
index ee21ea7..a3a9d56 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
@@ -27,7 +27,7 @@
private static @EJB Sless sless;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,23 +36,23 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-interceptors-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
System.out.println("invoking sless");
String result1 = sless.concatAndReverse("<One>", "<Two>");
String result2 = sless.concatAndReverse("<One>", "Null");
String result3 = sless.concatAndReverse("nuLL", "Null");
- System.out.println("Got : " + result1);
- System.out.println("Got : " + result2);
- System.out.println("Got : " + result3);
+ System.out.println("Got : " + result1);
+ System.out.println("Got : " + result2);
+ System.out.println("Got : " + result3);
- System.out.println("Got : " + sless.plus((byte) 2, (short) 3, 4));
- System.out.println("Got : " + sless.isGreaterShort(new Short((short) 5), new Long(7)));
+ System.out.println("Got : " + sless.plus((byte) 2, (short) 3, 4));
+ System.out.println("Got : " + sless.isGreaterShort(new Short((short) 5), new Long(7)));
stat.addStatus("local test1" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
index 0c75a35..5295f08 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
@@ -25,7 +25,7 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws MyBadException, Exception
+ throws MyBadException, Exception
{
Method method = ctx.getMethod();
String methodName = method.getName();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
index c905417..7a1fec8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
@@ -22,10 +22,10 @@
@Stateless
public class SlessEJB
- implements Sless
+ implements Sless
{
public String sayHello() {
- return "Hello";
+ return "Hello";
}
@Interceptors(ArgumentsVerifier.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties
index 724976e..ea5dfc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml
index fd8cab0..233b8c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class,**/*Hello*,**/*Interceptor*" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
index 2b7cd66..86a0450 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
@@ -52,7 +52,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -62,10 +62,10 @@
try {
setup();
if (doTest("java:comp/env/jms/MsgBeanQueue", numMessages)) {
- stat.addStatus("cmt main", stat.PASS);
- } else {
- stat.addStatus("cmt main", stat.FAIL);
- }
+ stat.addStatus("cmt main", stat.PASS);
+ } else {
+ stat.addStatus("cmt main", stat.FAIL);
+ }
} catch(Throwable t) {
stat.addStatus("cmt main", stat.FAIL);
t.printStackTrace();
@@ -76,18 +76,18 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/FooCF");
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
clientQueue = (jakarta.jms.Queue)
context.lookup("java:comp/env/jms/MsgBeanClientQueue");
@@ -108,18 +108,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public boolean doTest(String destName, int num)
+ public boolean doTest(String destName, int num)
throws Exception {
Destination dest = (Destination) context.lookup(destName);
@@ -133,9 +133,9 @@
System.out.println("Waiting for queue message");
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- String receivedMsg = ((TextMessage)recvdmessage).getText();
+ String receivedMsg = ((TextMessage)recvdmessage).getText();
System.out.println("Received message : " + receivedMsg);
- return receivedMsg.equals("mdb() invoked. Interceptor count: 1");
+ return receivedMsg.equals("mdb() invoked. Interceptor count: 1");
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
throw new JMSException("timeout" + TIMEOUT + " seconds");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
index a754cc8..c3fe88b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
@@ -24,16 +24,16 @@
private static int interceptorCount = 0 ;
static int getCount() {
- return interceptorCount;
+ return interceptorCount;
}
@AroundInvoke
public Object intercept(InvocationContext inv)
- throws Exception
+ throws Exception
{
- System.out.println("[mdb] Interceptor invoked...");
- interceptorCount++;
- return inv.proceed();
+ System.out.println("[mdb] Interceptor invoked...");
+ interceptorCount++;
+ return inv.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java
index 3094bfd..4e84a97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
index 236d28a..b338f58 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
@@ -37,7 +37,7 @@
msg);
}
@PreDestroy public void myPreDestroyMethod() {
- System.out.println("PRE-DESTROY callback received in " + msg);
+ System.out.println("PRE-DESTROY callback received in " + msg);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
index b4de9ed..7b426fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
@@ -50,7 +50,7 @@
QueueConnection connection = null;
try {
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
System.out.println("Calling hello2 stateful bean");
@@ -75,7 +75,7 @@
QueueSender sender = session.createSender(queue);
TextMessage tmessage = session.createTextMessage();
tmessage.setText("mdb() invoked. Interceptor count: "
- + BaseInterceptor.getCount());
+ + BaseInterceptor.getCount());
System.out.println("Sending message");
sender.send(tmessage);
System.out.println("message sent");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties
index 3018ec7..e2ca75c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-interceptors-session"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml
index 617dc97..3eeaa1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Exception.class,**/*Interceptor*.class,**/Dummy*.class,**/Sless*.class,**/Sful*.class,**/*Foo.class, **/Bar*.class,**/ArgumentsVerifier.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/*Exception.class,**/AssertionFailedException.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
index 3884711..c02facc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -34,11 +34,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-interceptors-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sful sful;
private static @EJB Sful sful0;
@@ -53,14 +53,14 @@
private static @EJB Sful sful9;
public void doTest() {
- doTest1();
- doTest2();
- doTest3();
- doTest4();
- doTest5();
- doTest6();
+ doTest1();
+ doTest2();
+ doTest3();
+ doTest4();
+ doTest5();
+ doTest6();
- doTest7_8();
+ doTest7_8();
doTest9();
doTest10();
@@ -71,9 +71,9 @@
System.out.println("invoking stateful");
sful.hello();
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
- System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
- System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
+ System.out.println("+++++ InterceptorCallCount: " + sful.getCount());
+ System.out.println("+++++++++++++++++++++++++++++++++++++++");
stat.addStatus("local test1" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -86,8 +86,8 @@
sful.throwAppException("XYZ");
stat.addStatus("local test2" , stat.FAIL);
} catch (AppException appEx) {
- System.out.println("Got expected AppException: " + appEx);
- stat.addStatus("local test2" , stat.PASS);
+ System.out.println("Got expected AppException: " + appEx);
+ stat.addStatus("local test2" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local test2" , stat.FAIL);
@@ -97,10 +97,10 @@
private void doTest3() {
try {
String result = sful.computeMid(4, 10);
- System.out.println("[Test3]: Got: " + result);
+ System.out.println("[Test3]: Got: " + result);
stat.addStatus("local test3" , stat.PASS);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got unexpected Exception: " + swapEx);
+ System.out.println("Got unexpected Exception: " + swapEx);
stat.addStatus("local test3" , stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
@@ -111,11 +111,11 @@
private void doTest4() {
try {
String result = sful.computeMid(23, 10);
- System.out.println("[Test4]: Got: " + result
- + " INSTEAD of SwapArgumentsException");
+ System.out.println("[Test4]: Got: " + result
+ + " INSTEAD of SwapArgumentsException");
stat.addStatus("local test4" , stat.FAIL);
} catch (SwapArgumentsException swapEx) {
- System.out.println("Got expected Exception: " + swapEx);
+ System.out.println("Got expected Exception: " + swapEx);
stat.addStatus("local test4" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -126,11 +126,11 @@
private void doTest5() {
try {
String result = sful.callDummy();
- System.out.println("[Test5]: Got: " + result
- + " INSTEAD of CallBlockedException");
+ System.out.println("[Test5]: Got: " + result
+ + " INSTEAD of CallBlockedException");
stat.addStatus("local test5" , stat.FAIL);
} catch (CallBlockedException callBlkEx) {
- System.out.println("Got expected Exception: " + callBlkEx);
+ System.out.println("Got expected Exception: " + callBlkEx);
stat.addStatus("local test5" , stat.PASS);
} catch(Exception e) {
e.printStackTrace();
@@ -143,7 +143,7 @@
sful.eatException();
stat.addStatus("local test6" , stat.PASS);
} catch(Exception e) {
- System.out.println("Got unexpected Exception: " + e);
+ System.out.println("Got unexpected Exception: " + e);
e.printStackTrace();
stat.addStatus("local test6" , stat.FAIL);
}
@@ -151,40 +151,40 @@
private void doTest7_8() {
try {
- int sz = 20;
+ int sz = 20;
Context ctx = new InitialContext();
- sful.resetLifecycleCallbackCounters();
- Sful[] sfuls = new Sful[sz];
- for (int i=0; i<sz; i++) {
- sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
- int prevIndex = (i ==0) ? 0 : i-1;
- System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
- + sfuls[prevIndex].equals(sfuls[i]));
- sfuls[i].setID(i);
+ sful.resetLifecycleCallbackCounters();
+ Sful[] sfuls = new Sful[sz];
+ for (int i=0; i<sz; i++) {
+ sfuls[i] = (Sful) ctx.lookup("com.sun.s1asdev.ejb.ejb30.interceptors.session.Sful");
+ int prevIndex = (i ==0) ? 0 : i-1;
+ System.out.println("Created sful["+i+"]: " + sfuls[i] + " ==> "
+ + sfuls[prevIndex].equals(sfuls[i]));
+ sfuls[i].setID(i);
sfuls[i].getCount();
- }
- sleepFor(10);
- for (int i=0; i<sz; i++) {
- sfuls[i].getCount();
- }
- int passivationCount = sful.getPrePassivateCallbackCount();
- int activationCount = sful.getPostActivateCallbackCount();
-
+ }
+ sleepFor(10);
+ for (int i=0; i<sz; i++) {
+ sfuls[i].getCount();
+ }
+ int passivationCount = sful.getPrePassivateCallbackCount();
+ int activationCount = sful.getPostActivateCallbackCount();
+
boolean status = (passivationCount > 0) && (activationCount> 0);
System.out.println("passivation: " + passivationCount + "; "
- + "activation: " + activationCount);
- stat.addStatus("local test7" ,
- (status == true) ? stat.PASS : stat.FAIL);
-
+ + "activation: " + activationCount);
+ stat.addStatus("local test7" ,
+ (status == true) ? stat.PASS : stat.FAIL);
+
boolean stateRestored = true;
for (int i=0; i<sz; i++) {
boolean ok = sfuls[i].isStateRestored();
System.out.println("stateRestored[" + i + "]:" + ok);
stateRestored = ok && status;
}
- stat.addStatus("local test8" ,
+ stat.addStatus("local test8" ,
(stateRestored == true) ? stat.PASS : stat.FAIL);
-
+
} catch(Exception e) {
System.out.println("Got unexpected Exception: " + e);
e.printStackTrace();
@@ -199,7 +199,7 @@
System.out.println("Test[" + testName + "]: " + map.get(testName));
checkSetParamsStatus = checkSetParamsStatus && map.get(testName);
}
- stat.addStatus("local test9" ,
+ stat.addStatus("local test9" ,
(checkSetParamsStatus == true) ? stat.PASS : stat.FAIL);
}
@@ -221,18 +221,18 @@
failedCountStatus = false;
}
- stat.addStatus("local test10 " + trueStatus + " : " + sful.getAssertionFailedCount() ,
+ stat.addStatus("local test10 " + trueStatus + " : " + sful.getAssertionFailedCount() ,
((trueStatus && failedCountStatus) == true) ? stat.PASS : stat.FAIL);
}
private static void sleepFor(int seconds) {
- while (seconds-- > 0) {
- try {
- System.out.println("" + seconds + " left...");
- Thread.currentThread().sleep(1000);
- } catch (InterruptedException inEx) {
- }
- }
+ while (seconds-- > 0) {
+ try {
+ System.out.println("" + seconds + " left...");
+ Thread.currentThread().sleep(1000);
+ } catch (InterruptedException inEx) {
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml
index 9bc87c7..c0b7e7c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>SfulEJB</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>2</resize-quantity>
+ <resize-quantity>2</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
index efa2f8d..8052ed0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
@@ -25,7 +25,7 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws MyBadException, Exception
+ throws MyBadException, Exception
{
Method method = ctx.getMethod();
String methodName = method.getName();
@@ -51,7 +51,7 @@
params[0] = new Long(45);
} else if (methodName.equals("objectArgs")) {
params = new Object[0];
- }
+ }
try {
ctx.setParameters(params);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
index b0a93ea..d2ecde7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
@@ -44,11 +44,11 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws Exception
+ throws Exception
{
Object result = null;
- boolean setId = false;
- baseCount++;
+ boolean setId = false;
+ baseCount++;
if (ctx.getMethod().getName().equals("setInterceptorId")) {
java.util.Map map = ctx.getContextData();
map.put("BaseInterceptor", this);
@@ -65,26 +65,26 @@
}
public static int getInvocationCount() {
- return baseCount;
+ return baseCount;
}
-
+
@PrePassivate
public void prePassivate(InvocationContext ctx) {
- prePassivateCount++;
- System.out.println("prePassivateCount: " + prePassivateCount);
+ prePassivateCount++;
+ System.out.println("prePassivateCount: " + prePassivateCount);
}
@PostActivate
public void postActivate(InvocationContext ctx) {
- postActivateCount++;
- System.out.println("postActivateCount: " + postActivateCount);
+ postActivateCount++;
+ System.out.println("postActivateCount: " + postActivateCount);
}
-
+
//Some package private methods to check state
void setInterceptorID(int val) {
this.interceptorID = val;
}
-
+
int getInterceptorID() {
boolean valid = (computedInterceptorID == interceptorID * 2 + 1);
if (! valid) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
index e480182..dfaae8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
@@ -29,7 +29,7 @@
private void afterCreation(InvocationContext ctx) {
String value = (String) ctx.getContextData().get("PostConstruct");
- System.out.println("In BlockingInterceptor.afterCreation value = "
+ System.out.println("In BlockingInterceptor.afterCreation value = "
+ value);
if(value == null) {
throw new IllegalStateException("BaseInterceptor.PostConstruct " +
@@ -44,12 +44,12 @@
@AroundInvoke
private Object interceptCall(InvocationContext ctx)
- throws CallBlockedException
+ throws CallBlockedException
{
- System.out.println("[test.BlockingInterceptor @AroundInvoke]: " + ctx.getMethod());
- blockCount++;
- throw new CallBlockedException("Call blocked");
+ System.out.println("[test.BlockingInterceptor @AroundInvoke]: " + ctx.getMethod());
+ blockCount++;
+ throw new CallBlockedException("Call blocked");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java
index f44746d..d486192 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Dummy.java
@@ -20,7 +20,7 @@
public interface Dummy
{
public String dummy()
- throws CallBlockedException;
+ throws CallBlockedException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
index 826e81d..a3d4474 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
@@ -24,17 +24,17 @@
import jakarta.annotation.PostConstruct;
@Interceptors({
- com.sun.s1asdev.ejb.ejb30.interceptors.session.BaseInterceptor.class,
- com.sun.s1asdev.ejb.ejb30.interceptors.session.BlockingInterceptor.class
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.BaseInterceptor.class,
+ com.sun.s1asdev.ejb.ejb30.interceptors.session.BlockingInterceptor.class
})
@Stateless
public class DummyEJB
- implements Dummy
+ implements Dummy
{
int interceptorId;
private boolean createCalled = false;
-
+
@PostConstruct
private void afterCreate()
{
@@ -43,9 +43,9 @@
}
public String dummy()
- throws CallBlockedException
+ throws CallBlockedException
{
- return "Dummy!!";
+ return "Dummy!!";
}
public void setInterceptorId(int val) {
@@ -55,10 +55,10 @@
this.interceptorId = val;
}
-
+
@AroundInvoke
private Object interceptCall(InvocationContext ctx)
- throws Exception {
+ throws Exception {
return ctx.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
index 38338af..a939716 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
@@ -32,11 +32,11 @@
@AroundInvoke
public Object interceptCall(InvocationContext ctx)
- throws MyBadException, AssertionFailedException, Exception
+ throws MyBadException, AssertionFailedException, Exception
{
- System.out.println("In ErrorREcoveryInterceptor");
- System.out.println("sless = " + foobar);
- System.out.println("sc = " + sc);
+ System.out.println("In ErrorREcoveryInterceptor");
+ System.out.println("sless = " + foobar);
+ System.out.println("sc = " + sc);
Method method = ctx.getMethod();
String methodName = method.getName();
@@ -46,7 +46,7 @@
if (methodName.equals("assertIfTrue")) {
params[0] = new Boolean(false);
-
+
try {
ctx.setParameters(params);
} catch (IllegalArgumentException illArgEx) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
index df8131a..ba05722 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
@@ -29,7 +29,7 @@
private static int prePassivateCallbackCount = 0;
private static int postActivateCallbackCount = 0;
-
+
private int interceptorID;
private int computedInterceptorID;
@@ -38,21 +38,21 @@
@PrePassivate
void prePassivate(InvocationContext ctx) {
- prePassivateCallbackCount++;
+ prePassivateCallbackCount++;
}
@PostActivate
private void postActivate(InvocationContext ctx) {
- postActivateCallbackCount++;
+ postActivateCallbackCount++;
}
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
- System.out.println("In LifecycleCallbackInterceptor:aroundInvoke()");
- sless.sayHello();
- System.out.println("caller principal = " + sessionCtx.getCallerPrincipal());
+ System.out.println("In LifecycleCallbackInterceptor:aroundInvoke()");
+ sless.sayHello();
+ System.out.println("caller principal = " + sessionCtx.getCallerPrincipal());
if (ctx.getMethod().getName().equals("setID")) {
ctx.getContextData().put("LifecycleCallbackInterceptor", this);
@@ -65,30 +65,30 @@
}
public static void resetLifecycleCallbackCounters() {
- prePassivateCallbackCount = postActivateCallbackCount = 0;
+ prePassivateCallbackCount = postActivateCallbackCount = 0;
}
public static int getPrePassivateCallbackCount() {
- return prePassivateCallbackCount;
+ return prePassivateCallbackCount;
}
public static int getPostActivateCallbackCount() {
- return postActivateCallbackCount;
+ return postActivateCallbackCount;
}
-
+
void setInterceptorID(int val) {
this.interceptorID = val;
this.computedInterceptorID = 2 * val + 1;
}
-
+
int getInterceptorID() {
return interceptorID;
}
-
+
boolean checkInterceptorID(int val) {
- return (val == interceptorID) &&
+ return (val == interceptorID) &&
(computedInterceptorID == 2 * val + 1);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
index d270375..906de23 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
@@ -27,17 +27,17 @@
public String hello();
public int getCount();
-
+
public void throwAppException(String msg)
throws AppException;
public String computeMid(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
public String callDummy()
- throws Exception;
+ throws Exception;
- public String eatException()
+ public String eatException()
throws EatException;
public void resetLifecycleCallbackCounters();
@@ -45,9 +45,9 @@
public int getPrePassivateCallbackCount();
public int getPostActivateCallbackCount();
-
+
public void setID(int val);
-
+
public boolean isStateRestored();
public Map<String, Boolean> checkSetParams();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
index 4381fea..b970a4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
@@ -41,7 +41,7 @@
@EJB(name="foobar") Sless foobar;
private int count = 0;
-
+
private int id;
private LifecycleCallbackInterceptor interceptor;
@@ -52,17 +52,17 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
- sless.sayHello();
- System.out.println("caller principal = " + sc.getCallerPrincipal());
+ sless.sayHello();
+ System.out.println("caller principal = " + sc.getCallerPrincipal());
return "hello";
}
@AroundInvoke
private Object interceptCall(InvocationContext ctx)
- throws Exception
+ throws Exception
{
- System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
- count++;
+ System.out.println("**Beans AROUNDINVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ count++;
try {
if (ctx.getMethod().getName().equals("setID")) {
java.util.Map map = ctx.getContextData();
@@ -75,9 +75,9 @@
}
public int getCount() {
- return count;
+ return count;
}
-
+
public void throwAppException(String msg)
throws AppException
{
@@ -85,17 +85,17 @@
}
public String computeMid(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- return sless.sayHello()
- + ", Midpoint of " + min + ", " + max + "; "
- + sless.computeMidPoint(min, max);
+ return sless.sayHello()
+ + ", Midpoint of " + min + ", " + max + "; "
+ + sless.computeMidPoint(min, max);
}
public String callDummy()
- throws Exception
+ throws Exception
{
- return dummy.dummy();
+ return dummy.dummy();
}
public String eatException()
@@ -106,22 +106,22 @@
}
public int getPrePassivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPrePassivateCallbackCount();
}
public int getPostActivateCallbackCount() {
- return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
+ return LifecycleCallbackInterceptor.getPostActivateCallbackCount();
}
public void resetLifecycleCallbackCounters() {
- LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
+ LifecycleCallbackInterceptor.resetLifecycleCallbackCounters();
}
public void setID(int val) {
this.id = val;
interceptor.setInterceptorID(val);
}
-
+
public boolean isStateRestored() {
return interceptor.checkInterceptorID(id);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
index c8be6ec..9044f86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
@@ -24,7 +24,7 @@
public String sayHello();
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException;
+ throws SwapArgumentsException;
public void setFoo(Foo foo)
throws MyBadException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
index 613e54a..52d4b62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
@@ -23,19 +23,19 @@
//Default is @Local
@Stateless
public class SlessEJB
- implements Sless
+ implements Sless
{
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public double computeMidPoint(int min, int max)
- throws SwapArgumentsException
+ throws SwapArgumentsException
{
- if (min > max) {
- throw new SwapArgumentsException("("+min+", "+max+")");
- }
- return (min*1.0+max)/2.0;
+ if (min > max) {
+ throw new SwapArgumentsException("("+min+", "+max+")");
+ }
+ return (min*1.0+max)/2.0;
}
@Interceptors(ArgumentsVerifier.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties
index 0cac325..4521380 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="devtest-intro-multi"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml
index f2299cd..ac24b0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
index f75621c..0304a0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
@@ -27,7 +27,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,11 +36,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-allowed-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
(new MyThread()).start();
@@ -50,7 +50,7 @@
(new MyThread()).start();
(new MyThread()).start();
stat.addStatus("intro sayHello", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro sayHello", stat.FAIL);
}
@@ -59,7 +59,7 @@
private static class MyThread extends Thread {
MyThread() {}
-
+
public void run() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 2d38653..e158184 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -37,11 +37,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
index ee39cd2..c528f19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -32,11 +32,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties
index 19d47a0..101b6b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="devtest-intro-stateless"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml
index 782b0bc..9a03d48 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sless.class,**/Sless30.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
index da47a87..785c815 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
@@ -27,7 +27,7 @@
@EJB(name="ejb/GG", beanInterface=Sless.class)
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,11 +36,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-allowed-sessionID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB(name="ejb/kk") Sless sless;
private static @EJB Sless30 sless30;
@@ -49,39 +49,39 @@
public void doTest() {
try {
(new InitialContext()).lookup("java:comp/env/ejb/GG");
- sless.sayHello();
+ sless.sayHello();
stat.addStatus("intro sayHello", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro sayHello", stat.FAIL);
}
- boolean result = false;
+ boolean result = false;
try {
- result = sless.wasEjbCreateCalled();
+ result = sless.wasEjbCreateCalled();
stat.addStatus("intro wasEjbCreateCalled",
result ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro wasEjbCreateCalled", stat.FAIL);
- }
+ }
try {
- sless30.sayHello();
+ sless30.sayHello();
stat.addStatus("intro sayHello30", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro sayHello30", stat.FAIL);
}
- result = false;
+ result = false;
try {
- result = sless30.wasEjbCreateCalled();
+ result = sless30.wasEjbCreateCalled();
stat.addStatus("intro wasEjbCreateCalled30",
(result == false) ? stat.PASS : stat.FAIL);
- } catch (Exception ex) {
+ } catch (Exception ex) {
stat.addStatus("intro wasEjbCreateCalled30", stat.FAIL);
- }
+ }
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 2d38653..e158184 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -37,11 +37,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
index ee39cd2..c528f19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -32,11 +32,11 @@
}
public String sayHello() {
- return "Hello";
+ return "Hello";
}
public boolean wasEjbCreateCalled() {
- return ejbCreateCalled;
+ return ejbCreateCalled;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml
index b3bd8ff..62a3c68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/build.xml
@@ -88,9 +88,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb30-persistence tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb30-persistence tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties
index 2757b1a..a85f883 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-context"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml
index b61d947..e33f64a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,10 +58,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
@@ -72,9 +72,9 @@
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -82,9 +82,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar, lib/${appname}-par2.jar, lib/${appname}-par3.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -92,10 +92,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
index ed3c2b3..9fed4ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
@@ -24,7 +24,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private String personName;
@@ -35,8 +35,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejb30-persistence-contextID");
- }
-
+ }
+
public Client (String[] args) {
personName = "duke";
@@ -46,7 +46,7 @@
}
}
-
+
private static @EJB Sless sless;
public void doTest() {
@@ -84,8 +84,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
index 0f6c7ec..34d4708 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
@@ -35,7 +35,7 @@
public Person(String name){
this.name = name;
}
-
+
@Override public String toString(){
return "Person: {"+"(name = "+name+")}";
}
@@ -44,4 +44,4 @@
return name;
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
index 4abbdd6..e7dff8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
@@ -36,11 +36,11 @@
private @PersistenceContext(unitName="em2") EntityManager emRemove;
public void createPerson(String name) {
-
+
Person p = new Person(name);
boolean containsP = emCreate.contains(p);
- System.out.println("before persist containsP = " + containsP);
+ System.out.println("before persist containsP = " + containsP);
if( containsP ) {
throw new EJBException("contains() should be false");
}
@@ -63,7 +63,7 @@
"when calling close() on a container-managed " +
"EntityManager");
}
-
+
// isOpen doesn't make any sense on a container-managed entity manager,
// but it shouldn't throw an exception.
emCreate.isOpen();
@@ -115,8 +115,8 @@
if( results3.size() != 1) {
throw new EJBException("wrong num results");
}
-
-
+
+
}
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
@@ -133,7 +133,7 @@
}
System.out.println("Getting q1 from EM");
- Query q1 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
+ Query q1 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
System.out.println("Executing q1");
Person p3 = (Person) q1.getSingleResult();
@@ -159,7 +159,7 @@
System.out.println("Getting q2 from EM");
- Query q2 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
+ Query q2 = emFind.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='" + name + "'");
try {
q2.setFirstResult(-1);
@@ -218,7 +218,7 @@
System.out.println("Got expected TransactionRequiredException " +
"when calling merge outside a transaction");
}
-
+
try {
emFind.remove(p);
throw new EJBException("remove should have thrown an exception");
@@ -266,7 +266,7 @@
if( !name.equals(p8.getName()) ) {
throw new EJBException("finder results not equivalent");
}
-
+
Query q4 = emFind.createNativeQuery("SELECT p.name FROM EJB30_PERSISTENCE_CONTEXT_PERSON p WHERE p.name LIKE '" + name + "'");
String p9 = (String) q4.getSingleResult(); // ((Vector) q4.getSingleResult()).elementAt(0);
System.out.println("Found " + p9);
@@ -279,7 +279,7 @@
if( !name.equals(p10) ) {
throw new EJBException("finder results not equivalent");
}
-
+
Query q5 = emFind.createNativeQuery("SELECT p.name FROM EJB30_PERSISTENCE_CONTEXT_PERSON p WHERE p.name LIKE '" + name + "'", Person.class);
Person p11 = (Person) q5.getSingleResult();
@@ -296,7 +296,7 @@
}
Query q6 = emFind.createNativeQuery("SELECT p.name FROM EJB30_PERSISTENCE_CONTEXT_PERSON p WHERE p.name LIKE '" + name + "'", "PersonSqlMapping");
-
+
Person p13 = (Person) q6.getSingleResult();
System.out.println("Found " + p13);
if( !name.equals(p13.getName()) ) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties
index cad5d73..773b838 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_1slsb_2sfsbs"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml
index b279f33..5bc287b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
index 4208da2..41baec0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
index f05f5b2..4a2ca89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
@@ -46,7 +46,7 @@
return data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
index 3dd92ff..78ed30b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
@@ -34,27 +34,27 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
private @EJB Sless sless;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_1slsb_2sfsbs-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
@@ -101,7 +101,7 @@
peerOpStatus = true;
}
map.put("peerFoundMe (-ve test)", peerOpStatus);
-
+
map.put("delegateRemovedMe",
delegate.remove(name));
@@ -115,7 +115,7 @@
map.put("iCannotFindMe (-ve test)",
(find(name) == null));
-
+
map.put("removedDelegate",
removePerson(delegateName));
@@ -126,7 +126,7 @@
peerOpStatus = true;
}
map.put("peerCannotfindDelegate (-ve test)", peerOpStatus);
-
+
String peerName = "_peer_name_" + name;
String peerData = "_peer_data_" + name;
@@ -164,5 +164,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
index 361c2a1..f59e8bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
SfulPeer getSfulPeer();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
index fcf2f1c..174def8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
@@ -41,11 +41,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
index c43f287..be2b057 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
index d1f6407..1b9dda2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
@@ -37,11 +37,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql
index 6d6ced3..a1761ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql
index 8c9e5c4..9c23a5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties
index f51cf6e..0777762 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_3sfsbs"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml
index a1e78c3..555ef8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
index 498fc5e..71c73b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
index 3c2958e..e2cf0c6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
@@ -42,7 +42,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
index 7a5dab9..f9bc3a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_3sfsbs-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
@@ -88,7 +88,7 @@
map.put("peerFoundMe",
(peer.find(name) != null));
-
+
map.put("delegateRemovedMe",
delegate.remove(name));
@@ -97,13 +97,13 @@
map.put("iCannotFindMe (-ve test)",
(find(name) == null));
-
+
map.put("removedDelegate",
removePerson(delegateName));
map.put("peerCannotfindDelegate (-ve test)",
(! peer.remove(delegateName)));
-
+
String peerName = "_peer_name_" + name;
String peerData = "_peer_data_" + name;
@@ -136,5 +136,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
index 0f45807..77a045c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
SfulPeer getSfulPeer();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
index 7cb3711..8ef4515 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
@@ -41,11 +41,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
index ae051d5..b19bcdb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
index 6678ac9..8247fc6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
@@ -37,11 +37,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql
index f829e56..809c5ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql
index 0ac83c2..6ff570c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_3SFSBS_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties
index 892e294..ba1f51b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_adapted"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml
index 68fc9ad..e351ea5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class, **/AdaptedLocalHome.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
index 440ace1..e1136c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
@@ -53,13 +53,13 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling setName(" + personName + ")");
sful.setName(personName);
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -72,7 +72,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
index 7603c7d..6fbcbd1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
@@ -42,7 +42,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
index c4fe546..83ca2ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
@@ -40,22 +40,22 @@
implements Sful {
private String name;
-
+
@EJB private AdaptedLocalHome home;
private SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_adapted-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
}
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
try {
@@ -69,11 +69,11 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
+
boolean delegateRemovedMe = delegate.remove(name);
-
+
boolean removedDelegate = removePerson(delegateName);
-
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -101,5 +101,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
index e2cd88f..acc5ef5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
@@ -30,7 +30,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
index f258617..100ef6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
@@ -43,7 +43,7 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
@Init
public void createDelegate(String name, String data) {
}
@@ -55,7 +55,7 @@
public Person createPerson(String name, String data) {
Person person = new Person(name, data);
-
+
extendedEM.persist(person);
return person;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql
index 61842f1..85a8db0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql
index fdc9128..769dd38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_ADAPTED_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties
index 38eea69..6efb31e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eem_injection"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml
index fe7c637..5209b84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
index eae50e7..bedb576 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
index 683f5a3..6a95f84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
@@ -45,7 +45,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
index 8eef986..a08e9c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eem_injection.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eem_injection-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -71,11 +71,11 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
+
boolean delegateRemovedMe = delegate.remove(name);
-
+
boolean removedDelegate = removePerson(delegateName);
-
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -103,5 +103,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
index 5b72c73..6728f8e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
index 52f920c..f490a19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
@@ -37,12 +37,12 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name);
p.setData(data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql
index fa60742..c0ab43f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql
index 5eb136f..d012c69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties
index cc38ebe..b72a791 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eempassivation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml
index 8ed4406..45774a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
index 7ae4482..d00bbcb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
@@ -26,7 +26,7 @@
void setName(String name);
Map<String, Boolean> doTests(String prefix);
-
+
public void createSfulDelegates();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
index 43eca90..ae96205 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
@@ -50,7 +50,7 @@
String lookupName = "java:comp/env/ejb/SfulBean";
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
-
+
System.out.println("**EEM Delegate: " + extendedEM.getDelegate().getClass().getName());
} catch (Exception ex) {
throw new EJBException(ex);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
index 8766ec9..e6696ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
@@ -93,7 +93,7 @@
System.out.println("**ejbPASSIVATE() called...");
passivationCount++;
}
-
+
@PostActivate
public void postActivate() {
System.out.println("**ejbActivate() called...");
@@ -103,7 +103,7 @@
public int getPassivationCount() {
return passivationCount;
}
-
+
public int getActivationCount() {
return activateCount;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql
index 7985340..0bb6bbd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql
index 6d8c67f..36675ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties
index 98d78cc..3f79079 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eempropagation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml
index 69be37c..efbdf5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
index 335a623..c706d19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
@@ -53,14 +53,14 @@
public void doTest() {
try {
-
+
System.out.println("I am in client");
System.out.println("calling createPerson(" + personName + ")");
sful.setName(personName);
System.out.println("created ");
-
+
Map<String, Boolean> map = sful.doTests();
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -73,7 +73,7 @@
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
index 4c166d5..2a0eff2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
@@ -42,7 +42,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
index 06e2cb5..9ad16e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
@@ -34,27 +34,27 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.eempropagation.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
//private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-eempropagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
private SfulDelegate delegate;
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -73,11 +73,11 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
+
boolean delegateRemovedMe = delegate.remove(name);
-
+
boolean removedDelegate = removePerson(delegateName);
-
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -105,5 +105,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
index e3292ac..c62f337 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
index a495e98..c4a7de2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
@@ -37,11 +37,11 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name, data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql
index 6f7a059..fafd5eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql
index e443c3e..419ca60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEMPROPAGATION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties
index b7683df..c143f2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-eemsfsbpassivation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml
index 27ba715..eaf3b64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,17 +58,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -76,9 +76,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -86,10 +86,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
index 058b203..60de009 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
@@ -27,4 +27,4 @@
Map<String, Boolean> doTests(String prefix);
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql
index 7985340..0bb6bbd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql
index 6d8c67f..36675ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEMPASSIVATION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties
index fc69868..c34e73a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-extendedem"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml
index 49d0a85..f0e89ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,10 +58,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
@@ -69,9 +69,9 @@
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -79,9 +79,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar, lib/${appname}-par3.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -89,10 +89,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
index a3952b8..691fc4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
@@ -84,14 +84,14 @@
stat.addStatus("local statusNonTxFindPerson", (statusNonTxFindPerson) ? stat.PASS : stat.FAIL);
stat.addStatus("local statusNonTxFindPerson2", (statusNonTxFindPerson2) ? stat.PASS : stat.FAIL);
stat.addStatus("local statusRemovePerson", (statusRemovePerson) ? stat.PASS : stat.FAIL);
- stat.addStatus("local statusRefreshPerson", (statusRefreshPerson) ? stat.FAIL : stat.PASS);
+ stat.addStatus("local statusRefreshPerson", (statusRefreshPerson) ? stat.FAIL : stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql
index 6ca8284..827525f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON (
-NAME VARCHAR(256) NOT NULL PRIMARY KEY
-)
-;
+CREATE TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON (
+NAME VARCHAR(256) NOT NULL PRIMARY KEY
+)
+;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql
index 14b7e4d..cd7d050 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EXTENDEDEM_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties
index 5d78233..299559b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-tx_propagation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.client.Client"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml
index b97627b..df6dd8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
<param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
<param name="jdbc.resource.name" value="jdbc/xa"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-xa-pool.property.connectionAttributes=;create=true"/>
@@ -81,17 +81,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -99,9 +99,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -110,10 +110,10 @@
<antcall target="runclient-common"/>
<antcall target="runclient-standalone"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
index 5c0b234..dc21185 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
@@ -64,7 +64,7 @@
PreparedStatement s = null;
try {
System.err.println("I am in client");
-
+
UserTransaction utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
ds = (DataSource)(new javax.naming.InitialContext()).lookup("jdbc/xa");
@@ -78,7 +78,7 @@
utx.begin();
System.err.println("utx.begin called ");
-
+
connection = ds.getConnection();
s = connection.prepareStatement("insert into EJB30_PERSISTENCE_EEM_INJECTION_PERSON values('1', '1')");
s.execute();
@@ -94,7 +94,7 @@
utx.rollback();
System.err.println("utx.rollback called ");
}
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -125,7 +125,7 @@
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
index 14358ff..952cbec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
@@ -45,7 +45,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
index 3d4f30b..4b24df7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
@@ -34,25 +34,25 @@
import jakarta.ejb.EJBException;
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-tx_propagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -71,8 +71,8 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
-
+
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -100,5 +100,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
index 62d2097..337a43f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
index 8a96e20..f7a7aad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
@@ -37,12 +37,12 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name);
p.setData(data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql
index fa60742..c0ab43f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql
index 5eb136f..d012c69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml
index 195c2ef..f559dcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-asynchronous tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-asynchronous tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties
index 773d699..f5f2fc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-asynchronous-localandremote"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml
index 05fd518..011ba54 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
index 1a7fd82..0413b06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -39,42 +39,42 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- num = Integer.valueOf(args[1]);
+ num = Integer.valueOf(args[1]);
}
public void doTest() {
- try {
+ try {
-
- remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteAsync");
- Future<String> future = remoteAsync.hello("Bob");
-
- boolean isDone = future.isDone();
- System.out.println("isDone = " + isDone);
- String result = future.get();
+ remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteAsync");
+ Future<String> future = remoteAsync.hello("Bob");
- if( !future.isDone() ) {
- throw new RuntimeException("isDone should have been true");
- }
-
- System.out.println("Remote bean says " + result);
-
- stat.addStatus("local main", stat.PASS);
+ boolean isDone = future.isDone();
+ System.out.println("isDone = " + isDone);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ String result = future.get();
+
+ if( !future.isDone() ) {
+ throw new RuntimeException("isDone should have been true");
+ }
+
+ System.out.println("Remote bean says " + result);
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
index 693a122..ef609d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
@@ -32,14 +32,14 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- Future<String> future = meLocal.hello("init");
+ Future<String> future = meLocal.hello("init");
}
@Asynchronous
public Future<String> hello(String name) {
- System.out.println("In SingletonBean::hello( " + name + ")");
- return new AsyncResult<String>("Hello, " + name);
+ System.out.println("In SingletonBean::hello( " + name + ")");
+ return new AsyncResult<String>("Hello, " + name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
index a8e8cb0..797ab1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
@@ -19,6 +19,6 @@
import java.util.concurrent.*;
import jakarta.ejb.*;
-public interface SuperAsync {
+public interface SuperAsync {
public Future<String> hello(String name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties
index 9780180..7c1554f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-asynchronous-remote"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml
index 75e5fd3..e9eefca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
index 97ecdc3..9f151b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
@@ -31,7 +31,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -46,241 +46,241 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- num = Integer.valueOf(args[1]);
+ num = Integer.valueOf(args[1]);
}
public void doTest() {
- try {
+ try {
- statefulBean = (RemoteAsync2) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync2");
- statefulBeanLegacyRemote = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
- statefulBeanLegacyRemote2 = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
+ statefulBean = (RemoteAsync2) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync2");
+ statefulBeanLegacyRemote = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
+ statefulBeanLegacyRemote2 = (RemoteAsync3) new InitialContext().lookup("java:global/" + appName + "/StatefulBean!com.acme.RemoteAsync3");
- Future<String> futureSful = statefulBean.helloAsync();
- System.out.println("Stateful bean says " + futureSful.get());
+ Future<String> futureSful = statefulBean.helloAsync();
+ System.out.println("Stateful bean says " + futureSful.get());
- futureSful = statefulBean.removeAfterCalling();
- System.out.println("Stateful bean removed status = " + futureSful.get());
+ futureSful = statefulBean.removeAfterCalling();
+ System.out.println("Stateful bean removed status = " + futureSful.get());
- boolean gotSfulException = false;
- try {
- futureSful = statefulBean.helloAsync();
- } catch(NoSuchEJBException nsee) {
- System.out.println("Got nsee from helloAsync");
- gotSfulException = true;
- }
+ boolean gotSfulException = false;
+ try {
+ futureSful = statefulBean.helloAsync();
+ } catch(NoSuchEJBException nsee) {
+ System.out.println("Got nsee from helloAsync");
+ gotSfulException = true;
+ }
- try {
- if( !gotSfulException ) {
- System.out.println("return value = " + futureSful.get());
- throw new EJBException("Should have gotten exception");
- }
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof NoSuchEJBException ) {
- System.out.println("Successfully caught NoSuchEJBException when " +
- "accessing sful bean asynchronously after removal");
- } else {
- throw new EJBException("wrong exception during sfsb access after removal",
- ee);
- }
- }
-
- try {
- Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.CreateException");
- String result = f.get();
- throw new EJBException("Didn't get CreateException");
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof CreateException ) {
- System.out.println("Successfully received CreateException");
- } else {
- throw new EJBException("wrong exception received",
- ee);
- }
- }
+ try {
+ if( !gotSfulException ) {
+ System.out.println("return value = " + futureSful.get());
+ throw new EJBException("Should have gotten exception");
+ }
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof NoSuchEJBException ) {
+ System.out.println("Successfully caught NoSuchEJBException when " +
+ "accessing sful bean asynchronously after removal");
+ } else {
+ throw new EJBException("wrong exception during sfsb access after removal",
+ ee);
+ }
+ }
- try {
- Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.EJBException");
- String result = f.get();
- throw new EJBException("Didn't get EJBException");
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof RemoteException ) {
- System.out.println("Successfully received RemoteException");
- } else {
- throw new EJBException("wrong exception received",
- ee);
- }
- }
+ try {
+ Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.CreateException");
+ String result = f.get();
+ throw new EJBException("Didn't get CreateException");
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof CreateException ) {
+ System.out.println("Successfully received CreateException");
+ } else {
+ throw new EJBException("wrong exception received",
+ ee);
+ }
+ }
-
- try {
- Future<String> f = statefulBeanLegacyRemote2.removeAfterCalling();
- String result = f.get();
- System.out.println("result of removeAfterCalling = " + result);
- } catch(ExecutionException ee) {
- throw new EJBException("got unexpected exception", ee);
- }
+ try {
+ Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.EJBException");
+ String result = f.get();
+ throw new EJBException("Didn't get EJBException");
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof RemoteException ) {
+ System.out.println("Successfully received RemoteException");
+ } else {
+ throw new EJBException("wrong exception received",
+ ee);
+ }
+ }
- try {
- Future<String> f = statefulBeanLegacyRemote2.helloAsync();
- String result = f.get();
- throw new EJBException("Didn't get RemoteException");
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof NoSuchObjectException ) {
- System.out.println("Successfully received RemoteException");
- } else {
- throw new EJBException("wrong exception received",
- ee);
- }
- } catch(NoSuchObjectException nsoe) {
- System.out.println("Successfully received NoSuchObjectException");
- }
-
- remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- remoteAsync.startTest();
- ExecutorService executor = Executors.newCachedThreadPool();
+ try {
+ Future<String> f = statefulBeanLegacyRemote2.removeAfterCalling();
+ String result = f.get();
+ System.out.println("result of removeAfterCalling = " + result);
+ } catch(ExecutionException ee) {
+ throw new EJBException("got unexpected exception", ee);
+ }
- int numFireAndForgets = num;
- for(int i = 0; i < numFireAndForgets; i++) {
- executor.execute( new FireAndForget() );
- }
+ try {
+ Future<String> f = statefulBeanLegacyRemote2.helloAsync();
+ String result = f.get();
+ throw new EJBException("Didn't get RemoteException");
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof NoSuchObjectException ) {
+ System.out.println("Successfully received RemoteException");
+ } else {
+ throw new EJBException("wrong exception received",
+ ee);
+ }
+ } catch(NoSuchObjectException nsoe) {
+ System.out.println("Successfully received NoSuchObjectException");
+ }
- CancelAfterAlreadyDone cad = new CancelAfterAlreadyDone();
- executor.execute( cad );
+ remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ remoteAsync.startTest();
- ProcessAsync pAsyncs[] = new ProcessAsync[num];
- for(int i = 0; i < pAsyncs.length; i++) {
+ ExecutorService executor = Executors.newCachedThreadPool();
- if( ( i % 2 ) == 0 ) {
- pAsyncs[i] = new ProcessAsync(i, 1, 3, false);
- } else {
- pAsyncs[i] = new ProcessAsync(i, 1, 3, true);
- }
+ int numFireAndForgets = num;
+ for(int i = 0; i < numFireAndForgets; i++) {
+ executor.execute( new FireAndForget() );
+ }
- executor.execute( pAsyncs[i] );
- }
+ CancelAfterAlreadyDone cad = new CancelAfterAlreadyDone();
+ executor.execute( cad );
- executor.shutdown();
+ ProcessAsync pAsyncs[] = new ProcessAsync[num];
+ for(int i = 0; i < pAsyncs.length; i++) {
- executor.awaitTermination(15, TimeUnit.SECONDS);
+ if( ( i % 2 ) == 0 ) {
+ pAsyncs[i] = new ProcessAsync(i, 1, 3, false);
+ } else {
+ pAsyncs[i] = new ProcessAsync(i, 1, 3, true);
+ }
- if( !cad.success ) {
- throw new Exception("Cancel after already done failed");
- }
+ executor.execute( pAsyncs[i] );
+ }
- for(int i = 0; i < pAsyncs.length; i++) {
- ProcessAsync pa = pAsyncs[i];
- if( !pa.success() ) {
- throw new Exception(pa.failureMsg);
- }
- }
+ executor.shutdown();
- int ffCount = remoteAsync.getFireAndForgetCount();
- System.out.println("FireAndForget count = " + ffCount + " expected = " +
- numFireAndForgets);
- if( ffCount != numFireAndForgets) {
- throw new Exception("numFireAndForget mismatch");
- }
+ executor.awaitTermination(15, TimeUnit.SECONDS);
- stat.addStatus("local main", stat.PASS);
+ if( !cad.success ) {
+ throw new Exception("Cancel after already done failed");
+ }
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ for(int i = 0; i < pAsyncs.length; i++) {
+ ProcessAsync pa = pAsyncs[i];
+ if( !pa.success() ) {
+ throw new Exception(pa.failureMsg);
+ }
+ }
+
+ int ffCount = remoteAsync.getFireAndForgetCount();
+ System.out.println("FireAndForget count = " + ffCount + " expected = " +
+ numFireAndForgets);
+ if( ffCount != numFireAndForgets) {
+ throw new Exception("numFireAndForget mismatch");
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
class FireAndForget implements Runnable {
- public void run() {
- remoteAsync.fireAndForget();
- }
+ public void run() {
+ remoteAsync.fireAndForget();
+ }
}
class CancelAfterAlreadyDone implements Runnable {
- boolean success = false;
- public void run() {
- try {
- // asyc method that returns immediately.
- // Sleep for a bit so that it's likely already
- // done by the time we call cancel. This should
- // exercise the path that the result piggy-backs
- // on the return of the cancel call.
- Future<String> future = remoteAsync.helloAsync();
- Thread.sleep(2000);
- future.cancel(true);
- String result = future.get();
- System.out.println("cancel after done = " + result);
- success = true;
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
+ boolean success = false;
+ public void run() {
+ try {
+ // asyc method that returns immediately.
+ // Sleep for a bit so that it's likely already
+ // done by the time we call cancel. This should
+ // exercise the path that the result piggy-backs
+ // on the return of the cancel call.
+ Future<String> future = remoteAsync.helloAsync();
+ Thread.sleep(2000);
+ future.cancel(true);
+ String result = future.get();
+ System.out.println("cancel after done = " + result);
+ success = true;
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
}
class ProcessAsync implements Runnable {
- int id;
- int interval;
- int numIntervals;
- boolean cancel;
+ int id;
+ int interval;
+ int numIntervals;
+ boolean cancel;
- boolean cancelled;
- boolean completed;
+ boolean cancelled;
+ boolean completed;
- String failureMsg;
- Throwable exception;
+ String failureMsg;
+ Throwable exception;
- public ProcessAsync(int i, int interval, int numIntervals, boolean cancel) {
- this.id = i;
- this.interval = interval;
- this.numIntervals = numIntervals;
- this.cancel = cancel;
- }
- public void run() {
- try {
- Future<Integer> future =
- remoteAsync.processAsync(interval, numIntervals);
- if( cancel ) {
- future.cancel(true);
- }
+ public ProcessAsync(int i, int interval, int numIntervals, boolean cancel) {
+ this.id = i;
+ this.interval = interval;
+ this.numIntervals = numIntervals;
+ this.cancel = cancel;
+ }
+ public void run() {
+ try {
+ Future<Integer> future =
+ remoteAsync.processAsync(interval, numIntervals);
+ if( cancel ) {
+ future.cancel(true);
+ }
- Integer result = future.get();
+ Integer result = future.get();
- System.out.println("ProcessAsync result : " + result);
- completed = true;
+ System.out.println("ProcessAsync result : " + result);
+ completed = true;
- } catch(ExecutionException ee) {
- exception = ee.getCause();
- if( exception.getClass().getName().equals("java.lang.Exception") ) {
- System.out.println("ProcessAsync succesfully cancelled");
- cancelled = true;
- }
- } catch(Exception e) {
- exception = e;
- }
- }
+ } catch(ExecutionException ee) {
+ exception = ee.getCause();
+ if( exception.getClass().getName().equals("java.lang.Exception") ) {
+ System.out.println("ProcessAsync succesfully cancelled");
+ cancelled = true;
+ }
+ } catch(Exception e) {
+ exception = e;
+ }
+ }
- public boolean success() {
- boolean succeeded = true;
- if (cancel && !cancelled) {
- succeeded = false;
- failureMsg = "pasync " + id + " was not cancelled successfully";
- } else if( !cancel && !completed ) {
- succeeded = false;
- failureMsg = "pasync " + id + " did not complete successfully";
- }
+ public boolean success() {
+ boolean succeeded = true;
+ if (cancel && !cancelled) {
+ succeeded = false;
+ failureMsg = "pasync " + id + " was not cancelled successfully";
+ } else if( !cancel && !completed ) {
+ succeeded = false;
+ failureMsg = "pasync " + id + " did not complete successfully";
+ }
- return succeeded;
- }
+ return succeeded;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
index 6354612..d21025d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
@@ -25,14 +25,14 @@
void startTest();
void fireAndForget();
-
+
public int getFireAndForgetCount();
Future<String> helloAsync();
- Future<Integer> processAsync(int sleepInterval, int numIntervals)
- throws Exception;
+ Future<Integer> processAsync(int sleepInterval, int numIntervals)
+ throws Exception;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
index 3c76283..175ae06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
@@ -24,9 +24,9 @@
public Future<String> helloAsync() throws java.rmi.RemoteException;
-
+
public Future<String> removeAfterCalling() throws java.rmi.RemoteException;
-
+
public Future<String> throwException(String exception) throws java.rmi.RemoteException, CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
index b3d86207..5bbb70b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
@@ -40,58 +40,58 @@
}
public void startTest() {
- System.out.println("in SingletonBean::startTest()");
- // reset state
- fireAndForgetCount = new AtomicInteger();
- return;
+ System.out.println("in SingletonBean::startTest()");
+ // reset state
+ fireAndForgetCount = new AtomicInteger();
+ return;
}
@Asynchronous
public void fireAndForget() {
- System.out.println("In SingletonBean::fireAndForget()");
- fireAndForgetCount.incrementAndGet();
+ System.out.println("In SingletonBean::fireAndForget()");
+ fireAndForgetCount.incrementAndGet();
}
public int getFireAndForgetCount() {
- return fireAndForgetCount.get();
+ return fireAndForgetCount.get();
}
@Asynchronous
public Future<String> helloAsync() {
- return new AsyncResult<String>("hello, world\n");
+ return new AsyncResult<String>("hello, world\n");
}
@Asynchronous
- public Future<Integer> processAsync(int sleepInterval, int numIntervals)
+ public Future<Integer> processAsync(int sleepInterval, int numIntervals)
throws Exception {
- int me = processAsyncCount.incrementAndGet();
- boolean cancelled = false;
- int i = 0;
- while(i < numIntervals) {
- i++;
- if( sessionCtx.wasCancelCalled() ) {
- System.out.println("Cancelling processAsync " + me + " after " +
- i + " intervals");
- cancelled = true;
- break;
- }
- try {
- System.out.println("Sleeping for " + i + "th time in processAsync " +
- me);
- Thread.sleep(sleepInterval * 1000);
- System.out.println("Woke up for " + i + "th time in processAsync " +
- me);
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
- }
-
- if( cancelled ) {
- throw new Exception("Cancelled processAsync " + me);
- }
+ int me = processAsyncCount.incrementAndGet();
+ boolean cancelled = false;
+ int i = 0;
+ while(i < numIntervals) {
+ i++;
+ if( sessionCtx.wasCancelCalled() ) {
+ System.out.println("Cancelling processAsync " + me + " after " +
+ i + " intervals");
+ cancelled = true;
+ break;
+ }
+ try {
+ System.out.println("Sleeping for " + i + "th time in processAsync " +
+ me);
+ Thread.sleep(sleepInterval * 1000);
+ System.out.println("Woke up for " + i + "th time in processAsync " +
+ me);
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
+ }
- return new AsyncResult<Integer>(numIntervals);
+ if( cancelled ) {
+ throw new Exception("Cancelled processAsync " + me);
+ }
+
+ return new AsyncResult<Integer>(numIntervals);
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
index 9089131..a4319f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
@@ -35,25 +35,25 @@
@Asynchronous
public Future<String> helloAsync() {
- return new AsyncResult<String>("hello, world\n");
+ return new AsyncResult<String>("hello, world\n");
}
@Asynchronous
@Remove
public Future<String> removeAfterCalling() {
- System.out.println("In StatefulBean::removeAfterCalling()");
- return new AsyncResult<String>("removed");
+ System.out.println("In StatefulBean::removeAfterCalling()");
+ return new AsyncResult<String>("removed");
}
@Asynchronous
- public Future<String> throwException(String exception) throws CreateException {
- if( exception.equals("jakarta.ejb.CreateException") ) {
- throw new CreateException();
- } else if ( exception.equals("jakarta.ejb.EJBException") ) {
- throw new EJBException();
- }
+ public Future<String> throwException(String exception) throws CreateException {
+ if( exception.equals("jakarta.ejb.CreateException") ) {
+ throw new CreateException();
+ } else if ( exception.equals("jakarta.ejb.EJBException") ) {
+ throw new EJBException();
+ }
- return new AsyncResult<String>("unsupported exception type");
+ return new AsyncResult<String>("unsupported exception type");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties
index f211e64..0b7c93c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-asynchronous-threadpoolconfig"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
-<property name="numOfInvocations" value="100"/>
-<property name="maxPoolSize" value="32"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
+<property name="numOfInvocations" value="100"/> \u0020
+<property name="maxPoolSize" value="32"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="test.Client"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml
index 8d2a23c..92bb8bf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run, undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
index 0d80aeb..8626ffb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
@@ -31,7 +31,7 @@
private static String threadNamePrefix = "__ejb-thread-pool";
public static void main(String args[]) throws Exception {
- appName = args[0];
+ appName = args[0];
if(args.length >= 2) {
try {
numOfInvocations = Integer.parseInt(args[1]);
@@ -44,9 +44,9 @@
} catch (NumberFormatException e) { //ignore
}
}
- stat.addDescription(appName);
- Client client = new Client();
- client.doTest();
+ stat.addDescription(appName);
+ Client client = new Client();
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -64,7 +64,7 @@
for(int i = 0; i < numOfInvocations; i++) {
results.add(helloBean.getThreadNameId());
}
-
+
for(Future<String> f : results) {
String s = f.get();
String threadName = s.split(" ")[0];
@@ -76,7 +76,7 @@
}
}
System.out.println("Number of results: " + results.size());
- System.out.println("All " + acceptableThreadNames.size() +
+ System.out.println("All " + acceptableThreadNames.size() +
" acceptable thread names: " + acceptableThreadNames);
stat.addStatus(appName, (failed ? stat.FAIL: stat.PASS));
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
index 44c5141..0b9743c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
@@ -31,6 +31,6 @@
} catch (InterruptedException e) {
}
Thread th = Thread.currentThread();
- return new AsyncResult<String>(th.getName() + " " + System.identityHashCode(th));
+ return new AsyncResult<String>(th.getName() + " " + System.identityHashCode(th));
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml
index 5a1089c..7883b5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/build.xml
@@ -92,9 +92,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31 tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31 tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml
index 173b85d..8cc02a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/build.xml
@@ -70,9 +70,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-ejblite tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-ejblite tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties
index 867ba0e..78265f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-generics"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.sun.s1as.devtests.ejb.generics.Client"/>
<property name="contextroot" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java
index 65078df..619effc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/client/Client.java
@@ -28,11 +28,11 @@
* issue 17235 Dependency Injection doesn't work for overloaded methods accepting generic-type parameter
* DO NOT TEST: issue 16372 Not able to make toString() a final method in EJB with no-interface view
* verified in TypeVariableBean
- *
+ *
*/
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -40,43 +40,43 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
- String url = "http://" + host + ":" + port +
+ try {
+ String url = "http://" + host + ":" + port +
"/" + appName + "/TestServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus(appName, stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus(appName, stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus(appName, stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus(appName, stat.FAIL);
+ e.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
index 3d61b71..cf7ca63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
@@ -51,4 +51,4 @@
abstract public void doSomething5(List<T> t);
abstract public void doSomething6(List<List<T>> t);
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
index 429a793..02eb937 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
@@ -43,7 +43,7 @@
testBean.doSomething5(null);
testBean.doSomething6(null);
out.println(testBean.hello());
- out.println("Successfully called methods on " + testBean);
+ out.println("Successfully called methods on " + testBean);
out.println(typeVariableBean.hello("some text"));
out.println(typeVariableBean.hello(10));
@@ -62,4 +62,4 @@
processRequest(request, response);
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties
index e2a6aba..0b401b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-javamodule"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml
index d54439a..5887b41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -48,9 +48,9 @@
<antcall target="webclient-war-common">
<param name="hasWebclient" value="false"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
index d1df3f6..4ae7129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -29,7 +29,7 @@
@PostConstruct
private void init() {
- System.out.println("In BarManagedBean::init() ");
+ System.out.println("In BarManagedBean::init() ");
}
public void bar() {
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("In BarManagedBean::destroy() ");
+ System.out.println("In BarManagedBean::destroy() ");
}
public String toString() {
- return "BarManagedBean this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "BarManagedBean this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 37bdb80..c64644b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -36,20 +36,20 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean::init() ");
+ System.out.println("In FooManagedBean::init() ");
}
public void foo() {
- System.out.println("In FooManagedBean::foo() ");
- bmb.bar();
+ System.out.println("In FooManagedBean::foo() ");
+ bmb.bar();
}
public void foobar(String s) {
- System.out.println("foobar::s = " + s);
+ System.out.println("foobar::s = " + s);
}
public Object getThis() {
- return this;
+ return this;
}
public int returnIntNoExceptions() { return 1; }
@@ -68,19 +68,19 @@
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean::destroy() ");
+ System.out.println("In FooManagedBean::destroy() ");
}
public String toString() {
- return "FooManagedBean this = " + super.toString() +
+ return "FooManagedBean this = " + super.toString() +
" s = " + s + " , bmb = " + bmb + " , em = " + em;
}
@AroundInvoke
public Object around(InvocationContext c) throws Exception {
- System.out.println("In FooManagedBean::around() ");
- return c.proceed();
+ System.out.println("In FooManagedBean::around() ");
+ return c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
index 78277d2..8d27af0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -73,91 +73,91 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
- try {
- InitialContext ic = new InitialContext();
- sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
- sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
+ try {
+ InitialContext ic = new InitialContext();
+ sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
+ sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
- sb4 = (SingletonBean) ic.lookup("java:module/ES1");
- sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
+ sb4 = (SingletonBean) ic.lookup("java:module/ES1");
+ sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
- slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
- slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
- slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
+ slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
+ slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
+ slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
- slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
- slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
+ slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
+ slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
- foo4 = (FooManagedBean)
- ic.lookup("java:module/foomanagedbean");
+ foo4 = (FooManagedBean)
+ ic.lookup("java:module/foomanagedbean");
- foo5 = (FooManagedBean)
- ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/foomanagedbean");
+ foo5 = (FooManagedBean)
+ ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/foomanagedbean");
- foo6 = (FooManagedBean)
- ic.lookup("java:comp/env/foo2ref");
+ foo6 = (FooManagedBean)
+ ic.lookup("java:comp/env/foo2ref");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
- } catch(Exception e) {
- e.printStackTrace();
- throw new ServletException(e);
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new ServletException(e);
+ }
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- foo.foobar("foobar");
+ foo.foobar("foobar");
- simpleSingleton.hello();
+ simpleSingleton.hello();
- simpleStateless.hello();
- simpleStateless2.hello();
+ simpleStateless.hello();
+ simpleStateless2.hello();
- sb2.hello();
+ sb2.hello();
- sb3.hello();
+ sb3.hello();
- sb4.hello();
+ sb4.hello();
- sb5.hello();
+ sb5.hello();
- slsb.hello();
+ slsb.hello();
- slsb2.hello();
+ slsb2.hello();
- slsb3.hello();
+ slsb3.hello();
- slsb4.hello();
+ slsb4.hello();
- slsb5.hello();
+ slsb5.hello();
- foo.foo();
- foo.foobar("foobar");
- foo2.foo();
- foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
+ foo.foo();
+ foo.foobar("foobar");
+ foo2.foo();
+ foo3.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
index 6e15166..9703bcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -33,24 +33,24 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
public Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::roundInvoke() ");
- if( c.getParameters().length > 0 ) {
- System.out.println("param 1 = " + c.getParameters()[0]);
- }
- return c.proceed();
+ System.out.println("In InterceptorA::roundInvoke() ");
+ if( c.getParameters().length > 0 ) {
+ System.out.println("param 1 = " + c.getParameters()[0]);
+ }
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In Interceptor::destroy() ");
- c.proceed();
+ System.out.println("In Interceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
index c643637..55e03fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -28,36 +28,36 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::init() ");
- c.proceed();
+ System.out.println("In InterceptorB::init() ");
+ c.proceed();
}
@Override
- public Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ public Object roundInvoke(InvocationContext c) throws Exception {
+ throw new RuntimeException("Should not reach here");
}
@AroundInvoke
private Object aroundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::aroundInvoke() ");
- c.getContextData().put("foo", "bar");
- Object returnValue = c.proceed();
-
- String foobar = (String) c.getContextData().get("foobar");
- System.out.println("foobar from context data = " + foobar);
- if( foobar == null ) {
- throw new EJBException("invalid context data");
- }
-
- c.getContextData().clear();
-
- return returnValue;
+ System.out.println("In InterceptorB::aroundInvoke() ");
+ c.getContextData().put("foo", "bar");
+ Object returnValue = c.proceed();
+
+ String foobar = (String) c.getContextData().get("foobar");
+ System.out.println("foobar from context data = " + foobar);
+ if( foobar == null ) {
+ throw new EJBException("invalid context data");
+ }
+
+ c.getContextData().clear();
+
+ return returnValue;
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorB::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
index 4adbd03..1b9325f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
@@ -24,7 +24,7 @@
@AroundInvoke
protected Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ throw new RuntimeException("Should not reach here");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 5b0df58..113b283 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -30,24 +30,24 @@
@PostConstruct
private void init() {
- System.out.println("In ManagedSuper::init() ");
+ System.out.println("In ManagedSuper::init() ");
}
@PreDestroy
private void destroy() {
- System.out.println("In ManagedSuper::destroy() ");
+ System.out.println("In ManagedSuper::destroy() ");
}
public String toString() {
- return "ManagedSuper this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "ManagedSuper this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
@AroundInvoke
public Object aroundSuper(InvocationContext c) throws Exception {
- System.out.println("In ManagedSuper::aroundSuper() ");
- return c.proceed();
+ System.out.println("In ManagedSuper::aroundSuper() ");
+ return c.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
index 394ffce..9ac5bf2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -34,7 +34,7 @@
@Singleton
@LocalBean
public class SingletonBean implements java.util.Observer {
-
+
@EJB private SingletonBean me;
@@ -51,71 +51,71 @@
private StatelessBean slsb3;
private StatelessBean slsb4;
private StatelessBean slsb5;
-
+
public void update(java.util.Observable a,java.lang.Object b) {}
@PostConstruct
private void init() {
- System.out.println("In SingletonBean:init() me = " + me);
-
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:init() me = " + me);
- try {
- InitialContext ic = new InitialContext();
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
- // Lookup simple form of portable JNDI name
- StatelessBean stateless = (StatelessBean)
- ic.lookup("java:module/StatelessBean");
+ try {
+ InitialContext ic = new InitialContext();
- stateless.hello();
+ // Lookup simple form of portable JNDI name
+ StatelessBean stateless = (StatelessBean)
+ ic.lookup("java:module/StatelessBean");
- // Lookup fully-qualified form of portable JNDI name
- StatelessBean stateless2 = (StatelessBean)
- ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
+ stateless.hello();
- stateless2.hello();
+ // Lookup fully-qualified form of portable JNDI name
+ StatelessBean stateless2 = (StatelessBean)
+ ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
- sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
- sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
+ stateless2.hello();
- sb4 = (SingletonBean) ic.lookup("java:module/ES1");
- sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
+ sb2 = (SingletonBean) ic.lookup("java:module/SingletonBean");
+ sb3 = (SingletonBean) ic.lookup("java:module/SingletonBean!com.acme.SingletonBean");
- slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
- slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
- slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
+ sb4 = (SingletonBean) ic.lookup("java:module/ES1");
+ sb5 = (SingletonBean) ic.lookup("java:module/env/ES2");
- slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
- slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
+ slsb = (StatelessBean) ic.lookup("java:module/StatelessBean");
+ slsb2 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean");
+ slsb3 = (StatelessBean) ic.lookup("java:app/ejb-ejb31-ejblite-javamodule-web/StatelessBean!com.acme.StatelessBean");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ slsb4 = (StatelessBean) ic.lookup("java:app/EL1");
+ slsb5 = (StatelessBean) ic.lookup("java:app/env/EL2");
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- } catch(NamingException ne) {
- throw new EJBException(ne);
- }
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
+
+ } catch(NamingException ne) {
+ throw new EJBException(ne);
+ }
}
public void hello() {
- System.out.println("In SingletonBean:hello()");
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:hello()");
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean:destroy()");
- if( sessionCtx.getContextData() == null ) {
- throw new EJBException("null context data");
- }
+ System.out.println("In SingletonBean:destroy()");
+ if( sessionCtx.getContextData() == null ) {
+ throw new EJBException("null context data");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
index 9dcf979..f91e919 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -29,21 +29,21 @@
@PostConstruct
private void init() {
- System.out.println("In StatefulBean:init()");
+ System.out.println("In StatefulBean:init()");
}
@PrePassivate
private void prePass() {
- System.out.println("In StatefulBean:prePassivate()");
+ System.out.println("In StatefulBean:prePassivate()");
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In StatefulBean:destroy()");
+ System.out.println("In StatefulBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
index f6148a5..e59a38a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -29,8 +29,8 @@
@Stateless
@Interceptors(InterceptorB.class)
public class StatelessBean {
-
- @Resource
+
+ @Resource
private SessionContext sessionCtx;
@Resource(mappedName="java:module/foomanagedbean")
@@ -44,64 +44,64 @@
@PostConstruct
private void init() {
- System.out.println("In StatelessBean:init()");
+ System.out.println("In StatelessBean:init()");
}
public void hello() {
- System.out.println("In StatelessBean::hello()");
+ System.out.println("In StatelessBean::hello()");
- Map<String, Object> ctxData = sessionCtx.getContextData();
- String fooctx = (String) ctxData.get("foo");
- System.out.println("foo from context data = " + fooctx);
- if( fooctx == null ) {
- throw new EJBException("invalid context data");
- }
- ctxData.put("foobar", "foobar");
+ Map<String, Object> ctxData = sessionCtx.getContextData();
+ String fooctx = (String) ctxData.get("foo");
+ System.out.println("foo from context data = " + fooctx);
+ if( fooctx == null ) {
+ throw new EJBException("invalid context data");
+ }
+ ctxData.put("foobar", "foobar");
- FooManagedBean fmb = (FooManagedBean)
- sessionCtx.lookup("java:module/foomanagedbean");
+ FooManagedBean fmb = (FooManagedBean)
+ sessionCtx.lookup("java:module/foomanagedbean");
- // Make sure dependencies declared in java:comp are visible
- // via equivalent java:module entries since this is a
- // .war
- SessionContext sessionCtx2 = (SessionContext)
- sessionCtx.lookup("java:module/env/com.acme.StatelessBean/sessionCtx");
+ // Make sure dependencies declared in java:comp are visible
+ // via equivalent java:module entries since this is a
+ // .war
+ SessionContext sessionCtx2 = (SessionContext)
+ sessionCtx.lookup("java:module/env/com.acme.StatelessBean/sessionCtx");
- SingletonBean singleton2 = (SingletonBean)
- sessionCtx2.lookup("java:module/env/stateless/singletonref");
+ SingletonBean singleton2 = (SingletonBean)
+ sessionCtx2.lookup("java:module/env/stateless/singletonref");
- // Lookup a comp env dependency declared by another ejb in the .war
- SingletonBean singleton3 = (SingletonBean)
- sessionCtx2.lookup("java:comp/env/com.acme.SingletonBean/me");
+ // Lookup a comp env dependency declared by another ejb in the .war
+ SingletonBean singleton3 = (SingletonBean)
+ sessionCtx2.lookup("java:comp/env/com.acme.SingletonBean/me");
- // Lookup a comp env dependency declared by a servlet
- FooManagedBean fmbServlet = (FooManagedBean)
- sessionCtx.lookup("java:comp/env/foo2ref");
- FooManagedBean fmbServlet2 = (FooManagedBean)
- sessionCtx.lookup("java:module/env/foo2ref");
+ // Lookup a comp env dependency declared by a servlet
+ FooManagedBean fmbServlet = (FooManagedBean)
+ sessionCtx.lookup("java:comp/env/foo2ref");
+ FooManagedBean fmbServlet2 = (FooManagedBean)
+ sessionCtx.lookup("java:module/env/foo2ref");
- // Ensure that each injected or looked up managed bean
- // instance is unique
- Object fooThis = foo.getThis();
- Object foo2This = foo2.getThis();
- Object fmbThis = fmb.getThis();
+ // Ensure that each injected or looked up managed bean
+ // instance is unique
+ Object fooThis = foo.getThis();
+ Object foo2This = foo2.getThis();
+ Object fmbThis = fmb.getThis();
- System.out.println("fooThis = " + fooThis);
- System.out.println("foo2This = " + foo2This);
- System.out.println("fmbThis = " + fmbThis);
- System.out.println("fmbServlet = " + fmbServlet);
- System.out.println("fmbServlet2 = " + fmbServlet2);
+ System.out.println("fooThis = " + fooThis);
+ System.out.println("foo2This = " + foo2This);
+ System.out.println("fmbThis = " + fmbThis);
+ System.out.println("fmbServlet = " + fmbServlet);
+ System.out.println("fmbServlet2 = " + fmbServlet2);
- if( ( fooThis == foo2This ) || ( fooThis == fmbThis ) ||
- ( foo2This == fmbThis ) ) {
- throw new EJBException("Managed bean instances not unique");
- }
+ if( ( fooThis == foo2This ) || ( fooThis == fmbThis ) ||
+ ( foo2This == fmbThis ) ) {
+ throw new EJBException("Managed bean instances not unique");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In StatelessBean:destroy()");
+ System.out.println("In StatelessBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties
index 211d2c4..52cc5c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-jaxrs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java
index b5f0fa4..230f4d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/ContextListener.java
@@ -30,53 +30,53 @@
public void contextInitialized(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextInitialized");
+ System.out.println("In ContextListener::contextInitialized");
- try {
+ try {
- FooManagedBean f = (FooManagedBean)
- new InitialContext().lookup("java:module/FooManagedBean");
- f.hello();
+ FooManagedBean f = (FooManagedBean)
+ new InitialContext().lookup("java:module/FooManagedBean");
+ f.hello();
- Object jaxrsEjbGlue = new InitialContext().lookup("java:org.glassfish.ejb.container.interceptor_binding_spi");
- System.out.println("jaxrsEjbGlue = " + jaxrsEjbGlue);
- Method m = jaxrsEjbGlue.getClass().getMethod("registerInterceptor", java.lang.Object.class);
- System.out.println("register interceptor method = " + m);
+ Object jaxrsEjbGlue = new InitialContext().lookup("java:org.glassfish.ejb.container.interceptor_binding_spi");
+ System.out.println("jaxrsEjbGlue = " + jaxrsEjbGlue);
+ Method m = jaxrsEjbGlue.getClass().getMethod("registerInterceptor", java.lang.Object.class);
+ System.out.println("register interceptor method = " + m);
- m.invoke(jaxrsEjbGlue, new com.sun.jersey.JerseyInterceptor());
+ m.invoke(jaxrsEjbGlue, new com.sun.jersey.JerseyInterceptor());
- // Test InjectionManager managed bean functionality
- Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
- Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
- System.out.println("create managed object method = " + createManagedMethod);
- FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
- f2.hello();
- f2.assertInterceptorBinding();
+ // Test InjectionManager managed bean functionality
+ Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
+ Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
+ System.out.println("create managed object method = " + createManagedMethod);
+ FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
+ f2.hello();
+ f2.assertInterceptorBinding();
- Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
- System.out.println("destroy managed object method = " + destroyManagedMethod);
- destroyManagedMethod.invoke(injectionMgr, f2);
+ Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
+ System.out.println("destroy managed object method = " + destroyManagedMethod);
+ destroyManagedMethod.invoke(injectionMgr, f2);
- FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
- System.out.println("FooNonManagedBean = " + nonF);
- nonF.hello();
- destroyManagedMethod.invoke(injectionMgr, nonF);
-
- } catch(Exception e) {
- e.printStackTrace();
- }
+ FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
+ System.out.println("FooNonManagedBean = " + nonF);
+ nonF.hello();
+ destroyManagedMethod.invoke(injectionMgr, nonF);
+
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
@PostConstruct
public void pc() {
- System.out.println("In ContextListener::postConstruct");
+ System.out.println("In ContextListener::postConstruct");
}
public void contextDestroyed(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextDestroyed");
+ System.out.println("In ContextListener::contextDestroyed");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
index b25b5b3..09cffcf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
@@ -31,23 +31,23 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean:init()");
+ System.out.println("In FooManagedBean:init()");
}
public void hello() {
- System.out.println("In FooManagedBean::hello()");
+ System.out.println("In FooManagedBean::hello()");
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new RuntimeException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new RuntimeException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean:destroy()");
+ System.out.println("In FooManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
index 09dcb22..3c706cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooNonManagedBean.java
@@ -24,25 +24,25 @@
public class FooNonManagedBean {
- @Resource
+ @Resource
private UserTransaction ut;
@PostConstruct
private void init() {
- if( ut == null ) {
- throw new IllegalStateException("ut is null");
- }
+ if( ut == null ) {
+ throw new IllegalStateException("ut is null");
+ }
- System.out.println("In FooNonManagedBean:init()");
+ System.out.println("In FooNonManagedBean:init()");
}
public void hello() {
- System.out.println("In FooNonManagedBean::hello()");
+ System.out.println("In FooNonManagedBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In FooNonManagedBean:destroy()");
+ System.out.println("In FooNonManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
index 4fb5328..e12d372 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
@@ -44,37 +44,37 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- simpleSingleton.hello();
- simpleStateless.hello();
+ simpleSingleton.hello();
+ simpleStateless.hello();
- simpleSingleton.assertInterceptorBinding();
- System.out.println("Singleton interceptor binding asserted");
+ simpleSingleton.assertInterceptorBinding();
+ System.out.println("Singleton interceptor binding asserted");
- simpleStateless.assertInterceptorBinding();
- System.out.println("Stateless interceptor binding asserted");
+ simpleStateless.assertInterceptorBinding();
+ System.out.println("Stateless interceptor binding asserted");
- fooManagedBean.assertInterceptorBinding();
- System.out.println("FooManagedBean interceptor binding asserted");
- fooManagedBean.hello();
+ fooManagedBean.assertInterceptorBinding();
+ System.out.println("FooManagedBean interceptor binding asserted");
+ fooManagedBean.hello();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
index 7ca7529..59c9783 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
@@ -28,21 +28,21 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::aroundInvoke() ");
- return c.proceed();
+ System.out.println("In InterceptorA::aroundInvoke() ");
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorA::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
index a178650..2ded041 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
@@ -28,24 +28,24 @@
@PostConstruct
private void init(InvocationContext context) throws Exception {
- Object beanInstance = context.getTarget();
+ Object beanInstance = context.getTarget();
- System.out.println("In JerseyInterceptor::init() : " +
- beanInstance);
+ System.out.println("In JerseyInterceptor::init() : " +
+ beanInstance);
- if( beanInstance instanceof SingletonBean ) {
- ((SingletonBean) beanInstance).interceptorWasHere = true;
- } else if( beanInstance instanceof StatelessBean ) {
- ((StatelessBean) beanInstance).interceptorWasHere = true;
- } else if( beanInstance instanceof FooManagedBean ) {
- ((FooManagedBean) beanInstance).interceptorWasHere = true;
- }
+ if( beanInstance instanceof SingletonBean ) {
+ ((SingletonBean) beanInstance).interceptorWasHere = true;
+ } else if( beanInstance instanceof StatelessBean ) {
+ ((StatelessBean) beanInstance).interceptorWasHere = true;
+ } else if( beanInstance instanceof FooManagedBean ) {
+ ((FooManagedBean) beanInstance).interceptorWasHere = true;
+ }
- // ...
+ // ...
- // Invoke next interceptor in chain
- context.proceed();
+ // Invoke next interceptor in chain
+ context.proceed();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
index d382256..923a55a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
@@ -39,41 +39,41 @@
@PostConstruct
private void init() {
- System.out.println("In SingletonBean:init() ");
-
- try {
- InitialContext ic = new InitialContext();
+ System.out.println("In SingletonBean:init() ");
- // Lookup simple form of portable JNDI name
- stateless = (StatelessBean)
- ic.lookup("java:module/StatelessBean");
+ try {
+ InitialContext ic = new InitialContext();
- stateless.hello();
+ // Lookup simple form of portable JNDI name
+ stateless = (StatelessBean)
+ ic.lookup("java:module/StatelessBean");
- // Lookup fully-qualified for of portable JNDI name
- stateless2 = (StatelessBean)
- ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
-
- } catch(NamingException ne) {
- throw new EJBException(ne);
- }
+ stateless.hello();
+
+ // Lookup fully-qualified for of portable JNDI name
+ stateless2 = (StatelessBean)
+ ic.lookup("java:module/StatelessBean!com.acme.StatelessBean");
+
+ } catch(NamingException ne) {
+ throw new EJBException(ne);
+ }
}
public void hello() {
- System.out.println("In SingletonBean:hello()");
- stateless.hello();
- stateless2.hello();
+ System.out.println("In SingletonBean:hello()");
+ stateless.hello();
+ stateless2.hello();
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new EJBException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new EJBException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean:destroy()");
+ System.out.println("In SingletonBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
index b10e34c..e764c45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
@@ -31,23 +31,23 @@
@PostConstruct
private void init() {
- System.out.println("In StatelessBean:init()");
+ System.out.println("In StatelessBean:init()");
}
public void hello() {
- System.out.println("In StatelessBean::hello()");
+ System.out.println("In StatelessBean::hello()");
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new EJBException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new EJBException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In StatelessBean:destroy()");
+ System.out.println("In StatelessBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties
index 147474e..6b2cc88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-managedbean"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml
index b6a3e36..9f325ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/build.xml
@@ -34,11 +34,11 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java
index 383af3d..be3d140 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/Foo.java
@@ -22,7 +22,7 @@
public class Foo {
- @Resource ManagedBean1Int m;
-
+ @Resource ManagedBean1Int m;
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
index 80e7e8c..eb534b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
@@ -36,103 +36,103 @@
@WebServlet(urlPatterns="/HelloServlet", loadOnStartup=1)
public class HelloServlet extends HttpServlet {
- @Resource
+ @Resource
private ManagedBeanExtra mbExtra;
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
- mbExtra.hello();
+ System.out.println("In HelloServlet::init");
+ mbExtra.hello();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- int numIter = 2;
+ int numIter = 2;
- try {
+ try {
- doTest(numIter, "java:module/ManagedBeanNoInt", 0, "");
- doTest(numIter, "java:module/ManagedBean1Int", numIter, "A");
- doTest(numIter, "java:module/ManagedBean2Int", numIter*2, "AB");
- doTest(numIter, "java:module/ManagedBean2IntPlusBean", numIter*2, "ABM");
- doTest(numIter, "java:module/ManagedBeanNoIntPlusBean", 0, "M");
+ doTest(numIter, "java:module/ManagedBeanNoInt", 0, "");
+ doTest(numIter, "java:module/ManagedBean1Int", numIter, "A");
+ doTest(numIter, "java:module/ManagedBean2Int", numIter*2, "AB");
+ doTest(numIter, "java:module/ManagedBean2IntPlusBean", numIter*2, "ABM");
+ doTest(numIter, "java:module/ManagedBeanNoIntPlusBean", 0, "M");
- doTest(numIter, "java:module/ManagedBean2IntExcludeClass", numIter*2, "");
+ doTest(numIter, "java:module/ManagedBean2IntExcludeClass", numIter*2, "");
- doTest(numIter, "java:module/ManagedBean1Class1MethodLevelInt", numIter*1, "BA");
+ doTest(numIter, "java:module/ManagedBean1Class1MethodLevelInt", numIter*1, "BA");
- doTest(numIter, "java:module/ManagedBean1MethodLevelIntExcludeClass",
- numIter*1, "A");
+ doTest(numIter, "java:module/ManagedBean1MethodLevelIntExcludeClass",
+ numIter*1, "A");
- doTest(numIter, "java:module/ManagedBean2MethodLevelInt", 0, "AB");
-
-
- } catch(Exception e) {
- throw new RuntimeException(e);
- }
-
+ doTest(numIter, "java:module/ManagedBean2MethodLevelInt", 0, "AB");
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ }
+
+
+
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
private void doTest(int numIter, String lookup, int numInterceptors,
- String aroundInvoke) throws Exception {
+ String aroundInvoke) throws Exception {
- System.out.println("Test " + lookup + " Expect numInstances = " + numIter +
- " , numInterceptors = " + numInterceptors +
- " , aroundInvoke = " + aroundInvoke);
- for(int i = 0; i < numIter; i++) {
- ManagedBeanSuper mb = (ManagedBeanSuper) new InitialContext().lookup(lookup);
+ System.out.println("Test " + lookup + " Expect numInstances = " + numIter +
+ " , numInterceptors = " + numInterceptors +
+ " , aroundInvoke = " + aroundInvoke);
+ for(int i = 0; i < numIter; i++) {
+ ManagedBeanSuper mb = (ManagedBeanSuper) new InitialContext().lookup(lookup);
- try {
- mb.throwAppException();
- throw new RuntimeException("Expected AppException , got nothing");
- } catch(AppException ae) {
- System.out.println("Successfully caught AppException");
- } catch(Throwable t) {
- throw new RuntimeException("Expected AppException , got " + t, t);
- }
+ try {
+ mb.throwAppException();
+ throw new RuntimeException("Expected AppException , got nothing");
+ } catch(AppException ae) {
+ System.out.println("Successfully caught AppException");
+ } catch(Throwable t) {
+ throw new RuntimeException("Expected AppException , got " + t, t);
+ }
- try {
- mb.throwIllegalArgumentException();
- throw new RuntimeException("Expected IllegalArgumentException , got nothing");
- } catch(IllegalArgumentException iae) {
- System.out.println("Successfully caught IllegalArgumentException");
- } catch(Throwable t) {
- throw new RuntimeException("Expected IllegalArgumentException , got " + t, t);
- }
+ try {
+ mb.throwIllegalArgumentException();
+ throw new RuntimeException("Expected IllegalArgumentException , got nothing");
+ } catch(IllegalArgumentException iae) {
+ System.out.println("Successfully caught IllegalArgumentException");
+ } catch(Throwable t) {
+ throw new RuntimeException("Expected IllegalArgumentException , got " + t, t);
+ }
- if( i == (numIter - 1) ) {
- int actualNumInst = mb.getNumInstances();
- int actualNumInter = mb.getNumInterceptorInstances();
- String actualAround = mb.getAroundInvokeSequence();
- System.out.println("actual num Instances = " + actualNumInst);
- System.out.println("actual num Interceptors = " + actualNumInter);
- System.out.println("actual around invoke sequence = " + actualAround);
+ if( i == (numIter - 1) ) {
+ int actualNumInst = mb.getNumInstances();
+ int actualNumInter = mb.getNumInterceptorInstances();
+ String actualAround = mb.getAroundInvokeSequence();
+ System.out.println("actual num Instances = " + actualNumInst);
+ System.out.println("actual num Interceptors = " + actualNumInter);
+ System.out.println("actual around invoke sequence = " + actualAround);
- if( ( actualNumInst != numIter ) || (actualNumInter != numInterceptors) ||
- !actualAround.equals(aroundInvoke) ) {
- throw new RuntimeException("actual results failure for " + lookup);
- }
- }
+ if( ( actualNumInst != numIter ) || (actualNumInter != numInterceptors) ||
+ !actualAround.equals(aroundInvoke) ) {
+ throw new RuntimeException("actual results failure for " + lookup);
+ }
+ }
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
index 010f5ab..bbfa5fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
@@ -33,27 +33,27 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::aroundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "A" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In InterceptorA::aroundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "A" + result;
+ } else {
+ return c.proceed();
+ }
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorA::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
index cceb79f..f6dbfa4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
@@ -33,27 +33,27 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::init() ");
- ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
- c.proceed();
+ System.out.println("In InterceptorB::init() ");
+ ((ManagedBeanSuper)c.getTarget()).newInterceptorInstance();
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::aroundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "B" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In InterceptorB::aroundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "B" + result;
+ } else {
+ return c.proceed();
+ }
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorB::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorB::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
index 7280cf6..24cc491 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
@@ -26,20 +26,20 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorSuper::init() ");
- c.proceed();
+ System.out.println("In InterceptorSuper::init() ");
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorSuper::aroundInvoke() ");
- return c.proceed();
+ System.out.println("In InterceptorSuper::aroundInvoke() ");
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In InterceptorSuper::destroy() ");
- c.proceed();
+ System.out.println("In InterceptorSuper::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
index eaa810f..6c49077 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
@@ -31,26 +31,26 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@Interceptors({InterceptorA.class})
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
index 36ed250..8f03640 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
@@ -29,20 +29,20 @@
static private int numInterceptorInstances = 0;
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
-
+
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
index eecadc0..93b828c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
@@ -32,27 +32,27 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@Interceptors({InterceptorA.class})
@ExcludeClassInterceptors
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
index 58a0b6b..d6762ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
@@ -31,22 +31,22 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
-
+
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
index 4f8646c..461d365 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
@@ -20,7 +20,7 @@
import jakarta.interceptor.Interceptors;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.InvocationContext;
-import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
@ManagedBean("ManagedBean2IntExcludeClass")
@Interceptors({InterceptorA.class, InterceptorB.class})
@@ -32,25 +32,25 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@ExcludeClassInterceptors
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
index 0fee3de..daa135b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
@@ -31,31 +31,31 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In ManagedBean2IntPlusBean::roundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "M" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In ManagedBean2IntPlusBean::roundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "M" + result;
+ } else {
+ return c.proceed();
+ }
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
index acb323a..05dd55c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
@@ -30,26 +30,26 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@Interceptors({InterceptorA.class, InterceptorB.class})
public String getAroundInvokeSequence() {
- return "";
+ return "";
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java
index 5313a8d..333b7bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoInt.java
@@ -25,12 +25,12 @@
static private int numInstances = 0;
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
index d00d87a..c23f1fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
@@ -30,31 +30,31 @@
private String aroundInvoke = "";
public void newInterceptorInstance() {
- numInterceptorInstances++;
+ numInterceptorInstances++;
}
public int getNumInstances() {
- return numInstances;
+ return numInstances;
}
public int getNumInterceptorInstances() {
- return numInterceptorInstances;
+ return numInterceptorInstances;
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In ManagedBeanNoIntPlusBean::roundInvoke() ");
- if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
- String result = (String) c.proceed();
- return "M" + result;
- } else {
- return c.proceed();
- }
+ System.out.println("In ManagedBeanNoIntPlusBean::roundInvoke() ");
+ if( c.getMethod().getName().equals("getAroundInvokeSequence") ) {
+ String result = (String) c.proceed();
+ return "M" + result;
+ } else {
+ return c.proceed();
+ }
}
@PostConstruct
private void init() {
- numInstances++;
+ numInstances++;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java
index 7359c20..48bcf5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanSuper.java
@@ -27,12 +27,12 @@
public String getAroundInvokeSequence() { return ""; }
public String throwAppException() throws AppException {
- throw new AppException();
+ throw new AppException();
}
public String throwIllegalArgumentException() {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties
index e1ab5cc..b349a6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-ejblite-sinitcallejb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml
index 208cde2..f9ff039 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
index 8b8a434..73e0c2e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
@@ -33,20 +33,20 @@
public void contextInitialized(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextInitialized");
+ System.out.println("In ContextListener::contextInitialized");
- simpleStateless.hello();
+ simpleStateless.hello();
}
@PostConstruct
public void pc() {
- System.out.println("In ContextListener::postConstruct");
+ System.out.println("In ContextListener::postConstruct");
}
public void contextDestroyed(ServletContextEvent sce) {
- System.out.println("In ContextListener::contextDestroyed");
+ System.out.println("In ContextListener::contextDestroyed");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
index 7ae875f..0cab3ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
@@ -46,59 +46,59 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
- simpleSingleton.hello();
- simpleStateless.hello();
- simpleStateful.hello();
+ System.out.println("In HelloServlet::init");
+ simpleSingleton.hello();
+ simpleStateless.hello();
+ simpleStateful.hello();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- simpleSingleton.hello();
+ simpleSingleton.hello();
- try {
- simpleStateless.helloPackage();
- throw new RuntimeException("Expected exception when calling package-private method");
- } catch(EJBException e) {
- System.out.println("Successfully got exception when calling package private method on no-interface view");
- }
+ try {
+ simpleStateless.helloPackage();
+ throw new RuntimeException("Expected exception when calling package-private method");
+ } catch(EJBException e) {
+ System.out.println("Successfully got exception when calling package private method on no-interface view");
+ }
- try {
- simpleStateless.helloProtected();
- throw new RuntimeException("Expected exception when calling protected method");
- } catch(EJBException e) {
- System.out.println("Successfully got exception when calling protected method on no-interface view");
- }
+ try {
+ simpleStateless.helloProtected();
+ throw new RuntimeException("Expected exception when calling protected method");
+ } catch(EJBException e) {
+ System.out.println("Successfully got exception when calling protected method on no-interface view");
+ }
- try {
- InitialContext ic = new InitialContext();
- for (NamingEnumeration<Binding> e = ic.listBindings("java:comp/env"); e.hasMore(); ) {
+ try {
+ InitialContext ic = new InitialContext();
+ for (NamingEnumeration<Binding> e = ic.listBindings("java:comp/env"); e.hasMore(); ) {
Binding b = e.next();// java:comp/env/xxx
final String name = b.getName().substring("java:comp/env/".length());
final String cl = b.getClassName();
final Object o = b.getObject();
- System.out.println("binding = " + b + " , name = " + name + " , cl = " + cl + " , object = " + o);
- if( !b.getName().startsWith("java:comp/env") ) {
- throw new RuntimeException("invalid returned env entry prefix");
- }
- }
- // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
- } catch(Exception e) {
- throw new ServletException(e);
- }
+ System.out.println("binding = " + b + " , name = " + name + " , cl = " + cl + " , object = " + o);
+ if( !b.getName().startsWith("java:comp/env") ) {
+ throw new RuntimeException("invalid returned env entry prefix");
+ }
+ }
+ // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
+ } catch(Exception e) {
+ throw new ServletException(e);
+ }
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
index 0d7328b..8516013 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
@@ -25,42 +25,42 @@
@Startup
public class SimpleSingleton {
- @Resource
+ @Resource
private SessionContext sessionCtx;
@PostConstruct
private void init() {
- System.out.println("In SimpleSingleton:init()");
+ System.out.println("In SimpleSingleton:init()");
- try {
- SimpleStateless ss = (SimpleStateless)
- sessionCtx.lookup("java:app/env/slref");
- ss.hello();
- System.out.println("Successfully looked up web-component defined environment dependency from @Startup Singleton @PostConstruct");
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ try {
+ SimpleStateless ss = (SimpleStateless)
+ sessionCtx.lookup("java:app/env/slref");
+ ss.hello();
+ System.out.println("Successfully looked up web-component defined environment dependency from @Startup Singleton @PostConstruct");
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
public void hello() {
- System.out.println("In SimpleSingleton:hello()");
- try {
- SimpleStateless ss = (SimpleStateless)
- sessionCtx.lookup("java:app/env/slref");
- ss.hello();
+ System.out.println("In SimpleSingleton:hello()");
+ try {
+ SimpleStateless ss = (SimpleStateless)
+ sessionCtx.lookup("java:app/env/slref");
+ ss.hello();
- // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ // assumes 299 enabled new InitialContext().lookup("java:comp/BeanManager");
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In SimpleSingleton:destroy()");
+ System.out.println("In SimpleSingleton:destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
index 9c519b9..ad70bd8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
@@ -24,18 +24,18 @@
@PostConstruct
private void init() {
- System.out.println("In SimpleStateful:init()");
+ System.out.println("In SimpleStateful:init()");
}
public void hello() {
- System.out.println("In SimpleStateful:hello()");
+ System.out.println("In SimpleStateful:hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In SimpleStateful:destroy()");
+ System.out.println("In SimpleStateful:destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
index 066d15b..b2b59a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
@@ -24,26 +24,26 @@
@PostConstruct
private void init() {
- System.out.println("In SimpleStateless:init()");
+ System.out.println("In SimpleStateless:init()");
}
public void hello() {
- System.out.println("In SimpleStateless:hello()");
+ System.out.println("In SimpleStateless:hello()");
}
protected void helloProtected() {
- System.out.println("In SimpleStateless:helloProtected()");
+ System.out.println("In SimpleStateless:helloProtected()");
}
void helloPackage() {
- System.out.println("In SimpleStateless:helloPackage()");
+ System.out.println("In SimpleStateless:helloPackage()");
}
@PreDestroy
private void destroy() {
- System.out.println("In SimpleStateless:destroy()");
+ System.out.println("In SimpleStateless:destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties
index a74c3cb..7604f52 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-basic"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml
index c0f5847..1cff99d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
index fc08df8..7c0e443 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
@@ -85,7 +85,7 @@
} else {
stat.addStatus("create container with a wrong provider", stat.PASS);
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.err.println("==> Caught expected: " + e.getMessage());
stat.addStatus("create container with a wrong provider", stat.PASS);
}
@@ -128,7 +128,7 @@
stat.addStatus("create container without closing the current", stat.FAIL);
System.err.println("==> ERROR: Created another container without closing the current...");
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.err.println("==> Caught expected: " + e.getMessage());
stat.addStatus("create container without closing the current", stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml
index 44f7adf..d1e26bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/build.xml
@@ -91,7 +91,7 @@
<!-- These tests require Full Profile -->
<antcall target="modulewithappname"/>
<antcall target="twomodules"/>
- <antcall target="twomoduleswithlibs"/>
+ <antcall target="twomoduleswithlibs"/>
<antcall target="ejbandwar"/>
<!-- These 2 tests will stop domain to run -->
<antcall target="mdb"/>
@@ -118,7 +118,7 @@
<target name="timertest">
<record name="timertest.output" action="start" />
- <echo>Running timertest target ${timer.test.type} </echo>
+ <echo>Running timertest target ${timer.test.type} </echo>
<ant dir="timertest" target="${timer.test.type}"/>
<record name="timertest.output" action="stop" />
</target>
@@ -190,9 +190,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-embedded tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-embedded tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties
index 74c4b04..fbda21f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-datasourcedef"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml
index 6263e26..7d3bbbb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties
index d4bb31a..42617ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-ejbwandwar"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-web"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-web"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml
index 04d8a3f..668a04f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -84,15 +84,15 @@
</delete>
<move file="${build.classes.dir}/tmp" tofile="${assemble.dir}/tmp"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_war"/>
<antcall target="run_dir"/>
</target>
-
+
<target name="run_war" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-other.jar:${assemble.dir}/${appname}-web.war:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -103,7 +103,7 @@
<target name="run_dir" depends="init-common">
<mkdir dir="${assemble.dir}/other"/>
<unzip src="${assemble.dir}/${appname}-other.jar" dest="${assemble.dir}/other"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/tmp:${assemble.dir}/other:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml
index b620395..47d9a15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/descriptor/web.xml
@@ -19,6 +19,6 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
- version="3.0">
+ version="3.0">
<module-name>sample</module-name>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties
index 5aa1365..b5d1a63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-ejbwinwar"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-web"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-web"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml
index 0f35cfd..8883578 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -75,15 +75,15 @@
</delete>
<move file="${build.classes.dir}/tmp" tofile="${assemble.dir}/tmp"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_war"/>
<antcall target="run_dir"/>
</target>
-
+
<target name="run_war" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-web.war:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -93,7 +93,7 @@
<target name="run_war_installed_instance" depends="init-common">
<antcall target="start-database"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-web.war:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -114,7 +114,7 @@
</target>
<target name="run_dir" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/tmp:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml
index b620395..47d9a15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/descriptor/web.xml
@@ -19,6 +19,6 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
- version="3.0">
+ version="3.0">
<module-name>sample</module-name>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties
index 02089ee..226ef0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-embedasync"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml
index 8fa95d8..8c95124 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,10 +46,10 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="descriptor/beans.xml" todir="${build.classes.dir}/META-INF"/>
- <!--
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <copy file="descriptor/beans.xml" todir="${build.classes.dir}/META-INF"/>
+ <!--
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*.class">
</jar>
@@ -57,15 +57,15 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
index cdb0d29..d0a44d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
@@ -50,46 +50,46 @@
// ok now let's look up the EJB...
Context ic = c.getContext();
try {
- System.out.println("Sleeping for a second...");
- Thread.sleep(1000);
+ System.out.println("Sleeping for a second...");
+ Thread.sleep(1000);
- SingletonBean sb = (SingletonBean) ic.
- lookup("java:global/classes/SingletonBean!com.acme.SingletonBean");
- sb.hello();
+ SingletonBean sb = (SingletonBean) ic.
+ lookup("java:global/classes/SingletonBean!com.acme.SingletonBean");
+ sb.hello();
- StatefulBean sfTimeout = (StatefulBean) ic.
- lookup("java:global/classes/StatefulBean");
- StatefulBean2 sfNoTimeout = (StatefulBean2) ic.
- lookup("java:global/classes/StatefulBean2");
- sfTimeout.hello();
- sfNoTimeout.hello();
+ StatefulBean sfTimeout = (StatefulBean) ic.
+ lookup("java:global/classes/StatefulBean");
+ StatefulBean2 sfNoTimeout = (StatefulBean2) ic.
+ lookup("java:global/classes/StatefulBean2");
+ sfTimeout.hello();
+ sfNoTimeout.hello();
- System.out.println("Sleeping to wait for sf bean to be removed ...");
- Thread.sleep(7000);
- System.out.println("Waking up , checking sf bean existence");
+ System.out.println("Sleeping to wait for sf bean to be removed ...");
+ Thread.sleep(7000);
+ System.out.println("Waking up , checking sf bean existence");
- try {
- sfTimeout.hello();
- throw new RuntimeException("StatefulTimeout(0) bean should have timed out");
- } catch(EJBException e) {
- System.out.println("Stateful bean successfully timed out");
- }
+ try {
+ sfTimeout.hello();
+ throw new RuntimeException("StatefulTimeout(0) bean should have timed out");
+ } catch(EJBException e) {
+ System.out.println("Stateful bean successfully timed out");
+ }
- sfNoTimeout.hello();
- System.out.println("Stateful bean with longer timeout is still around");
+ sfNoTimeout.hello();
+ System.out.println("Stateful bean with longer timeout is still around");
- /**
- HelloRemote hr = (HelloRemote) ic.
- lookup("java:global/classes/SingletonBean!com.acme.HelloRemote");
- hr.hello();
- */
+ /**
+ HelloRemote hr = (HelloRemote) ic.
+ lookup("java:global/classes/SingletonBean!com.acme.HelloRemote");
+ hr.hello();
+ */
- if( sb.getPassed() ) {
- System.out.println("getPassed() returned true");
- stat.addStatus("embedded async test", stat.PASS);
- } else {
- throw new EJBException("getPassed() returned false");
- }
+ if( sb.getPassed() ) {
+ System.out.println("getPassed() returned true");
+ stat.addStatus("embedded async test", stat.PASS);
+ } else {
+ throw new EJBException("getPassed() returned false");
+ }
} catch (Exception e) {
stat.addStatus("embedded async test", stat.FAIL);
System.out.println("ERROR calling EJB:");
@@ -97,8 +97,8 @@
}
System.out.println("Closing container");
-
- c.close();
+
+ c.close();
System.out.println("Done Closing container");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
index 1ad414f..606e25c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
@@ -39,36 +39,36 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- System.out.println("Thread = " + Thread.currentThread());
- me.fooAsync();
+ System.out.println("Thread = " + Thread.currentThread());
+ me.fooAsync();
- try {
- BeanManager beanMgr = (BeanManager)
- new InitialContext().lookup("java:comp/BeanManager");
- System.out.println("Successfully retrieved bean manager " +
- beanMgr + " for JCDI enabled app");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
-
+ try {
+ BeanManager beanMgr = (BeanManager)
+ new InitialContext().lookup("java:comp/BeanManager");
+ System.out.println("Successfully retrieved bean manager " +
+ beanMgr + " for JCDI enabled app");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
+
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
- return "hello, world!\n";
+ System.out.println("In SingletonBean::hello()");
+ return "hello, world!\n";
}
@Asynchronous
public void fooAsync() {
- System.out.println("In SingletonBean::fooAsync()");
- System.out.println("Thread = " + Thread.currentThread());
- gotAsyncCall = true;
+ System.out.println("In SingletonBean::fooAsync()");
+ System.out.println("Thread = " + Thread.currentThread());
+ gotAsyncCall = true;
}
public boolean getPassed() {
- return gotAsyncCall;
+ return gotAsyncCall;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
index 98550db..34568d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
@@ -26,8 +26,8 @@
public class StatefulBean {
@Inject
- public StatefulBean(SingletonBean sing) {
- System.out.println("In StatefulBean ctor sing = " + sing);
+ public StatefulBean(SingletonBean sing) {
+ System.out.println("In StatefulBean ctor sing = " + sing);
}
@PostConstruct
@@ -36,7 +36,7 @@
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
index ae2767f..c1a2fd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
@@ -30,7 +30,7 @@
}
public void hello() {
- System.out.println("In StatefulBean2::hello()");
+ System.out.println("In StatefulBean2::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml
index 5c5f2aa..48d775f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedded.xml
@@ -27,7 +27,7 @@
<condition property="uber.jar" value="${uber.jar.repo}/repository/org/glassfish/extras/glassfish-embedded-all/3.1-SNAPSHOT/glassfish-embedded-all-3.1-SNAPSHOT.jar">
<and>
- <isset property="uber.mode"/>
+ <isset property="uber.mode"/>
<not>
<isset property="uber.jar"/>
</not>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties
index 1257fe4..01d10c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-jaxrs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-web"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-web"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml
index 94f49cb..832aefd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-util"/>
<antcall target="compile-common">
@@ -75,25 +75,25 @@
</delete>
<move file="${build.classes.dir}/tmp" tofile="${assemble.dir}/tmp"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_ejb"/>
<!-- Doesn't work
<antcall target="run_rest"/>
-->
</target>
-
+
<target name="run_ejb" depends="init-common">
<antcall target="run_war_ejb"/>
<antcall target="run_dir_ejb"/>
</target>
-
+
<target name="run_rest" depends="init-common">
<antcall target="run_war_rest"/>
<antcall target="run_dir_rest"/>
</target>
-
+
<target name="run_war_ejb" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/${appname}-web.war"/>
@@ -101,7 +101,7 @@
<param name="packaging" value="war"/>
</antcall>
</target>
-
+
<target name="run_war_rest" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/${appname}-web.war"/>
@@ -109,7 +109,7 @@
<param name="packaging" value="war"/>
</antcall>
</target>
-
+
<target name="run_dir_ejb" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/tmp"/>
@@ -117,7 +117,7 @@
<param name="packaging" value="dir"/>
</antcall>
</target>
-
+
<target name="run_dir_rest" depends="init-common">
<antcall target="run_test">
<param name="test-path" value="${assemble.dir}/tmp"/>
@@ -125,9 +125,9 @@
<param name="packaging" value="dir"/>
</antcall>
</target>
-
+
<target name="run_test" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${test-path}:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
index ee5e095..af7391a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
@@ -128,7 +128,7 @@
e.printStackTrace();
}
}
- }
+ }
stat.addStatus("EJB embedded " + appName + " EJB", (pass)? stat.PASS : stat.FAIL);
System.out.println("..........FINISHED test");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml
index ae8a8a1..162bb0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/descriptor/web.xml
@@ -19,7 +19,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
- version="3.0">
+ version="3.0">
<module-name>sample</module-name>
<servlet>
<servlet-name>jakarta.ws.rs.core.Application</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties
index 96fc181..e168505 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-manifestonly"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml
index 4ce5a82..3a76dc0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-client.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-client.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Client.class">
</jar>
@@ -75,15 +75,15 @@
<attribute name="Class-Path" value="file:${assemble.dir}/${appname}-ejb.jar file:${assemble.dir}/${appname}-client.jar file:${env.APS_HOME}/lib/reporter.jar"/>
</manifest>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-all.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties
index 00490d9..c0d10d9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-mdb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
index 9d809ae..b39635e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,14 +51,14 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<echo message="...Starting DAS to create JMS resources...."/>
<antcall target="startDomain"/>
@@ -91,8 +91,8 @@
<antcall target="stopDomain"/>
<echo message="Domain has beed STOPPED to run the test"/>
- </target>
-
+ </target>
+
<target name="unsetup" depends="init-common">
<echo message="...Starting DAS to delete JMS resources...."/>
<antcall target="startDomain"/>
@@ -120,15 +120,15 @@
<!-- Should domain be stopped? -->
<antcall target="stopDomain"/>
<echo message="Domain has beed STOPPED"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties
index d81c41a..2464a3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithappname"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml
index 3d55b97..e448e66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-util"/>
<antcall target="compile-common">
@@ -50,31 +50,31 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties
index ed9b49f..4a3488f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithinheritance"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml
index 4afe4c7..d0aa5a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,36 +49,36 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<jar jarfile="${assemble.dir}/${appname}-base.jar"
basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleBase.class,**/SimpleInterface.class">
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${assemble.dir}/${appname}-base.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
index 30538e3..9d63c21 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
@@ -76,7 +76,7 @@
stat.addStatus("EJB embedded create container", stat.FAIL);
System.out.println("Created another container without closing the current...");
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.out.println("Caught expected: " + e.getMessage());
stat.addStatus("EJB embedded create container", stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties
index b7bab8d..426a584 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithlibs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml
index 8c36647..c12664e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,36 +49,36 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<jar jarfile="${assemble.dir}/${appname}-base.jar"
basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleBase.class,**/SimpleInterface.class">
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${assemble.dir}/${appname}-base.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
index 735fef6..6eaea7e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
@@ -76,7 +76,7 @@
stat.addStatus("EJB embedded create container", stat.FAIL);
System.out.println("Created another container without closing the current...");
}
- } catch (EJBException e) {
+ } catch (EJBException e) {
System.out.println("Caught expected: " + e.getMessage());
stat.addStatus("EJB embedded create container", stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties
index cbc1e46..31a82d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-modulewithmanifest"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml
index 2a92688..e3b6a76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,34 +49,34 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
<manifest>
<attribute name="Class-Path" value="file:${assemble.dir}/${appname}-pu.jar"/>
</manifest>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties
index 064f4b8..6d02309 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-profile"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml
index 28b05a7..464b3fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,21 +49,21 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties
index 921596d..ccd4809 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-remote"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml
index e7e865f..01cedc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,28 +51,28 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="stopDomain"/>
<echo message="Domain has beed STOPPED to run the test"/>
<antcall target="run_se"/>
- </target>
-
+ </target>
+
<target name="warn" depends="init-common">
<echo message="Domain was STOPPED to run the test"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties
index ade3a9b..2527f3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-skipjar"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml
index 029e8ae..ab711be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,37 +49,37 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class,**/*Bean.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<jar jarfile="${assemble.dir}/${appname}-client.jar"
basedir="${build.classes.dir}"
update="true" includes ="**/*.class"
manifest="./manifest/MANIFEST.MF">
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
<antcall target="run_se_unpacked"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-client.jar:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -91,7 +91,7 @@
<mkdir dir="${assemble.dir}/${appname}-clientdir"/>
<unzip src="${assemble.dir}/${appname}-client.jar" dest="${assemble.dir}/${appname}-clientdir"/>
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-clientdir:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-pu.jar:${embedded.classpath}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
index ca2784f..c923618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
@@ -17,14 +17,14 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
+import jakarta.ejb.Startup;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.PostConstruct;
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
@@ -32,7 +32,7 @@
@PostConstruct
private void init() {
- System.out.println("ds = " + ds);
+ System.out.println("ds = " + ds);
}
public String foo() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties
index 4f009f8..d0fdf49 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-testclose"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml
index ba0ca42..9b44bef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
index 0a41546..67b6f14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,10 +40,10 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties
index bd44490..c92a9b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-timertest"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml
index 41def7d..1cacfa6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,29 +50,29 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se">
<param name="persistent" value="true"/>
</antcall>
</target>
-
+
<target name="run-non-persistent" depends="init-common">
<antcall target="run_se">
<param name="persistent" value="false"/>
</antcall>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties
index 32ba964..693a58a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-twoc"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml
index afe08a7..5428f3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,24 +49,24 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -74,7 +74,7 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8085"/>
-->
- <arg line="${jndiroot}"/>
+ <arg line="${jndiroot}"/>
</java>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
index b2bd250..285d833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
@@ -31,8 +31,8 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -40,15 +40,15 @@
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties
index 0f0e1a1..d63bd78 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-two-modules"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml
index 26cac94..429f4b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,30 +49,30 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/Simple*.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SingletonBean.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb1.jar:${assemble.dir}/${appname}-ejb2.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
index 4e52ed3..3a13d1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
@@ -80,7 +80,7 @@
e.printStackTrace();
stat.addStatus("EJB embedded module 1", stat.FAIL);
} finally {
- if (c != null)
+ if (c != null)
c.close();
}
System.out.println("..........FINISHED 2 modules Embedded test");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
index 280923c..e80f9f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
@@ -17,8 +17,8 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
-import jakarta.ejb.SessionContext;
+import jakarta.ejb.Startup;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.PermitAll;
@@ -28,7 +28,7 @@
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties
index 049677e..d33d1b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-embedded-two-modules-with-libs"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml
index 3d0d2fd..16e7952 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,35 +54,35 @@
<target name="build-jars">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Ejb.class">
<metainf dir="descriptor">
<include name="ejb-jar.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-pu1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-pu1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleEntity.class,**/SimpleRelated.class">
<metainf dir="descriptor">
<include name="persistence.xml"/>
- </metainf>
+ </metainf>
</jar>
- <jar jarfile="${assemble.dir}/${appname}-base.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-base.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SimpleBase.class,**/SimpleInterface.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/SingletonBean.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="create-dirs">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}/${appname}-ejb1/classes"/>
@@ -97,16 +97,16 @@
<mkdir dir="${assemble.dir}/${appname}-ejb2/classes"/>
<unzip src="${assemble.dir}/${appname}-ejb2.jar" dest="${assemble.dir}/${appname}-ejb2/classes"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se_jars"/>
<antcall target="run_se_dirs"/>
</target>
-
+
<target name="run_se_jars" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb1.jar:${assemble.dir}/${appname}-ejb2.jar:${assemble.dir}/${appname}-base.jar:${assemble.dir}/${appname}-pu1.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -122,7 +122,7 @@
<target name="run_se_dirs" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb2/classes:${assemble.dir}/${appname}-ejb1/classes:${assemble.dir}/${appname}-base/classes:${assemble.dir}/${appname}-pu1:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
index 58ab5f0..9203808 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
@@ -97,7 +97,7 @@
e.printStackTrace();
stat.addStatus("EJB embedded module 1", stat.FAIL);
} finally {
- if (c != null)
+ if (c != null)
c.close();
}
stat.addStatus("EJB embedded module 1", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
index 959b556..0689bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
@@ -31,35 +31,35 @@
@NamedQuery(name = "SimpleEntity.findAll", query = "select e from SimpleEntity e")
})
public class SimpleEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(cascade=PERSIST, fetch=LAZY)
private SimpleRelated related;
-
+
public SimpleEntity(String name) {
setName(name);
}
-
+
public SimpleEntity() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleRelated getRelated() {
return related;
}
public void setRelated(SimpleRelated related) {
this.related = related;
}
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
index 9abf98f..61c4495 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
@@ -27,34 +27,34 @@
@Entity
public class SimpleRelated {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@OneToOne(fetch=LAZY)
private SimpleEntity entity;
-
+
public SimpleRelated(String name) {
setName(name);
}
-
+
public SimpleRelated() {
}
-
+
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
-
+
public SimpleEntity getEntity() {
return entity;
}
public void setEntity(SimpleEntity entity) {
this.entity = entity;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
index 280923c..e80f9f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
@@ -17,8 +17,8 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
-import jakarta.ejb.SessionContext;
+import jakarta.ejb.Startup;
+import jakarta.ejb.SessionContext;
import jakarta.annotation.Resource;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.security.PermitAll;
@@ -28,7 +28,7 @@
/**
* @author Marina Vatkina
*/
-@Singleton
+@Singleton
@Startup
public class SingletonBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java
index 93933d1..7dd5baa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/util/src/ZipUtil.java
@@ -43,7 +43,7 @@
e.printStackTrace();
}
}
-
+
private static final void zip(File directory, File base, ZipOutputStream zos) throws IOException {
File[] files = directory.listFiles();
byte[] buffer = new byte[8192];
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml
index 4787400..5bebb41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/build.xml
@@ -97,9 +97,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-full tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-full tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties
index 8ec207a..c6f04c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-disable_nonportable_jndi"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml
index ffeb40a..e14d29a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run, undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
index aa3d791..9816aaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
@@ -23,7 +23,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -32,10 +32,10 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -44,9 +44,9 @@
public void doTest() {
boolean failed = false;
StringBuilder sb = new StringBuilder();
- try {
+ try {
InitialContext ic = new InitialContext();
- // non-portable global
+ // non-portable global
for(String s : nonPortableJndiNames) {
try {
sb.append("About to lookup " + s);
@@ -58,9 +58,9 @@
}
}
System.out.println(sb);
- stat.addStatus("disable_nonportable_jndi", (failed ? stat.FAIL: stat.PASS));
- } catch(Exception e) {
- e.printStackTrace();
- }
+ stat.addStatus("disable_nonportable_jndi", (failed ? stat.FAIL: stat.PASS));
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
index 610f7a4..b57fbba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
@@ -22,7 +22,7 @@
@Stateless(mappedName="HH")
public class HelloBean implements Hello {
public String hello() {
- return "hello, world\n";
+ return "hello, world\n";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties
index d0d2cad..9b193e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-ear"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml
index 757b2b2..b10f439 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -46,8 +46,8 @@
<param name="src" value="ejb"/>
</antcall>
- <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
-
+ <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+
</javac>
<!--
<antcall target="compile-common">
@@ -62,15 +62,15 @@
<param name="ejbjar.classes" value="**/Foo.class,**/Hello.class,**/HelloRemote.class,**/Singleton*.class,**/HelloStateless.class,**/HelloSingleton.class,**/FooManagedBean.class,**/BarManagedBean.class, **/FooBarManagedBean.class, **/ManagedSuper.class, **/Interceptor*.class"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
<target name="run" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -79,10 +79,10 @@
<arg line="${http.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java
index 0a9c5d5..0e8ed2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -38,50 +38,50 @@
private static Integer appLevelViaLookup;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
- System.out.println("appLevelViaLookup = '" +
- appLevelViaLookup + "'");
+ System.out.println("appLevelViaLookup = '" +
+ appLevelViaLookup + "'");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
-
+
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
index 4d8ca0f..0067466 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
@@ -29,7 +29,7 @@
@PostConstruct
private void init() {
- System.out.println("In BarManagedBean::init() " + this);
+ System.out.println("In BarManagedBean::init() " + this);
}
public void bar() {
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("In BarManagedBean::destroy() ");
+ System.out.println("In BarManagedBean::destroy() ");
}
public String toString() {
- return "BarManagedBean this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "BarManagedBean this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java
index 970523f..4947f16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooBarManagedBean.java
@@ -23,12 +23,12 @@
@PostConstruct
private void init() {
- System.out.println("In FooBarManagedBean::init() " + this);
+ System.out.println("In FooBarManagedBean::init() " + this);
}
-
+
@PreDestroy
private void destroy() {
- System.out.println("In FooBarManagedBean::destroy() ");
+ System.out.println("In FooBarManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
index ff1a453..f0411a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
@@ -36,33 +36,33 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean::init() " + this);
+ System.out.println("In FooManagedBean::init() " + this);
}
-
+
public String getName() {
- return "somemanagedbean";
+ return "somemanagedbean";
}
public void foo() {
- System.out.println("In FooManagedBean::foo() ");
- bmb.bar();
+ System.out.println("In FooManagedBean::foo() ");
+ bmb.bar();
}
public Object getThis() {
- return this;
+ return this;
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean::destroy() ");
+ System.out.println("In FooManagedBean::destroy() ");
}
public String toString() {
- return "FooManagedBean this = " + super.toString() +
- " s = " + s + " , orb = " + orb +
- " , bmb = " + bmb + " , em = " + em;
+ return "FooManagedBean this = " + super.toString() +
+ " s = " + s + " , orb = " + orb +
+ " , bmb = " + bmb + " , em = " + em;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
index 9f66d01..b9dd4a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
@@ -39,9 +39,9 @@
@Resource(name="java:module/env/MORB2")
private ORB orb;
- @Resource
+ @Resource
private FooManagedBean foo;
-
+
@Resource(name="foo2ref", mappedName="java:module/somemanagedbean")
private FooManagedBean foo2;
@@ -59,59 +59,59 @@
@EJB(name="java:app/env/appLevelEjbRef")
private Hello hello;
-
+
String appName;
String moduleName;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloSingleton::init()");
+ System.out.println("HelloSingleton::init()");
- System.out.println("myString = '" + myString + "'");
- if( (myString == null) || !(myString.equals("myString") ) ) {
- throw new RuntimeException("Invalid value " + myString + " for myString");
- }
+ System.out.println("myString = '" + myString + "'");
+ if( (myString == null) || !(myString.equals("myString") ) ) {
+ throw new RuntimeException("Invalid value " + myString + " for myString");
+ }
- appName = (String) sessionCtx.lookup("java:app/AppName");
- moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+ appName = (String) sessionCtx.lookup("java:app/AppName");
+ moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
- ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
- ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+ ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+ ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
- System.out.println("AppName = " + appName);
- System.out.println("ModuleName = " + moduleName);
+ System.out.println("AppName = " + appName);
+ System.out.println("ModuleName = " + moduleName);
- foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
- foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
- foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
+ foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
+ foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
+ foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
}
public String hello() {
-
- System.out.println("HelloSingleton::hello()");
+
+ System.out.println("HelloSingleton::hello()");
- foo.foo();
- foo2.foo();
- foo3.foo();
+ foo.foo();
+ foo2.foo();
+ foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
- foo7.foo();
- foo8.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
+ foo7.foo();
+ foo8.foo();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
private void destroy() {
- System.out.println("HelloSingleton::destroy()");
+ System.out.println("HelloSingleton::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
index 3504771..18f55ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
@@ -30,7 +30,7 @@
@Resource(name="java:module/MORB1")
private ORB orb;
-
+
@EJB(name="lookupref1", lookup="java:app/env/AS1")
private Hello lookupref1;
@@ -41,51 +41,51 @@
private HelloRemote lookupref3;
// declare component-level dependency using fully-qualified
- // java:comp/env form.
+ // java:comp/env form.
@Resource(name="java:comp/env/foo") SessionContext sessionCtx;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateless::init()");
+ System.out.println("HelloStateless::init()");
}
public String hello() {
- System.out.println("In HelloStateless::hello()");
+ System.out.println("In HelloStateless::hello()");
- String appName = (String) sessionCtx.lookup("java:app/AppName");
- String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
- System.out.println("AppName = " + appName);
- System.out.println("ModuleName = " + moduleName);
+ String appName = (String) sessionCtx.lookup("java:app/AppName");
+ String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+ System.out.println("AppName = " + appName);
+ System.out.println("ModuleName = " + moduleName);
- ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
- ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+ ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+ ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
- Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
- appName + "/" +
- moduleName + "/" +
- "HelloSingleton");
+ Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
+ appName + "/" +
+ moduleName + "/" +
+ "HelloSingleton");
- Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
- moduleName + "/" +
- "HelloSingleton");
+ Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
+ moduleName + "/" +
+ "HelloSingleton");
- // Rely on default to resolve "java:comp/env/ declared resource
- SessionContext sc1 = (SessionContext)
- sessionCtx.lookup("foo");
+ // Rely on default to resolve "java:comp/env/ declared resource
+ SessionContext sc1 = (SessionContext)
+ sessionCtx.lookup("foo");
- SessionContext sc2 = (SessionContext)
- sc1.lookup("java:comp/env/foo");
+ SessionContext sc2 = (SessionContext)
+ sc1.lookup("java:comp/env/foo");
- Integer envEntry = (Integer)
- sc1.lookup("java:app/env/value1");
- System.out.println("java:ap/env/value1 = " + envEntry);
+ Integer envEntry = (Integer)
+ sc1.lookup("java:app/env/value1");
+ System.out.println("java:ap/env/value1 = " + envEntry);
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
private void destroy() {
- System.out.println("HelloStateless::destroy()");
+ System.out.println("HelloStateless::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
index 7307cae..f59afd5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
@@ -35,21 +35,21 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::init() ");
- c.proceed();
+ System.out.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
public Object roundInvoke(InvocationContext c) throws Exception {
- System.out.println("In InterceptorA::roundInvoke() ");
- return c.proceed();
+ System.out.println("In InterceptorA::roundInvoke() ");
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In Interceptor::destroy() ");
- c.proceed();
+ System.out.println("In Interceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
index 4adbd03..1b9325f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
@@ -24,7 +24,7 @@
@AroundInvoke
protected Object roundInvoke(InvocationContext c) throws Exception {
- throw new RuntimeException("Should not reach here");
+ throw new RuntimeException("Should not reach here");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
index de1e35a..4b6e0d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
@@ -28,17 +28,17 @@
@PostConstruct
private void init() {
- System.out.println("In ManagedSuper::init() " + this);
+ System.out.println("In ManagedSuper::init() " + this);
}
@PreDestroy
private void destroy() {
- System.out.println("In ManagedSuper::destroy() ");
+ System.out.println("In ManagedSuper::destroy() ");
}
public String toString() {
- return "ManagedSuper this = " + super.toString() +
- " s = " + s + " , ds = " + ds;
+ return "ManagedSuper this = " + super.toString() +
+ " s = " + s + " , ds = " + ds;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
index 53ecd16..628f744 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
@@ -28,7 +28,7 @@
public void init() {
System.out.println("In SingletonBean2::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean2::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
index 6449f7a..a36bbe7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
@@ -28,7 +28,7 @@
public void init() {
System.out.println("In SingletonBean3::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean3::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
index 43e649a..b6e204c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
@@ -27,7 +27,7 @@
public void init() {
System.out.println("In SingletonBean4::init()");
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean4::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
index 9bfc8b0..c457d1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
@@ -33,28 +33,28 @@
@PostConstruct
private void init() {
- System.out.println("In Foo2ManagedBean::init() " + this);
+ System.out.println("In Foo2ManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In Foo2ManagedBean::foo() ");
- System.out.println("In Foo2ManagedBean::foo() testing @EJB: " + s.hello());
+ System.out.println("In Foo2ManagedBean::foo() ");
+ System.out.println("In Foo2ManagedBean::foo() testing @EJB: " + s.hello());
}
public Object getThis() {
- return this;
+ return this;
}
@PreDestroy
private void destroy() {
- System.out.println("In Foo2ManagedBean::destroy() ");
+ System.out.println("In Foo2ManagedBean::destroy() ");
}
public String toString() {
- return "Foo2ManagedBean this = " +
- " s = " + s + " , orb = " + orb +
- " , em = " + em;
+ return "Foo2ManagedBean this = " +
+ " s = " + s + " , orb = " + orb +
+ " , em = " + em;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java
index 970523f..4947f16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/FooBarManagedBean.java
@@ -23,12 +23,12 @@
@PostConstruct
private void init() {
- System.out.println("In FooBarManagedBean::init() " + this);
+ System.out.println("In FooBarManagedBean::init() " + this);
}
-
+
@PreDestroy
private void destroy() {
- System.out.println("In FooBarManagedBean::destroy() ");
+ System.out.println("In FooBarManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
index f9f954e..ba20136 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
@@ -34,7 +34,7 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloS::destroy()");
+ System.out.println("HelloS::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
index ab6c19f..5362845 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
@@ -32,7 +32,7 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloS2::destroy()");
+ System.out.println("HelloS2::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
index 5212832..3ce19b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
@@ -63,9 +63,9 @@
private HelloRemote stateless1;
private HelloRemote stateless2;
- @Resource
+ @Resource
private Foo2ManagedBean foo;
-
+
@Resource(name="foo2ref", mappedName="java:module/somemanagedbean")
private Foo2ManagedBean foo2;
@@ -82,112 +82,112 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
- System.out.println("myString = '" + myString + "'");
- if( (myString == null) || !(myString.equals("myString") ) ) {
- throw new RuntimeException("Invalid value " + myString + " for myString");
- }
+ System.out.println("In HelloServlet::init");
+ System.out.println("myString = '" + myString + "'");
+ if( (myString == null) || !(myString.equals("myString") ) ) {
+ throw new RuntimeException("Invalid value " + myString + " for myString");
+ }
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- try {
-
- InitialContext ic = new InitialContext();
+ try {
- String appName = (String) ic.lookup("java:app/AppName");
- String moduleName = (String) ic.lookup("java:module/ModuleName");
+ InitialContext ic = new InitialContext();
- // lookup via intermediate context
- Context appCtx = (Context) ic.lookup("java:app");
- Context appCtxEnv = (Context) appCtx.lookup("env");
- stateless2 = (HelloRemote) appCtxEnv.lookup("AS2");
- NamingEnumeration<Binding> bindings = appCtxEnv.listBindings("");
- System.out.println("java:app/env/ bindings ");
- while(bindings.hasMore()) {
- System.out.println("binding : " + bindings.next().getName());
- }
+ String appName = (String) ic.lookup("java:app/AppName");
+ String moduleName = (String) ic.lookup("java:module/ModuleName");
+
+ // lookup via intermediate context
+ Context appCtx = (Context) ic.lookup("java:app");
+ Context appCtxEnv = (Context) appCtx.lookup("env");
+ stateless2 = (HelloRemote) appCtxEnv.lookup("AS2");
+ NamingEnumeration<Binding> bindings = appCtxEnv.listBindings("");
+ System.out.println("java:app/env/ bindings ");
+ while(bindings.hasMore()) {
+ System.out.println("binding : " + bindings.next().getName());
+ }
- foo4 = (Foo2ManagedBean) ic.lookup("java:module/somemanagedbean");
- foo5 = (Foo2ManagedBean) ic.lookup("java:app/" + moduleName +
- "/somemanagedbean");
- foo6 = (Foo) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/somemanagedbean");
- foo7 = (Foo2ManagedBean) ic.lookup("java:comp/env/foo2ref");
- foo8 = (Foo) ic.lookup("java:comp/env/foo3ref");
+ foo4 = (Foo2ManagedBean) ic.lookup("java:module/somemanagedbean");
+ foo5 = (Foo2ManagedBean) ic.lookup("java:app/" + moduleName +
+ "/somemanagedbean");
+ foo6 = (Foo) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/somemanagedbean");
+ foo7 = (Foo2ManagedBean) ic.lookup("java:comp/env/foo2ref");
+ foo8 = (Foo) ic.lookup("java:comp/env/foo3ref");
- singleton1 = (Hello) ic.lookup("java:module/m1");
+ singleton1 = (Hello) ic.lookup("java:module/m1");
- // standard java:app name for ejb
- singleton2 = (Hello) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/HelloSingleton");
+ // standard java:app name for ejb
+ singleton2 = (Hello) ic.lookup("java:app/ejb-ejb31-full-ear-ejb/HelloSingleton");
- singleton3 = (Hello) ic.lookup("java:global/" + appName + "/ejb-ejb31-full-ear-ejb/HelloSingleton");
+ singleton3 = (Hello) ic.lookup("java:global/" + appName + "/ejb-ejb31-full-ear-ejb/HelloSingleton");
- // lookup some java:app defined by ejb-jar
- singleton4 = (Hello) ic.lookup("java:app/env/AS1");
+ // lookup some java:app defined by ejb-jar
+ singleton4 = (Hello) ic.lookup("java:app/env/AS1");
- // global dependency
- singleton5 = (Hello) ic.lookup("java:global/GS1");
+ // global dependency
+ singleton5 = (Hello) ic.lookup("java:global/GS1");
- stateless1 = (HelloRemote) ic.lookup("java:app/env/AS2");
+ stateless1 = (HelloRemote) ic.lookup("java:app/env/AS2");
- System.out.println("My AppName = " +
- ic.lookup("java:app/AppName"));
+ System.out.println("My AppName = " +
+ ic.lookup("java:app/AppName"));
- System.out.println("My ModuleName = " +
- ic.lookup("java:module/ModuleName"));
+ System.out.println("My ModuleName = " +
+ ic.lookup("java:module/ModuleName"));
- try {
- org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:module/MORB1");
- throw new RuntimeException("Should have gotten naming exception");
- } catch(NamingException ne) {
- System.out.println("Successfully was *not* able to see ejb-jar module-level dependency");
- }
+ try {
+ org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:module/MORB1");
+ throw new RuntimeException("Should have gotten naming exception");
+ } catch(NamingException ne) {
+ System.out.println("Successfully was *not* able to see ejb-jar module-level dependency");
+ }
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- foo.foo();
- foo2.foo();
- foo3.foo();
+ foo.foo();
+ foo2.foo();
+ foo3.foo();
- foo4.foo();
- foo5.foo();
- foo6.foo();
- foo7.foo();
- foo8.foo();
+ foo4.foo();
+ foo5.foo();
+ foo6.foo();
+ foo7.foo();
+ foo8.foo();
- m1.hello();
- a1.hello();
- a2.hello();
- singleton1.hello();
- singleton2.hello();
- singleton3.hello();
- singleton4.hello();
- singleton5.hello();
+ m1.hello();
+ a1.hello();
+ a2.hello();
+ singleton1.hello();
+ singleton2.hello();
+ singleton3.hello();
+ singleton4.hello();
+ singleton5.hello();
- stateless1.hello();
- stateless2.hello();
+ stateless1.hello();
+ stateless2.hello();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties
index af1ceb8..4b1470c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-jcdifull"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml
index 014811e..e7bde49 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<mkdir dir="${build.classes.dir}"/>
<javac classpath="${env.S1AS_HOME}/modules/weld-osgi-bundle.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="ejb" destdir="${build.classes.dir}" debug="on" failonerror="true" includeantruntime="false" >
@@ -43,23 +43,23 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true">
<metainf dir="descriptor">
<include name="beans.xml"/>
- </metainf>
+ </metainf>
</jar>
- <!-- do client compile after so the classes aren't part of ejb-jar -->
+ <!-- do client compile after so the classes aren't part of ejb-jar -->
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -67,9 +67,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -81,7 +81,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
index a761d29..509b175 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
@@ -26,37 +26,37 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest(args[1]);
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest(args[1]);
stat.printSummary(appName + "ID");
}
- public Client(String[] args) {
+ public Client(String[] args) {
}
public void doTest(String otherApp) {
- try {
+ try {
- SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- singleton.hello();
+ singleton.hello();
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
index c978178..e8f1b9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
@@ -29,7 +29,7 @@
@Resource(name="jdbc/__default") javax.sql.DataSource ds;
public Bar() {
- System.out.println("Constructed::Bar");
+ System.out.println("Constructed::Bar");
}
@PostConstruct
@@ -46,7 +46,7 @@
}
public String toString() {
- return "Bar";
+ return "Bar";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java
index 5bed5c2..9725e5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar2.java
@@ -19,11 +19,11 @@
public class Bar2 {
public Bar2() {
- System.out.println("Constructed::Bar2");
+ System.out.println("Constructed::Bar2");
}
public String toString() {
- return "Bar2";
+ return "Bar2";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
index 67545e2..23458fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
@@ -28,7 +28,7 @@
private javax.sql.DataSource ds;
public DependentWithInjectedDataSource() {
- System.out.println("Constructed::DependentWithInjectedDataSource");
+ System.out.println("Constructed::DependentWithInjectedDataSource");
}
@PostConstruct
@@ -40,7 +40,7 @@
}
public String toString() {
- return "DependentWithInjectedDataSource";
+ return "DependentWithInjectedDataSource";
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
index e02a306..98e596a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
@@ -26,12 +26,12 @@
int id = 0;
public Foo() {
- id = count;
- count++;
+ id = count;
+ count++;
}
public String toString() {
- return "Foo" + id;
+ return "Foo" + id;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
index 0d2b830..3739d45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
@@ -35,27 +35,27 @@
@PostConstruct
private void init() {
- System.out.println("In FooManagedBean:init()");
- System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new RuntimeException("null orb");
- }
+ System.out.println("In FooManagedBean:init()");
+ System.out.println("orb = " + orb);
+ if( orb == null ) {
+ throw new RuntimeException("null orb");
+ }
}
public void hello() {
- System.out.println("In FooManagedBean::hello()");
+ System.out.println("In FooManagedBean::hello()");
}
public void assertInterceptorBinding() {
- if( !interceptorWasHere ) {
- throw new RuntimeException("interceptor was not here");
- }
+ if( !interceptorWasHere ) {
+ throw new RuntimeException("interceptor was not here");
+ }
}
@PreDestroy
private void destroy() {
- System.out.println("In FooManagedBean:destroy()");
+ System.out.println("In FooManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
index 94ffc96..58af079 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooNonManagedBean.java
@@ -29,20 +29,20 @@
@PostConstruct
private void init() {
- System.out.println("In FooNonManagedBean:init()");
- System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new RuntimeException("null orb");
- }
+ System.out.println("In FooNonManagedBean:init()");
+ System.out.println("orb = " + orb);
+ if( orb == null ) {
+ throw new RuntimeException("null orb");
+ }
}
public void hello() {
- System.out.println("In FooNonManagedBean::hello()");
+ System.out.println("In FooNonManagedBean::hello()");
}
@PreDestroy
private void destroy() {
- System.out.println("In FooNonManagedBean:destroy()");
+ System.out.println("In FooNonManagedBean:destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
index b6f03ec..8311c02 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
@@ -26,25 +26,25 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.err.println("In InterceptorA::init() ");
- c.proceed();
+ System.err.println("In InterceptorA::init() ");
+ c.proceed();
}
@AroundInvoke
private Object roundInvoke(InvocationContext c) throws Exception {
- System.err.println("===> In InterceptorA::aroundInvoke() ");
+ System.err.println("===> In InterceptorA::aroundInvoke() ");
if ((c.getTarget() instanceof StatelessBean) && c.getMethod().getName().equals("hello")) {
StatelessBean sb = (StatelessBean)c.getTarget();
sb.interceptorCalled(0);
}
- return c.proceed();
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.err.println("In InterceptorA::destroy() ");
- c.proceed();
+ System.err.println("In InterceptorA::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java
index d401cce..1168eaa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceParser.java
@@ -19,12 +19,12 @@
import java.util.Arrays;
import java.util.List;
-public class SentenceParser
-{
-
- public List<String> parse(String text)
+public class SentenceParser
+{
+
+ public List<String> parse(String text)
{
return Arrays.asList( text.split("[.?]") );
}
-
-}
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
index 76f0773..a4dd92b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
@@ -19,12 +19,12 @@
import jakarta.ejb.Stateless;
@Stateless
-public class SentenceTranslator implements Translator
-{
-
- public String translate(String sentence)
- {
- return "Lorem ipsum dolor sit amet";
+public class SentenceTranslator implements Translator
+{
+
+ public String translate(String sentence)
+ {
+ return "Lorem ipsum dolor sit amet";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
index 8d853a2..08d0dac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
@@ -38,14 +38,14 @@
@Inject
private Event<SomeEvent> someEvent;
-
+
@Inject Foo foo;
@EJB
- private StatelessLocal statelessEE;
+ private StatelessLocal statelessEE;
@Inject
- private StatelessLocal2 sl2;
+ private StatelessLocal2 sl2;
@Inject private TranslatorController tc;
@@ -54,52 +54,52 @@
@Resource
private BeanManager beanManagerInject;
-
+
@Resource SessionContext sesCtx;
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- if( beanManagerInject == null ) {
- throw new EJBException("BeanManager is null");
- }
- System.out.println("Bean manager inject = " + beanManagerInject);
- testIMCreateDestroyMO();
+ if( beanManagerInject == null ) {
+ throw new EJBException("BeanManager is null");
+ }
+ System.out.println("Bean manager inject = " + beanManagerInject);
+ testIMCreateDestroyMO();
- System.out.println("Sending some event...");
- someEvent.fire( new SomeEvent(2) );
+ System.out.println("Sending some event...");
+ someEvent.fire( new SomeEvent(2) );
}
public void hello() {
- System.out.println("In SingletonBean::hello() " + foo);
- statelessEE.hello();
- sl2.hello();
+ System.out.println("In SingletonBean::hello() " + foo);
+ statelessEE.hello();
+ sl2.hello();
- fmb.hello();
-
- BeanManager beanMgr = (BeanManager)
- sesCtx.lookup("java:comp/BeanManager");
+ fmb.hello();
+
+ BeanManager beanMgr = (BeanManager)
+ sesCtx.lookup("java:comp/BeanManager");
- System.out.println("Successfully retrieved bean manager " +
- beanMgr + " for JCDI enabled app");
+ System.out.println("Successfully retrieved bean manager " +
+ beanMgr + " for JCDI enabled app");
- /**
- StatefulBean sb = (StatefulBean) sesCtx.lookup("java:module/StatefulBean");
- System.out.println("In SingletonBean sb = " + sb);
- sb.hello();
- **/
+ /**
+ StatefulBean sb = (StatefulBean) sesCtx.lookup("java:module/StatefulBean");
+ System.out.println("In SingletonBean sb = " + sb);
+ sb.hello();
+ **/
}
@Schedule(second="*/10", minute="*", hour="*")
- private void timeout() {
- System.out.println("In SingletonBean::timeout() " + foo);
+ private void timeout() {
+ System.out.println("In SingletonBean::timeout() " + foo);
- System.out.println("tc.getText() = " + tc.getText());
+ System.out.println("tc.getText() = " + tc.getText());
- statelessEE.hello();
+ statelessEE.hello();
}
@PreDestroy
@@ -109,29 +109,29 @@
private void testIMCreateDestroyMO() {
- try {
+ try {
- // Test InjectionManager managed bean functionality
- Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
- Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
- System.out.println("create managed object method = " + createManagedMethod);
- FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
- f2.hello();
-
-
- Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
- System.out.println("destroy managed object method = " + destroyManagedMethod);
- destroyManagedMethod.invoke(injectionMgr, f2);
-
- FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
- System.out.println("FooNonManagedBean = " + nonF);
- nonF.hello();
- destroyManagedMethod.invoke(injectionMgr, nonF);
+ // Test InjectionManager managed bean functionality
+ Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
+ Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
+ System.out.println("create managed object method = " + createManagedMethod);
+ FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
+ f2.hello();
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
+ System.out.println("destroy managed object method = " + destroyManagedMethod);
+ destroyManagedMethod.invoke(injectionMgr, f2);
+
+ FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
+ System.out.println("FooNonManagedBean = " + nonF);
+ nonF.hello();
+ destroyManagedMethod.invoke(injectionMgr, nonF);
+
+
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
index 53899e3..736c486 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
@@ -40,15 +40,15 @@
@Inject
public SingletonBean2(Event<SomeEvent> se) {
- someEvent = se;
- System.out.println("In SingletonBean2 someEvent = " + someEvent);
-
+ someEvent = se;
+ System.out.println("In SingletonBean2 someEvent = " + someEvent);
+
}
@Inject Foo foo;
@EJB
- private StatelessLocal statelessEE;
+ private StatelessLocal statelessEE;
@Inject private TranslatorController tc;
@@ -59,45 +59,45 @@
@Resource
private BeanManager beanManagerInject;
-
+
@Resource SessionContext sesCtx;
@PostConstruct
public void init() {
System.out.println("In SingletonBean2::init()");
- if( beanManagerInject == null ) {
- throw new EJBException("BeanManager is null");
- }
- System.out.println("Bean manager inject = " + beanManagerInject);
- testIMCreateDestroyMO();
- testSingletonWithInjectionConstructor();
+ if( beanManagerInject == null ) {
+ throw new EJBException("BeanManager is null");
+ }
+ System.out.println("Bean manager inject = " + beanManagerInject);
+ testIMCreateDestroyMO();
+ testSingletonWithInjectionConstructor();
- System.out.println("Sending some event...");
- someEvent.fire( new SomeEvent(2) );
+ System.out.println("Sending some event...");
+ someEvent.fire( new SomeEvent(2) );
}
public void hello() {
- System.out.println("In SingletonBean2::hello() " + foo);
- statelessEE.hello();
+ System.out.println("In SingletonBean2::hello() " + foo);
+ statelessEE.hello();
- fmb.hello();
-
- BeanManager beanMgr = (BeanManager)
- sesCtx.lookup("java:comp/BeanManager");
-
- System.out.println("Successfully retrieved bean manager " +
- beanMgr + " for JCDI enabled app");
-
+ fmb.hello();
+
+ BeanManager beanMgr = (BeanManager)
+ sesCtx.lookup("java:comp/BeanManager");
+
+ System.out.println("Successfully retrieved bean manager " +
+ beanMgr + " for JCDI enabled app");
+
}
@Schedule(second="*/10", minute="*", hour="*")
- private void timeout() {
- System.out.println("In SingletonBean::timeout() " + foo);
+ private void timeout() {
+ System.out.println("In SingletonBean::timeout() " + foo);
- System.out.println("tc.getText() = " + tc.getText());
+ System.out.println("tc.getText() = " + tc.getText());
- statelessEE.hello();
+ statelessEE.hello();
}
@PreDestroy
@@ -107,29 +107,29 @@
private void testIMCreateDestroyMO() {
- try {
+ try {
- // Test InjectionManager managed bean functionality
- Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
- Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
- System.out.println("create managed object method = " + createManagedMethod);
- FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
- f2.hello();
-
-
- Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
- System.out.println("destroy managed object method = " + destroyManagedMethod);
- destroyManagedMethod.invoke(injectionMgr, f2);
-
- FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
- System.out.println("FooNonManagedBean = " + nonF);
- nonF.hello();
- destroyManagedMethod.invoke(injectionMgr, nonF);
+ // Test InjectionManager managed bean functionality
+ Object injectionMgr = new InitialContext().lookup("com.sun.enterprise.container.common.spi.util.InjectionManager");
+ Method createManagedMethod = injectionMgr.getClass().getMethod("createManagedObject", java.lang.Class.class);
+ System.out.println("create managed object method = " + createManagedMethod);
+ FooManagedBean f2 = (FooManagedBean) createManagedMethod.invoke(injectionMgr, FooManagedBean.class);
+ f2.hello();
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ Method destroyManagedMethod = injectionMgr.getClass().getMethod("destroyManagedObject", java.lang.Object.class);
+ System.out.println("destroy managed object method = " + destroyManagedMethod);
+ destroyManagedMethod.invoke(injectionMgr, f2);
+
+ FooNonManagedBean nonF = (FooNonManagedBean) createManagedMethod.invoke(injectionMgr, FooNonManagedBean.class);
+ System.out.println("FooNonManagedBean = " + nonF);
+ nonF.hello();
+ destroyManagedMethod.invoke(injectionMgr, nonF);
+
+
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
@@ -137,16 +137,16 @@
private void testSingletonWithInjectionConstructor() {
- try {
+ try {
- SingletonBeanA b= (SingletonBeanA) sesCtx.lookup("java:module/SingletonBeanA");
+ SingletonBeanA b= (SingletonBeanA) sesCtx.lookup("java:module/SingletonBeanA");
if (b.getBar() == null) {
throw new Exception("Bar is null");
}
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
index f329c4c..a96b70f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
@@ -28,7 +28,7 @@
Bar bar;
- @Inject
+ @Inject
public SingletonBeanA(Bar bar) {
this.bar = bar;
}
@@ -36,10 +36,10 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBeanA::init()");
- if( bar == null ) {
- throw new EJBException("bar is null");
- }
- System.out.println("bar inject = " + bar);
+ if( bar == null ) {
+ throw new EJBException("bar is null");
+ }
+ System.out.println("bar inject = " + bar);
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
index 9bf9c4e..0581314 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
@@ -31,7 +31,7 @@
@Inject
public SingletonStartupWithInjectedDependent(DependentWithInjectedDataSource service) {
this.service = service;
- System.out.println("Constructed::SingletonStartupWithInjectedDependent");
+ System.out.println("Constructed::SingletonStartupWithInjectedDependent");
}
@PostConstruct
@@ -41,7 +41,7 @@
}
public String toString() {
- return "SingletonStartupWithInjectedDependent";
+ return "SingletonStartupWithInjectedDependent";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java
index 8b417fc..584caab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SomeEvent.java
@@ -20,11 +20,11 @@
private int someInt;
- public SomeEvent(int i) {
- someInt = i;
+ public SomeEvent(int i) {
+ someInt = i;
}
public String toString() {
- return "" + someInt;
+ return "" + someInt;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
index 2d52c2a..9678831 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
@@ -40,18 +40,18 @@
@Inject Foo foo;
@PostConstruct
- public void init() {
- System.out.println("In StatelessBean::init()");
+ public void init() {
+ System.out.println("In StatelessBean::init()");
}
public void processSomeEvent(@Observes SomeEvent event) {
- System.out.println("In StatelessBean::processSomeEvent " +
- event);
+ System.out.println("In StatelessBean::processSomeEvent " +
+ event);
}
public void hello() {
- System.out.println("In StatelessBean::hello() " +
- foo);
+ System.out.println("In StatelessBean::hello() " +
+ foo);
if (interceptorIds.size() != 2) {
throw new IllegalStateException("Wrong number of interceptors were called: expected 2, got " + interceptorIds.size());
} else if (interceptorIds.get(0) != 0 || interceptorIds.get(1) != 1) {
@@ -64,15 +64,15 @@
@ExcludeClassInterceptors
@ExcludeDefaultInterceptors
public void interceptorCalled(int id) {
- System.out.println("In StatelessBean::interceptorCalled() " + id);
+ System.out.println("In StatelessBean::interceptorCalled() " + id);
interceptorIds.add(id);
}
@PreDestroy
- public void destroy() {
- System.out.println("In StatelessBean::destroy()");
+ public void destroy() {
+ System.out.println("In StatelessBean::destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
index 91f205d..d36d2b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
@@ -29,27 +29,27 @@
private Foo foo;
@Inject
- public StatelessBean2(Foo f, Foo sr) {
- foo = f;
- System.out.println("In StatelessBean2() foo = " + foo +
- " sr = " + sr);
+ public StatelessBean2(Foo f, Foo sr) {
+ foo = f;
+ System.out.println("In StatelessBean2() foo = " + foo +
+ " sr = " + sr);
}
@PostConstruct
- public void init() {
- System.out.println("In StatelessBean2::init()");
+ public void init() {
+ System.out.println("In StatelessBean2::init()");
}
public void hello() {
- System.out.println("In StatelessBean2::hello() " +
- foo);
+ System.out.println("In StatelessBean2::hello() " +
+ foo);
}
@PreDestroy
- public void destroy() {
- System.out.println("In StatelessBean2::destroy()");
+ public void destroy() {
+ System.out.println("In StatelessBean2::destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
index 7610bbf..1d77ec8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
@@ -22,25 +22,25 @@
import jakarta.inject.Inject;
public class TextTranslator implements Serializable
-{
- private SentenceParser sentenceParser;
-
+{
+ private SentenceParser sentenceParser;
+
@EJB Translator translator;
-
+
@Inject
- public TextTranslator(SentenceParser sentenceParser)
- {
- this.sentenceParser = sentenceParser;
+ public TextTranslator(SentenceParser sentenceParser)
+ {
+ this.sentenceParser = sentenceParser;
}
-
- public String translate(String text)
- {
- StringBuilder sb = new StringBuilder();
- for (String sentence: sentenceParser.parse(text))
- {
- sb.append(translator.translate(sentence)).append(". ");
- }
- return sb.toString().trim();
+
+ public String translate(String text)
+ {
+ StringBuilder sb = new StringBuilder();
+ for (String sentence: sentenceParser.parse(text))
+ {
+ sb.append(translator.translate(sentence)).append(". ");
+ }
+ return sb.toString().trim();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
index 057830c..af49a41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
@@ -18,10 +18,10 @@
import jakarta.ejb.Local;
-@Local
-public interface Translator
-{
+@Local
+public interface Translator
+{
public String translate(String sentence);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java
index a329106..5556a88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController.java
@@ -18,15 +18,15 @@
public interface TranslatorController
{
-
+
public String getText();
-
+
public void setText(String text);
-
+
public void translate();
-
+
public String getTranslatedText();
-
+
public void remove();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java
index 3b101d4..007e269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorController2.java
@@ -18,7 +18,7 @@
public interface TranslatorController2
{
-
+
public void foo();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
index 97750ee..209b522 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
@@ -25,42 +25,42 @@
@Stateful
@RequestScoped
@Named("translator")
- public class TranslatorControllerBean implements TranslatorController , TranslatorController2
+ public class TranslatorControllerBean implements TranslatorController , TranslatorController2
{
-
+
@Inject
private TextTranslator translator;
-
+
private String inputText;
-
+
private String translatedText;
-
+
public String getText()
{
return inputText;
}
-
+
public void setText(String text)
{
this.inputText = text;
}
-
+
public void translate()
{
translatedText = translator.translate(inputText);
}
-
+
public String getTranslatedText()
{
return translatedText;
}
public void foo() {}
-
+
@Remove
public void remove()
{
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties
index b267ead..bf7ad25 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-passact"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml
index cb051eb..181bb06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
index 0e5499c..4a9014c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
@@ -31,17 +31,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -49,44 +49,44 @@
public void doTest() {
- try {
- int numHellos = 8; // 8 is the batch size, so 8 should be guaranteed to be pasivated
+ try {
+ int numHellos = 8; // 8 is the batch size, so 8 should be guaranteed to be pasivated
- Hello[] hellos = new Hello[numHellos];
- int passivationCount = 0;
+ Hello[] hellos = new Hello[numHellos];
+ int passivationCount = 0;
- for(int i = 0; i < numHellos; i++) {
-
- hellos[i] = (Hello) new InitialContext().lookup("java:global/"+appName+"/HelloBean");
- hellos[i].hello();
- }
+ for(int i = 0; i < numHellos; i++) {
- try {
- System.out.println("Waiting for passivation...");
- Thread.sleep(20000);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ hellos[i] = (Hello) new InitialContext().lookup("java:global/"+appName+"/HelloBean");
+ hellos[i].hello();
+ }
- for(int i = 0; i < numHellos; i++) {
-
- hellos[i].hello();
- if( hellos[i].passivatedAndActivated() ) {
- passivationCount++;
- }
- }
+ try {
+ System.out.println("Waiting for passivation...");
+ Thread.sleep(20000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- if( passivationCount != numHellos ) {
- System.out.println("Passivation failed -- count = " + passivationCount + " instead of expected " + numHellos);
- throw new EJBException("passivation failed");
- }
+ for(int i = 0; i < numHellos; i++) {
- stat.addStatus("local main", stat.PASS);
+ hellos[i].hello();
+ if( hellos[i].passivatedAndActivated() ) {
+ passivationCount++;
+ }
+ }
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ if( passivationCount != numHellos ) {
+ System.out.println("Passivation failed -- count = " + passivationCount + " instead of expected " + numHellos);
+ throw new EJBException("passivation failed");
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml
index b73ef74..9be3449 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>HelloBean</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>4</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
@@ -32,7 +32,7 @@
<ejb-name>StatefulNoIntf</ejb-name>
<bean-cache>
<max-cache-size>4</max-cache-size>
- <resize-quantity>1</resize-quantity>
+ <resize-quantity>1</resize-quantity>
<cache-idle-timeout-in-seconds>3</cache-idle-timeout-in-seconds>
</bean-cache>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
index b0df4ef..46b35b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
@@ -32,7 +32,7 @@
private boolean activated = false;
@EJB private SingletonNoIntf singletonNoIntf;
-
+
@EJB private SingletonMultiIntf singletonMultiIntf;
@EJB private Local1 local1;
@@ -50,50 +50,50 @@
@PostConstruct
public void init() {
- System.out.println("In HelloBean::init()");
+ System.out.println("In HelloBean::init()");
}
public String hello() {
- System.out.println("In HelloBean::hello()");
+ System.out.println("In HelloBean::hello()");
System.out.println("+++ sessionCtx type: " + sessionCtx.getClass());
- StatefulExpiration se = (StatefulExpiration) sessionCtx.lookup("java:module/StatefulExpiration");
- se.hello();
+ StatefulExpiration se = (StatefulExpiration) sessionCtx.lookup("java:module/StatefulExpiration");
+ se.hello();
- singletonNoIntf.hello();
- singletonMultiIntf.hello();
- local1.hello();
- local2.hello();
- remote1.hello();
- remote2.hello();
- statelessNoIntf.hello();
- statefulNoIntf.hello();
+ singletonNoIntf.hello();
+ singletonMultiIntf.hello();
+ local1.hello();
+ local2.hello();
+ remote1.hello();
+ remote2.hello();
+ statelessNoIntf.hello();
+ statefulNoIntf.hello();
- return "hello, world\n";
+ return "hello, world\n";
}
public boolean passivatedAndActivated() {
- return passivated && activated;
+ return passivated && activated;
}
@PrePassivate
public void prePass() {
- System.out.println("In HelloBean::prePass()");
- passivated = true;
+ System.out.println("In HelloBean::prePass()");
+ passivated = true;
}
@PostActivate
public void postAct() {
- System.out.println("In HelloBean::postAct()");
+ System.out.println("In HelloBean::postAct()");
hello();
- activated = true;
+ activated = true;
}
-
+
@PreDestroy
public void destroy() {
- System.out.println("In HelloBean::destroy()");
+ System.out.println("In HelloBean::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
index 42b78e3..d775a45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
@@ -27,26 +27,26 @@
@PostConstruct
private void init(InvocationContext c) throws Exception {
- System.out.println("In NonSerializableInterceptor::init() ");
- i = 10;
- c.proceed();
+ System.out.println("In NonSerializableInterceptor::init() ");
+ i = 10;
+ c.proceed();
}
@AroundInvoke
- public Object doAI(InvocationContext c) throws Exception {
+ public Object doAI(InvocationContext c) throws Exception {
- System.out.println("In doAI , i = " + i);
- if( i != 10 ) {
- throw new EJBException("Wrong value of interceptor state = " +
- i);
- }
- return c.proceed();
+ System.out.println("In doAI , i = " + i);
+ if( i != 10 ) {
+ throw new EJBException("Wrong value of interceptor state = " +
+ i);
+ }
+ return c.proceed();
}
@PreDestroy
private void destroy(InvocationContext c) throws Exception {
- System.out.println("In NonSerializableInterceptor::destroy() ");
- c.proceed();
+ System.out.println("In NonSerializableInterceptor::destroy() ");
+ c.proceed();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
index 42e9f94..1bf51a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
@@ -31,18 +31,18 @@
@PostConstruct
public void init() {
- System.out.println("In SingletonMultiIntf::init()");
+ System.out.println("In SingletonMultiIntf::init()");
}
public String hello() {
- System.out.println("In SingletonMultiIntf::hello() invoked by " +
- sessionCtx.getInvokedBusinessInterface());
- return "hello, world\n";
+ System.out.println("In SingletonMultiIntf::hello() invoked by " +
+ sessionCtx.getInvokedBusinessInterface());
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In SingletonMultiIntf::destroy()");
+ System.out.println("In SingletonMultiIntf::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
index 0d53adb..aa83e53 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
@@ -25,17 +25,17 @@
@PostConstruct
public void init() {
- System.out.println("In SingletonNoIntf::init()");
+ System.out.println("In SingletonNoIntf::init()");
}
public String hello() {
- System.out.println("In SingletonNoIntf::hello()");
- return "hello, world\n";
+ System.out.println("In SingletonNoIntf::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In SingletonNoIntf::destroy()");
+ System.out.println("In SingletonNoIntf::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
index 7714e0b..1e41c9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
@@ -26,17 +26,17 @@
@PostConstruct
public void init() {
- System.out.println("In StatefulExpiration::init()");
+ System.out.println("In StatefulExpiration::init()");
}
public String hello() {
- System.out.println("In StatefulExpiration::hello()");
- return "hello, world\n";
+ System.out.println("In StatefulExpiration::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In StatefulExpiration::destroy()");
+ System.out.println("In StatefulExpiration::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
index 85a3874..93349a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
@@ -27,22 +27,22 @@
@PostConstruct
public void init() {
- System.out.println("In StatefulNoIntf::init()");
+ System.out.println("In StatefulNoIntf::init()");
}
public String hello() {
- System.out.println("In StatefulNoIntf::hello()");
- return "hello, world\n";
+ System.out.println("In StatefulNoIntf::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In StatefulNoIntf::destroy()");
+ System.out.println("In StatefulNoIntf::destroy()");
}
@PrePassivate
public void passivate() {
- System.out.println("In StatefulNoIntf::passivate()");
+ System.out.println("In StatefulNoIntf::passivate()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
index c082754..608973b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
@@ -25,17 +25,17 @@
@PostConstruct
public void init() {
- System.out.println("In StatelessNoIntf::init()");
+ System.out.println("In StatelessNoIntf::init()");
}
public String hello() {
- System.out.println("In StatelessNoIntf::hello()");
- return "hello, world\n";
+ System.out.println("In StatelessNoIntf::hello()");
+ return "hello, world\n";
}
@PreDestroy
public void destroy() {
- System.out.println("In StatelessNoIntf::destroy()");
+ System.out.println("In StatelessNoIntf::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties
index b26a531..032fa2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-remote1"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml
index 7cc3e0e..7e9215c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/build.xml
@@ -29,15 +29,15 @@
&commonBuild;
&testproperties;
- <!-- note that we don't undeploy as part of all target so
+ <!-- note that we don't undeploy as part of all target so
that top-level build script can run remote2 first -->
-
+
<target name="all" depends="build,deploy,run"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,12 +49,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Blah.class,**/Singleton*.class,**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -62,9 +62,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
index f61bbd2..3e51135 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
@@ -31,17 +31,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -49,144 +49,144 @@
public void doTest() {
- try {
+ try {
- /**
- Object o= (HelloHome) new InitialContext().lookup("corbaname:iiop:localhost:3700#HH");
- HelloHome helloHomeCorbaName = (HelloHome)
- javax.rmi.PortableRemoteObject.narrow(o, HelloHome.class);
- callHome(helloHomeCorbaName);
- */
+ /**
+ Object o= (HelloHome) new InitialContext().lookup("corbaname:iiop:localhost:3700#HH");
+ HelloHome helloHomeCorbaName = (HelloHome)
+ javax.rmi.PortableRemoteObject.narrow(o, HelloHome.class);
+ callHome(helloHomeCorbaName);
+ */
- HelloHome helloHome = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
- callHome(helloHome);
+ HelloHome helloHome = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
+ callHome(helloHome);
- Hello hello = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
+ Hello hello = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
- // @@@ TODO System.out.println("Lookup via app-defined global name");
- // @@@ Not implemented yet @@@ Hello hellog = (Hello) new InitialContext().lookup("java:global/HBGlobal");
+ // @@@ TODO System.out.println("Lookup via app-defined global name");
+ // @@@ Not implemented yet @@@ Hello hellog = (Hello) new InitialContext().lookup("java:global/HBGlobal");
- Future<String> future = hello.helloAsync();
-
- // "memory leak" don't call get on async that returns a future
- // At the least should be cleaned up at container shutdown but
- // but possibly sooner
- hello.helloAsync();
- hello.helloAsync();
- hello.helloAsync();
+ Future<String> future = hello.helloAsync();
- hello.fireAndForget();
-
- try {
- String result = future.get();
- System.out.println("helloAsync() says : " + result);
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
+ // "memory leak" don't call get on async that returns a future
+ // At the least should be cleaned up at container shutdown but
+ // but possibly sooner
+ hello.helloAsync();
+ hello.helloAsync();
+ hello.helloAsync();
- Future<String> futureTO = hello.asyncBlock(5);
- // Test timeout
- try {
+ hello.fireAndForget();
- String result = futureTO.get(1, TimeUnit.MILLISECONDS);
- throw new EJBException("Should have timed out");
- } catch(TimeoutException toe) {
- try {
- String result = futureTO.get();
- System.out.println("asyncBlock() says : " + result);
- } catch(Exception e) {
- throw new EJBException(e);
- }
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
-
- Future<String> futureException =
- hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
- try {
- String result = futureException.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ try {
+ String result = future.get();
+ System.out.println("helloAsync() says : " + result);
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- Future<String> futureCancel = null;
- try {
- futureCancel = hello.asyncCancel(5);
- futureCancel.cancel(true);
- futureCancel.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ Future<String> futureTO = hello.asyncBlock(5);
+ // Test timeout
+ try {
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Got expected " + cae);
- }
+ String result = futureTO.get(1, TimeUnit.MILLISECONDS);
+ throw new EJBException("Should have timed out");
+ } catch(TimeoutException toe) {
+ try {
+ String result = futureTO.get();
+ System.out.println("asyncBlock() says : " + result);
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessTimeoutException cat) {
- System.out.println("Got expected " + cat);
- }
+ Future<String> futureException =
+ hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ try {
+ String result = futureException.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
- try {
- hello.throwException("jakarta.ejb.IllegalLoopbackException");
- throw new EJBException("expected an exception");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Got expected " + ile);
- }
+ Future<String> futureCancel = null;
+ try {
+ futureCancel = hello.asyncCancel(5);
+ futureCancel.cancel(true);
+ futureCancel.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
+
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Got expected " + cae);
+ }
+
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessTimeoutException cat) {
+ System.out.println("Got expected " + cat);
+ }
+
+ try {
+ hello.throwException("jakarta.ejb.IllegalLoopbackException");
+ throw new EJBException("expected an exception");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Got expected " + ile);
+ }
- // Fully-qualified portable global
- HelloHome helloHome2 = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
- callHome(helloHome2);
+ // Fully-qualified portable global
+ HelloHome helloHome2 = (HelloHome) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.HelloHome");
+ callHome(helloHome2);
- Hello hello2 = (Hello) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.Hello");
- callBusHome(hello2);
+ Hello hello2 = (Hello) new InitialContext().lookup("java:global/" + appName + "/HelloBean!com.acme.Hello");
+ callBusHome(hello2);
- // non-portable global
- HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
- callHome(helloHome5);
+ // non-portable global
+ HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
+ callHome(helloHome5);
- Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
- callBusHome(hello5);
+ Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
+ callBusHome(hello5);
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
private static void callHome(HelloHome home) throws Exception {
- // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
- HelloRemote hr = home.create();
- System.out.println("2.x HelloRemote.hello() says " + hr.hello());
+ // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
+ HelloRemote hr = home.create();
+ System.out.println("2.x HelloRemote.hello() says " + hr.hello());
}
private static void callBusHome(Hello h) {
- System.out.println("Hello.hello() says " + h.hello());
+ System.out.println("Hello.hello() says " + h.hello());
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java
index 9bb87ef..830ce33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client2.java
@@ -23,29 +23,29 @@
public static void main(String args[]) {
- String host;
- String port;
+ String host;
+ String port;
- try {
- Properties p = new Properties();
- if( args.length > 0 ) {
- host = args[0];
- p.put("org.omg.CORBA.ORBInitialHost", host);
- }
+ try {
+ Properties p = new Properties();
+ if( args.length > 0 ) {
+ host = args[0];
+ p.put("org.omg.CORBA.ORBInitialHost", host);
+ }
- if( args.length > 1 ) {
- port = args[1];
- p.put("org.omg.CORBA.ORBInitialPort", port);
- }
+ if( args.length > 1 ) {
+ port = args[1];
+ p.put("org.omg.CORBA.ORBInitialPort", port);
+ }
- InitialContext ic = new InitialContext(p);
- Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
- h.hello();
+ InitialContext ic = new InitialContext(p);
+ Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
+ h.hello();
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
index 80eaa31..3ede06e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
@@ -30,10 +30,10 @@
// marked async on bean class
void fireAndForget();
-
+
Future<String> asyncThrowException(String exceptionType);
Future<String> asyncCancel(int seconds) throws Exception;
-
+
void throwException(String exceptionType);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
index eec3523..b31d6e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
@@ -51,83 +51,83 @@
@PostConstruct
public void init() {
- System.out.println("In HelloBean::init()");
+ System.out.println("In HelloBean::init()");
}
public String hello() {
- System.out.println("In HelloBean::hello()");
- return "hello, world\n";
+ System.out.println("In HelloBean::hello()");
+ return "hello, world\n";
}
@Asynchronous
public Future<String> helloAsync() {
- System.out.println("In HelloBean::helloAsync()");
- return new AsyncResult<String>("helo, async world!\n");
+ System.out.println("In HelloBean::helloAsync()");
+ return new AsyncResult<String>("helo, async world!\n");
}
@Asynchronous
public Future<String> asyncBlock(int seconds) {
- System.out.println("In HelloBean::asyncBlock");
- sleep(seconds);
- return new AsyncResult<String>("blocked successfully");
+ System.out.println("In HelloBean::asyncBlock");
+ sleep(seconds);
+ return new AsyncResult<String>("blocked successfully");
}
- @Asynchronous
+ @Asynchronous
public void fireAndForget() {
- System.out.println("In HelloBean::fireAndForget()");
- sleep(5);
+ System.out.println("In HelloBean::fireAndForget()");
+ sleep(5);
}
-
+
@Asynchronous
public Future<String> asyncThrowException(String exceptionType) {
- System.out.println("In HelloBean::asyncThrowException");
- throwException(exceptionType);
- return new AsyncResult<String>("should have thrown exception");
+ System.out.println("In HelloBean::asyncThrowException");
+ throwException(exceptionType);
+ return new AsyncResult<String>("should have thrown exception");
}
@Asynchronous
public Future<String> asyncCancel(int seconds) throws Exception
{
- System.out.println("In HelloBean::asyncCancel");
- sleep(seconds);
- if( sessionCtx.wasCancelCalled() ) {
- throw new Exception("Canceled after " + seconds + " seconds");
- }
- return new AsyncResult<String>("asyncCancel() should have been cancelled");
+ System.out.println("In HelloBean::asyncCancel");
+ sleep(seconds);
+ if( sessionCtx.wasCancelCalled() ) {
+ throw new Exception("Canceled after " + seconds + " seconds");
+ }
+ return new AsyncResult<String>("asyncCancel() should have been cancelled");
}
public void throwException(String exceptionType) {
- if( exceptionType.equals("jakarta.ejb.EJBException") ) {
- throw new EJBException(exceptionType);
- } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
- throw new ConcurrentAccessException(exceptionType);
- } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
- throw new ConcurrentAccessTimeoutException(exceptionType);
- } else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
- throw new IllegalLoopbackException(exceptionType);
- }
+ if( exceptionType.equals("jakarta.ejb.EJBException") ) {
+ throw new EJBException(exceptionType);
+ } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
+ throw new ConcurrentAccessException(exceptionType);
+ } else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
+ throw new ConcurrentAccessTimeoutException(exceptionType);
+ } else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
+ throw new IllegalLoopbackException(exceptionType);
+ }
- throw new IllegalArgumentException(exceptionType);
+ throw new IllegalArgumentException(exceptionType);
}
private void sleep(int seconds) {
- System.out.println("In HelloBean::sleeping for " + seconds +
- "seconds");
- try {
- Thread.currentThread().sleep(seconds * 1000);
- System.out.println("In HelloBean::woke up from " + seconds +
- "second sleep");
- } catch(Exception e) {
- e.printStackTrace();
- }
+ System.out.println("In HelloBean::sleeping for " + seconds +
+ "seconds");
+ try {
+ Thread.currentThread().sleep(seconds * 1000);
+ System.out.println("In HelloBean::woke up from " + seconds +
+ "second sleep");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
@PreDestroy
public void destroy() {
- System.out.println("In HelloBean::destroy()");
+ System.out.println("In HelloBean::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
index 37b1265..c678bdc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
@@ -32,56 +32,56 @@
public void init() {
System.out.println("In SingletonBean::init()");
- try {
- HelloRemote hr = helloHome.create();
- System.out.println("HellohelloRemote.hello() says " + hr.hello());
+ try {
+ HelloRemote hr = helloHome.create();
+ System.out.println("HellohelloRemote.hello() says " + hr.hello());
- System.out.println("Hello.hello() says " + hello.hello());
+ System.out.println("Hello.hello() says " + hello.hello());
- InitialContext ic = new InitialContext();
+ InitialContext ic = new InitialContext();
- SessionContext ctx = (SessionContext)
- ic.lookup("java:module/env/sesCtx");
+ SessionContext ctx = (SessionContext)
+ ic.lookup("java:module/env/sesCtx");
- SingletonBean me = (SingletonBean)
- ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean");
-
- SingletonBean meToo = (SingletonBean)
- ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean!com.acme.SingletonBean");
+ SingletonBean me = (SingletonBean)
+ ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean");
- Hello m1 = (Hello) ic.lookup("java:module/env/M1");
+ SingletonBean meToo = (SingletonBean)
+ ic.lookup("java:app/ejb-ejb31-full-remote1-ejb/SingletonBean!com.acme.SingletonBean");
- HelloHome m2 = (HelloHome) ctx.lookup("java:module/M2");
+ Hello m1 = (Hello) ic.lookup("java:module/env/M1");
- Hello a1 = (Hello) ctx.lookup("java:app/env/A1");
+ HelloHome m2 = (HelloHome) ctx.lookup("java:module/M2");
- HelloHome a2 = (HelloHome) ic.lookup("java:app/A2");
+ Hello a1 = (Hello) ctx.lookup("java:app/env/A1");
- try {
- ic.lookup("java:comp/env/C1");
- throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
- } catch(NamingException e) {
- System.out.println("Successfully did *not* find HelloBean private component environment dependency");
- }
+ HelloHome a2 = (HelloHome) ic.lookup("java:app/A2");
- try {
- ic.lookup("java:comp/C1");
- throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
- } catch(NamingException e) {
- System.out.println("Successfully did *not* find HelloBean private component environment dependency");
- }
+ try {
+ ic.lookup("java:comp/env/C1");
+ throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
+ } catch(NamingException e) {
+ System.out.println("Successfully did *not* find HelloBean private component environment dependency");
+ }
- System.out.println("My AppName = " +
- ctx.lookup("java:app/AppName"));
+ try {
+ ic.lookup("java:comp/C1");
+ throw new EJBException("Expected exception accessing private component environment entry of HelloBean");
+ } catch(NamingException e) {
+ System.out.println("Successfully did *not* find HelloBean private component environment dependency");
+ }
- System.out.println("My ModuleName = " +
- ctx.lookup("java:module/ModuleName"));
+ System.out.println("My AppName = " +
+ ctx.lookup("java:app/AppName"));
-
+ System.out.println("My ModuleName = " +
+ ctx.lookup("java:module/ModuleName"));
- } catch(Exception e) {
- throw new EJBException("singleton init error" , e);
- }
+
+
+ } catch(Exception e) {
+ throw new EJBException("singleton init error" , e);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties
index 8c97a72..1f8f5c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-remote2"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml
index 2dfbaa8..e21fda8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
index 9cad009..4f67b60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
@@ -26,42 +26,42 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest(args[1]);
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest(args[1]);
stat.printSummary(appName + "ID");
}
- public Client(String[] args) {
+ public Client(String[] args) {
}
public void doTest(String otherApp) {
- try {
+ try {
- Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
- System.out.println("hGlobal = " + hGlobal);
- System.out.println("hGlobal hello = " + hGlobal.hello());
+ Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
+ System.out.println("hGlobal = " + hGlobal);
+ System.out.println("hGlobal hello = " + hGlobal.hello());
- SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- // pass name of remotestateless app
- singleton.doTest(otherApp);
+ // pass name of remotestateless app
+ singleton.doTest(otherApp);
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
index 80eaa31..3ede06e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
@@ -30,10 +30,10 @@
// marked async on bean class
void fireAndForget();
-
+
Future<String> asyncThrowException(String exceptionType);
Future<String> asyncCancel(int seconds) throws Exception;
-
+
void throwException(String exceptionType);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
index 06ac43e..f29b0df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
@@ -36,7 +36,7 @@
@EJB(name="hellohomeref", mappedName="HH") HelloHome helloHome;
@EJB(name="helloref2", lookup="HH#com.acme.Hello") Hello hello2;
- @EJB(name="hellohomeref2", lookup="HH") HelloHome helloHome2;
+ @EJB(name="hellohomeref2", lookup="HH") HelloHome helloHome2;
@EJB RemoteAsync statefulBean;
@@ -50,192 +50,192 @@
public void doTest(String targetAppName) {
- try {
+ try {
- Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
- System.out.println("hGlobal = " + hGlobal);
- System.out.println("hGlobal hello = " + hGlobal.hello());
+ Hello hGlobal = (Hello) new InitialContext().lookup("java:global/HBGlobal");
+ System.out.println("hGlobal = " + hGlobal);
+ System.out.println("hGlobal hello = " + hGlobal.hello());
- Future<String> futureSful = statefulBean.helloAsync();
- System.out.println("Stateful bean says " + futureSful.get());
+ Future<String> futureSful = statefulBean.helloAsync();
+ System.out.println("Stateful bean says " + futureSful.get());
- futureSful = statefulBean.removeAfterCalling();
- System.out.println("Stateful bean removed status = " + futureSful.get());
+ futureSful = statefulBean.removeAfterCalling();
+ System.out.println("Stateful bean removed status = " + futureSful.get());
- boolean gotSfulException = false;
- try {
- futureSful = statefulBean.helloAsync();
- } catch(NoSuchEJBException nsee) {
- System.out.println("Got nsee from helloAsync");
- gotSfulException = true;
- }
+ boolean gotSfulException = false;
+ try {
+ futureSful = statefulBean.helloAsync();
+ } catch(NoSuchEJBException nsee) {
+ System.out.println("Got nsee from helloAsync");
+ gotSfulException = true;
+ }
- try {
- if( !gotSfulException ) {
- System.out.println("return value = " + futureSful.get());
- throw new EJBException("Should have gotten exception");
- }
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof NoSuchEJBException ) {
- System.out.println("Successfully caught NoSuchEJBException when " +
- "accessing sful bean asynchronously after removal");
- } else {
- throw new EJBException("wrong exception during sfsb access after removal",
- ee);
- }
- }
+ try {
+ if( !gotSfulException ) {
+ System.out.println("return value = " + futureSful.get());
+ throw new EJBException("Should have gotten exception");
+ }
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof NoSuchEJBException ) {
+ System.out.println("Successfully caught NoSuchEJBException when " +
+ "accessing sful bean asynchronously after removal");
+ } else {
+ throw new EJBException("wrong exception during sfsb access after removal",
+ ee);
+ }
+ }
- String targetAppJndiPrefix = "java:global/" + targetAppName + "/";
+ String targetAppJndiPrefix = "java:global/" + targetAppName + "/";
- HelloHome helloHomePGlobal = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
+ HelloHome helloHomePGlobal = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
- ORB orb = (ORB) sesCtx.lookup("java:comp/ORB");
- System.out.println("orb = " + orb);
- ORB orb2 = (ORB) new InitialContext().lookup("java:comp/ORB");
- System.out.println("orb2 = " + orb2);
+ ORB orb = (ORB) sesCtx.lookup("java:comp/ORB");
+ System.out.println("orb = " + orb);
+ ORB orb2 = (ORB) new InitialContext().lookup("java:comp/ORB");
+ System.out.println("orb2 = " + orb2);
- Future<String> future = hello.helloAsync();
-
- // "memory leak" don't call get on async that returns a future
- // At the least should be cleaned up at container shutdown but
- // but possibly sooner
- hello.helloAsync();
- hello.helloAsync();
- hello.helloAsync();
+ Future<String> future = hello.helloAsync();
+
+ // "memory leak" don't call get on async that returns a future
+ // At the least should be cleaned up at container shutdown but
+ // but possibly sooner
+ hello.helloAsync();
+ hello.helloAsync();
+ hello.helloAsync();
- hello.fireAndForget();
-
- try {
- String result = future.get();
- System.out.println("helloAsync() says : " + result);
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
+ hello.fireAndForget();
- Future<String> futureTO = hello.asyncBlock(5);
- // Test timeout
- try {
+ try {
+ String result = future.get();
+ System.out.println("helloAsync() says : " + result);
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- String result = futureTO.get(1, TimeUnit.MILLISECONDS);
- throw new EJBException("Should have timed out");
- } catch(TimeoutException toe) {
- try {
- String result = futureTO.get();
- System.out.println("asyncBlock() says : " + result);
- } catch(Exception e) {
- throw new EJBException(e);
- }
- } catch(ExecutionException e) {
- System.out.println("Got async ExecutionException. Cause is " +
- e.getCause().getMessage());
- e.getCause().printStackTrace();
- }
-
- Future<String> futureException =
- hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
- try {
- String result = futureException.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ Future<String> futureTO = hello.asyncBlock(5);
+ // Test timeout
+ try {
- Future<String> futureCancel = null;
- try {
- futureCancel = hello.asyncCancel(5);
- futureCancel.cancel(true);
- futureCancel.get();
- throw new EJBException("Should have gotten exception");
- } catch(ExecutionException e) {
- if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
- System.out.println("Got correct async exception. Cause is " +
- e.getCause().getMessage());
- } else {
- throw new EJBException("wrong exception", e);
- }
- }
+ String result = futureTO.get(1, TimeUnit.MILLISECONDS);
+ throw new EJBException("Should have timed out");
+ } catch(TimeoutException toe) {
+ try {
+ String result = futureTO.get();
+ System.out.println("asyncBlock() says : " + result);
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
+ } catch(ExecutionException e) {
+ System.out.println("Got async ExecutionException. Cause is " +
+ e.getCause().getMessage());
+ e.getCause().printStackTrace();
+ }
- // injected
- callHome(helloHome);
- callBusHome(hello);
+ Future<String> futureException =
+ hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ try {
+ String result = futureException.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
+
+ Future<String> futureCancel = null;
+ try {
+ futureCancel = hello.asyncCancel(5);
+ futureCancel.cancel(true);
+ futureCancel.get();
+ throw new EJBException("Should have gotten exception");
+ } catch(ExecutionException e) {
+ if( e.getCause().getClass().getName().equals("java.lang.Exception")) {
+ System.out.println("Got correct async exception. Cause is " +
+ e.getCause().getMessage());
+ } else {
+ throw new EJBException("wrong exception", e);
+ }
+ }
+
+ // injected
+ callHome(helloHome);
+ callBusHome(hello);
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Got expected " + cae);
- }
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Got expected " + cae);
+ }
- try {
- hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
- throw new EJBException("expected an exception");
- } catch(ConcurrentAccessTimeoutException cat) {
- System.out.println("Got expected " + cat);
- }
+ try {
+ hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
+ throw new EJBException("expected an exception");
+ } catch(ConcurrentAccessTimeoutException cat) {
+ System.out.println("Got expected " + cat);
+ }
- try {
- hello.throwException("jakarta.ejb.IllegalLoopbackException");
- throw new EJBException("expected an exception");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Got expected " + ile);
- }
+ try {
+ hello.throwException("jakarta.ejb.IllegalLoopbackException");
+ throw new EJBException("expected an exception");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Got expected " + ile);
+ }
- // Fully-qualified portable global
- HelloHome helloHome2 = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
- callHome(helloHome2);
+ // Fully-qualified portable global
+ HelloHome helloHome2 = (HelloHome) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
+ callHome(helloHome2);
- Hello hello2 = (Hello) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
- callBusHome(hello2);
+ Hello hello2 = (Hello) new InitialContext().lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
+ callBusHome(hello2);
- // Fully-qualified portable global via sesion context
- HelloHome helloHome3 = (HelloHome) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
- callHome(helloHome3);
+ // Fully-qualified portable global via sesion context
+ HelloHome helloHome3 = (HelloHome) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.HelloHome");
+ callHome(helloHome3);
- Hello hello3 = (Hello) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
- callBusHome(hello3);
+ Hello hello3 = (Hello) sesCtx.lookup(targetAppJndiPrefix + "HelloBean!com.acme.Hello");
+ callBusHome(hello3);
- // ejb-ref
- HelloHome helloHome4 = (HelloHome) sesCtx.lookup("java:comp/env/hellohomeref");
- callHome(helloHome4);
+ // ejb-ref
+ HelloHome helloHome4 = (HelloHome) sesCtx.lookup("java:comp/env/hellohomeref");
+ callHome(helloHome4);
- Hello hello4 = (Hello) sesCtx.lookup("java:comp/env/helloref");
- callBusHome(hello4);
-
- // non-portable global
- HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
- callHome(helloHome5);
+ Hello hello4 = (Hello) sesCtx.lookup("java:comp/env/helloref");
+ callBusHome(hello4);
- Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
- callBusHome(hello5);
+ // non-portable global
+ HelloHome helloHome5 = (HelloHome) new InitialContext().lookup("HH");
+ callHome(helloHome5);
+
+ Hello hello5 = (Hello) new InitialContext().lookup("HH#com.acme.Hello");
+ callBusHome(hello5);
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException("test failed", e);
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException("test failed", e);
+ }
}
private void callHome(HelloHome home) throws Exception {
- // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
- HelloRemote hr = home.create();
- System.out.println("2.x HelloRemote.hello() says " + hr.hello());
+ // HelloHome home = (HelloHome) PortableRemoteObject.narrow(obj, HelloHome.class);
+ HelloRemote hr = home.create();
+ System.out.println("2.x HelloRemote.hello() says " + hr.hello());
}
private void callBusHome(Hello h) {
- System.out.println("Hello.hello() says " + h.hello());
+ System.out.println("Hello.hello() says " + h.hello());
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
index 0474062..98e5fbe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
@@ -35,14 +35,14 @@
@Asynchronous
public Future<String> helloAsync() {
- return new AsyncResult<String>("hello, world\n");
+ return new AsyncResult<String>("hello, world\n");
}
@Asynchronous
@Remove
public Future<String> removeAfterCalling() {
- System.out.println("In StatefulBean::removeAfterCalling()");
- return new AsyncResult<String>("removed");
+ System.out.println("In StatefulBean::removeAfterCalling()");
+ return new AsyncResult<String>("removed");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties
index 792a9d5..f57c774 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-schema"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="ejbmodulename"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="ejbmodulename"/> \u0020
+<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/> \u0020
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml
index 5df09cf..3605d50 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -74,7 +74,7 @@
<antcall target="undeploy-common">
<param name="deployedapp.name" value="ejbmodulename"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
index 0028952..17226d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
@@ -26,53 +26,53 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
- public Client(String[] args) {
+ public Client(String[] args) {
}
public void doTest() {
- try {
+ try {
- RemoteSingleton singleton = (RemoteSingleton) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteSingleton");
+ RemoteSingleton singleton = (RemoteSingleton) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.RemoteSingleton");
- // Also make sure we can look it up via the product-specific
- // global JNDI name specified via ejb-jar.xml
- RemoteSingleton singleton2 = (RemoteSingleton) new InitialContext().lookup("ejb_ejb31_full_schema_SingletonRemote");
+ // Also make sure we can look it up via the product-specific
+ // global JNDI name specified via ejb-jar.xml
+ RemoteSingleton singleton2 = (RemoteSingleton) new InitialContext().lookup("ejb_ejb31_full_schema_SingletonRemote");
- int sleepSeconds = 10;
- System.out.println("Sleeping for " + sleepSeconds + " seconds before checking " +
- "results...");
- // wait a few seconds for timeout to happen
- Thread.sleep(sleepSeconds * 1000);
+ int sleepSeconds = 10;
+ System.out.println("Sleeping for " + sleepSeconds + " seconds before checking " +
+ "results...");
+ // wait a few seconds for timeout to happen
+ Thread.sleep(sleepSeconds * 1000);
- System.out.println("Woke up");
+ System.out.println("Woke up");
- boolean testResult = singleton.getTestResult();
+ boolean testResult = singleton.getTestResult();
- if( !testResult ) {
- throw new EJBException("testResult = false");
- }
+ if( !testResult ) {
+ throw new EJBException("testResult = false");
+ }
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
index 94b0383..0ad2120 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
@@ -24,10 +24,10 @@
<enterprise-beans>
<session>
<ejb-name>SingletonBean</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.SingletonBean</ejb-class>
- <session-type>Singleton</session-type>
- <timer>
+ <local-bean/>
+ <ejb-class>com.acme.SingletonBean</ejb-class>
+ <session-type>Singleton</session-type>
+ <timer>
<description>Sample timer</description>
<schedule>
<second>1</second>
@@ -36,132 +36,132 @@
<day-of-month>Last Tue</day-of-month>
<month>Feb</month>
<year>2010</year>
- </schedule>
+ </schedule>
<start>2002-10-10T12:00:00</start>
<end>2002-10-10T12:00:00</end>
<timeout-method>
<method-name>mytimeout2</method-name>
- </timeout-method>
+ </timeout-method>
<persistent>false</persistent>
<timezone>America/New_York</timezone>
<info>some info</info>
- </timer>
- <timer>
+ </timer>
+ <timer>
<description>Sample timer1</description>
<schedule>
<second>*/2</second>
<minute>*</minute>
<hour>*</hour>
- </schedule>
+ </schedule>
<timeout-method>
<method-name>mytimeout1</method-name>
- </timeout-method>
+ </timeout-method>
<persistent>false</persistent>
<timezone>America/New_York</timezone>
<info>some info</info>
- </timer>
- <timer>
+ </timer>
+ <timer>
<description>Sample timer2</description>
<schedule>
<second>*/7</second>
<minute>*</minute>
<hour>*</hour>
<day-of-month>*</day-of-month>
- </schedule>
+ </schedule>
<timeout-method>
<method-name>mytimeout</method-name>
- <method-params>
- <method-param>jakarta.ejb.Timer</method-param>
- </method-params>
- </timeout-method>
+ <method-params>
+ <method-param>jakarta.ejb.Timer</method-param>
+ </method-params>
+ </timeout-method>
<persistent>true</persistent>
<info>info</info>
- </timer>
- <init-on-startup>true</init-on-startup>
- <concurrency-management-type>Bean</concurrency-management-type>
- <concurrent-method>
- <method>
+ </timer>
+ <init-on-startup>true</init-on-startup>
+ <concurrency-management-type>Bean</concurrency-management-type>
+ <concurrent-method>
+ <method>
<method-name>foo</method-name>
- </method>
+ </method>
<lock>Write</lock>
<access-timeout>
- <timeout>19876</timeout>
- <unit>Seconds</unit>
- </access-timeout>
- </concurrent-method>
- <depends-on>
+ <timeout>19876</timeout>
+ <unit>Seconds</unit>
+ </access-timeout>
+ </concurrent-method>
+ <depends-on>
<ejb-name>SingletonBean2</ejb-name>
- </depends-on>
- <async-method>
- <method-name>foo</method-name>
- </async-method>
+ </depends-on>
+ <async-method>
+ <method-name>foo</method-name>
+ </async-method>
<ejb-ref>
<ejb-ref-name>ejb/lookup1</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<remote>com.acme.RemoteSingleton</remote>
- <lookup-name>java:module/SingletonBean!com.acme.RemoteSingleton</lookup-name>
+ <lookup-name>java:module/SingletonBean!com.acme.RemoteSingleton</lookup-name>
</ejb-ref>
<ejb-local-ref>
<ejb-ref-name>ejb/lookup2</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<local>com.acme.SingletonBean2</local>
- <lookup-name>java:module/SingletonBean2</lookup-name>
+ <lookup-name>java:module/SingletonBean2</lookup-name>
</ejb-local-ref>
</session>
<session>
<ejb-name>SingletonBean2</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.SingletonBean2</ejb-class>
- <session-type>Singleton</session-type>
- <timer>
+ <local-bean/>
+ <ejb-class>com.acme.SingletonBean2</ejb-class>
+ <session-type>Singleton</session-type>
+ <timer>
<description>Sample timer</description>
<schedule>
<minute>*</minute>
- </schedule>
+ </schedule>
<timeout-method>
<method-name>myTimeout</method-name>
- </timeout-method>
- </timer>
- <concurrent-method>
- <method>
+ </timeout-method>
+ </timer>
+ <concurrent-method>
+ <method>
<method-name>foo</method-name>
- </method>
+ </method>
<lock>Write</lock>
<access-timeout>
- <timeout>5</timeout>
- <unit>Seconds</unit>
- </access-timeout>
- </concurrent-method>
+ <timeout>5</timeout>
+ <unit>Seconds</unit>
+ </access-timeout>
+ </concurrent-method>
<concurrent-method>
- <method>
+ <method>
<method-name>foo2</method-name>
- </method>
+ </method>
<lock>Read</lock>
- </concurrent-method>
+ </concurrent-method>
<concurrent-method>
- <method>
+ <method>
<method-name>fooAsync</method-name>
<method-params>
<method-param>int</method-param>
- </method-params>
- </method>
+ </method-params>
+ </method>
<lock>Read</lock>
- </concurrent-method>
- <async-method>
- <method-name>fooAsync</method-name>
+ </concurrent-method>
+ <async-method>
+ <method-name>fooAsync</method-name>
<method-params>
<method-param>int</method-param>
- </method-params>
- </async-method>
+ </method-params>
+ </async-method>
<transaction-type>Container</transaction-type>
<post-construct>
<lifecycle-callback-class>com.acme.SingletonBean2</lifecycle-callback-class>
<lifecycle-callback-method>init</lifecycle-callback-method>
- </post-construct>
+ </post-construct>
<pre-destroy>
<lifecycle-callback-class>com.acme.SingletonBean2</lifecycle-callback-class>
<lifecycle-callback-method>destroy</lifecycle-callback-method>
- </pre-destroy>
+ </pre-destroy>
</session>
<session>
<ejb-name>StatelessBean</ejb-name>
@@ -170,7 +170,7 @@
</async-method>
</session>
<session>
- <ejb-name>MultiBean</ejb-name>
+ <ejb-name>MultiBean</ejb-name>
<env-entry>
<env-entry-name>multi</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
@@ -179,9 +179,9 @@
</session>
<session>
<ejb-name>MultiBean2</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.MultiBean</ejb-class>
- <session-type>Singleton</session-type>
+ <local-bean/>
+ <ejb-class>com.acme.MultiBean</ejb-class>
+ <session-type>Singleton</session-type>
<env-entry>
<env-entry-name>multi</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
@@ -190,9 +190,9 @@
</session>
<session>
<ejb-name>MultiBean3</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.MultiBean</ejb-class>
- <session-type>Singleton</session-type>
+ <local-bean/>
+ <ejb-class>com.acme.MultiBean</ejb-class>
+ <session-type>Singleton</session-type>
<env-entry>
<env-entry-name>multi</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
@@ -202,31 +202,31 @@
<session>
<ejb-name>StatefulBean</ejb-name>
- <local-bean/>
- <ejb-class>com.acme.StatefulBean</ejb-class>
- <session-type>Stateful</session-type>
- <stateful-timeout>
- <timeout>1001</timeout>
+ <local-bean/>
+ <ejb-class>com.acme.StatefulBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <stateful-timeout>
+ <timeout>1001</timeout>
<unit>Minutes</unit>
- </stateful-timeout>
- <concurrency-management-type>Container</concurrency-management-type>
- <async-method>
- <method-name>foo</method-name>
- </async-method>
+ </stateful-timeout>
+ <concurrency-management-type>Container</concurrency-management-type>
+ <async-method>
+ <method-name>foo</method-name>
+ </async-method>
<after-begin-method>
- <method-name>afterBegin</method-name>
- </after-begin-method>
+ <method-name>afterBegin</method-name>
+ </after-begin-method>
<before-completion-method>
- <method-name>beforeCompletion</method-name>
- </before-completion-method>
+ <method-name>beforeCompletion</method-name>
+ </before-completion-method>
<after-completion-method>
- <method-name>afterCompletion</method-name>
+ <method-name>afterCompletion</method-name>
<method-params>
<method-param>boolean</method-param>
- </method-params>
- </after-completion-method>
+ </method-params>
+ </after-completion-method>
</session>
-
+
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java
index 21593ed..53ab6f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/DateTime.java
@@ -19,38 +19,38 @@
public class DateTime {
-
+
public static void main(String[] args) {
- String xsdDateTime = args[0];
+ String xsdDateTime = args[0];
- System.out.println("Converting xsdDateTime " + xsdDateTime + " ...");
+ System.out.println("Converting xsdDateTime " + xsdDateTime + " ...");
- try {
- DatatypeFactory factory = DatatypeFactory.newInstance();
+ try {
+ DatatypeFactory factory = DatatypeFactory.newInstance();
- XMLGregorianCalendar xmlGreg = factory.newXMLGregorianCalendar(xsdDateTime);
+ XMLGregorianCalendar xmlGreg = factory.newXMLGregorianCalendar(xsdDateTime);
- GregorianCalendar greg = xmlGreg.toGregorianCalendar();
+ GregorianCalendar greg = xmlGreg.toGregorianCalendar();
- Date date = greg.getTime();
+ Date date = greg.getTime();
- System.out.println("Date = " + date);
+ System.out.println("Date = " + date);
- GregorianCalendar reverseCalendar = new GregorianCalendar();
- reverseCalendar.setTime(date);
+ GregorianCalendar reverseCalendar = new GregorianCalendar();
+ reverseCalendar.setTime(date);
- XMLGregorianCalendar reverseXmlGreg =
- factory.newXMLGregorianCalendar(reverseCalendar);
+ XMLGregorianCalendar reverseXmlGreg =
+ factory.newXMLGregorianCalendar(reverseCalendar);
- String reverseXsdDateTime = reverseXmlGreg.toXMLFormat();
+ String reverseXsdDateTime = reverseXmlGreg.toXMLFormat();
- System.out.println("Back to xsdDateTime = " + reverseXsdDateTime);
+ System.out.println("Back to xsdDateTime = " + reverseXsdDateTime);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
index 9a54e8c..59fae06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
@@ -27,36 +27,36 @@
@Resource(name="multi")
private String multi;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("In init()");
- System.out.println("multi = " + multi);
- try {
- String multiLookup = (String)
- new InitialContext().lookup("java:comp/env/multi");
- if( !multi.equals(multiLookup) ) {
- throw new EJBException("Non-matching values of multi" +
- multi + " : " + multiLookup);
- }
+ System.out.println("In init()");
+ System.out.println("multi = " + multi);
+ try {
+ String multiLookup = (String)
+ new InitialContext().lookup("java:comp/env/multi");
+ if( !multi.equals(multiLookup) ) {
+ throw new EJBException("Non-matching values of multi" +
+ multi + " : " + multiLookup);
+ }
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
}
public String foo() {
- try {
- String multiLookup = (String)
- new InitialContext().lookup("java:comp/env/multi");
- System.out.println("multiLookup = " + multiLookup);
- if( !multi.equals(multiLookup) ) {
- throw new EJBException("Non-matching values of multi" +
- multi + " : " + multiLookup);
- }
- } catch(Exception e) {
- throw new EJBException(e);
- }
- return multi;
+ try {
+ String multiLookup = (String)
+ new InitialContext().lookup("java:comp/env/multi");
+ System.out.println("multiLookup = " + multiLookup);
+ if( !multi.equals(multiLookup) ) {
+ throw new EJBException("Non-matching values of multi" +
+ multi + " : " + multiLookup);
+ }
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
+ return multi;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
index de2d2dc..0b45215 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
@@ -31,7 +31,7 @@
public class SingletonBean implements RemoteSingleton {
- @EJB
+ @EJB
private StatefulBean sf;
@Resource
@@ -44,93 +44,93 @@
@PostConstruct
private void init() {
- System.out.println("In SingletonBean::init()");
+ System.out.println("In SingletonBean::init()");
- // Call a method marked as async in .xml. This would block
- // if it's not correctly identified as an async method since
- // we're not out of PostConstruct yet.
- me.foo();
+ // Call a method marked as async in .xml. This would block
+ // if it's not correctly identified as an async method since
+ // we're not out of PostConstruct yet.
+ me.foo();
- SingletonBean2 sb2 = (SingletonBean2)
- ctx.lookup("java:module/SingletonBean2");
+ SingletonBean2 sb2 = (SingletonBean2)
+ ctx.lookup("java:module/SingletonBean2");
- // Call read-lock async method and have it sleep for a little
- // while
- sb2.fooAsync(10);
+ // Call read-lock async method and have it sleep for a little
+ // while
+ sb2.fooAsync(10);
- // Sleep for a short time to allow enough time for fooAsync() to
- // block
- try {
- Thread.sleep(1000);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ // Sleep for a short time to allow enough time for fooAsync() to
+ // block
+ try {
+ Thread.sleep(1000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- // Call a sychronous write-lock method with a .xml specified
- // timeout that's less than the fooAsync sleep time
- try {
- sb2.foo();
- throw new EJBException("Should have gotten timeout exception");
- } catch(ConcurrentAccessTimeoutException cate) {
- System.out.println("Got expected timeout exception");
- }
+ // Call a sychronous write-lock method with a .xml specified
+ // timeout that's less than the fooAsync sleep time
+ try {
+ sb2.foo();
+ throw new EJBException("Should have gotten timeout exception");
+ } catch(ConcurrentAccessTimeoutException cate) {
+ System.out.println("Got expected timeout exception");
+ }
- RemoteSingleton lookup1 = (RemoteSingleton)
- ctx.lookup("java:comp/env/ejb/lookup1");
- System.out.println("lookup1 = " + lookup1);
+ RemoteSingleton lookup1 = (RemoteSingleton)
+ ctx.lookup("java:comp/env/ejb/lookup1");
+ System.out.println("lookup1 = " + lookup1);
- SingletonBean2 lookup2 = (SingletonBean2)
- ctx.lookup("java:comp/env/ejb/lookup2");
- System.out.println("lookup2 = " + lookup2);
+ SingletonBean2 lookup2 = (SingletonBean2)
+ ctx.lookup("java:comp/env/ejb/lookup2");
+ System.out.println("lookup2 = " + lookup2);
- // Now call a synchronous read-lock method. This should just
- // proceed.
- sb2.foo2();
+ // Now call a synchronous read-lock method. This should just
+ // proceed.
+ sb2.foo2();
- sf.foo();
+ sf.foo();
- System.out.println("Leaving SingletonBean::init()");
+ System.out.println("Leaving SingletonBean::init()");
}
@AccessTimeout(value=10, unit=TimeUnit.DAYS)
public void foo() {
- System.out.println("In SingletonBean::foo()");
+ System.out.println("In SingletonBean::foo()");
}
@PreDestroy
private void destroy() {
- System.out.println("In SingletonBean::destroy()");
+ System.out.println("In SingletonBean::destroy()");
}
@Schedule(second="1", minute="*", hour="*", persistent=false)
private void mytimeout(Timer t) {
- System.out.println("In SingletonBean::mytimeout, info = " + t.getInfo() + "t = " +
- t.getSchedule());
+ System.out.println("In SingletonBean::mytimeout, info = " + t.getInfo() + "t = " +
+ t.getSchedule());
- try {
- t.getHandle();
- System.out.println("Successfully got handle for persistent timer");
- } catch(IllegalStateException e) {
- throw new EJBException(e);
- }
+ try {
+ t.getHandle();
+ System.out.println("Successfully got handle for persistent timer");
+ } catch(IllegalStateException e) {
+ throw new EJBException(e);
+ }
- if( t.getInfo().equals("info") && t.isPersistent() && t.isCalendarTimer() ) {
- gotTimeout = true;
- } else {
- throw new EJBException("Timer metadata doesn't match descriptor " + t);
- }
+ if( t.getInfo().equals("info") && t.isPersistent() && t.isCalendarTimer() ) {
+ gotTimeout = true;
+ } else {
+ throw new EJBException("Timer metadata doesn't match descriptor " + t);
+ }
}
private void mytimeout2() {
- System.out.println("In SingletonBean::mytimeout");
+ System.out.println("In SingletonBean::mytimeout");
}
private void mytimeout1(Timer t) {
- System.out.println("In SingletonBean::mytimeout1");
+ System.out.println("In SingletonBean::mytimeout1");
}
public boolean getTestResult() {
- System.out.println("In SingletonBean::testPassed");
- return gotTimeout;
+ System.out.println("In SingletonBean::testPassed");
+ return gotTimeout;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
index 49c0b6e..89460a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean2.java
@@ -21,10 +21,10 @@
private int initTx = -1;
private void init() {
- System.out.println("In SingletonBean2::init()");
+ System.out.println("In SingletonBean2::init()");
try {
javax.naming.InitialContext ic = new javax.naming.InitialContext();
- jakarta.transaction.TransactionSynchronizationRegistry tr =
+ jakarta.transaction.TransactionSynchronizationRegistry tr =
(jakarta.transaction.TransactionSynchronizationRegistry)
ic.lookup("java:comp/TransactionSynchronizationRegistry");
System.out.println("In SingletonBean2::init() tx status: " + tr.getTransactionStatus());
@@ -35,32 +35,32 @@
}
public void foo() {
- System.out.println("In SingletonBean2::foo()");
+ System.out.println("In SingletonBean2::foo()");
}
- public void foo2() {
- System.out.println("In SingletonBean2::foo2()");
+ public void foo2() {
+ System.out.println("In SingletonBean2::foo2()");
if (initTx != 6)
throw new RuntimeException("initTx is " + initTx);
}
public void fooAsync(int sleepSeconds) {
- System.out.println("In SingletonBean2::fooAsync() Sleeping for " +
- sleepSeconds + " seconds...");
- try {
- Thread.sleep(sleepSeconds * 1000);
- } catch(Exception e) {
- e.printStackTrace();
- }
- System.out.println("fooAsync() awoke from Sleep");
+ System.out.println("In SingletonBean2::fooAsync() Sleeping for " +
+ sleepSeconds + " seconds...");
+ try {
+ Thread.sleep(sleepSeconds * 1000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ System.out.println("fooAsync() awoke from Sleep");
}
private void destroy() {
- System.out.println("In SingletonBean2::destroy()");
+ System.out.println("In SingletonBean2::destroy()");
}
private void myTimeout() {
- System.out.println("In SingletonBen2::myTimeout()");
+ System.out.println("In SingletonBen2::myTimeout()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
index 6e7b9e7..7192381 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
@@ -21,27 +21,27 @@
public class StatefulBean {
- @EJB private StatelessBean slsb;
+ @EJB private StatelessBean slsb;
public void foo() {
- slsb.foo();
-
+ slsb.foo();
+
}
public void afterBegin() {
- System.out.println("In StatefulBean::afterBegin");
+ System.out.println("In StatefulBean::afterBegin");
}
private void beforeCompletion() {
- System.out.println("In StatefulBean::beforeCompletion");
+ System.out.println("In StatefulBean::beforeCompletion");
}
void afterCompletion(boolean committed) {
- System.out.println("In StatefulBean::afterCompletion c = " +
- committed);
+ System.out.println("In StatefulBean::afterCompletion c = " +
+ committed);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
index d134582..e8d4ee7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
@@ -27,23 +27,23 @@
public void foo() {
- System.out.println("In StatelessBean::foo");
-
- String multi1Str = multi1.foo();
- String multi2Str = multi2.foo();
- String multi3Str = multi3.foo();
+ System.out.println("In StatelessBean::foo");
- System.out.println("multi1 = " + multi1Str);
- System.out.println("multi2 = " + multi2Str);
- System.out.println("multi3 = " + multi3Str);
+ String multi1Str = multi1.foo();
+ String multi2Str = multi2.foo();
+ String multi3Str = multi3.foo();
- if( /**!multi1Str.equals("1") || **/
- !multi2Str.equals("2") ||
- !multi3Str.equals("3") ) {
- throw new EJBException("Invalid multi values");
+ System.out.println("multi1 = " + multi1Str);
+ System.out.println("multi2 = " + multi2Str);
+ System.out.println("multi3 = " + multi3Str);
- }
-
+ if( /**!multi1Str.equals("1") || **/
+ !multi2Str.equals("2") ||
+ !multi3Str.equals("3") ) {
+ throw new EJBException("Invalid multi values");
+
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties
index c510260..2147ca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-sfsbscnc"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml
index 99367fb..61ad649 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
index 6942a4c..349267b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -43,121 +43,121 @@
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- num = Integer.valueOf(args[1]);
+ num = Integer.valueOf(args[1]);
}
public void doTest() {
- try {
+ try {
- serializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanSerialized!com.acme.StatefulCncRemote");
+ serializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanSerialized!com.acme.StatefulCncRemote");
- nonSerializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanNotSerialized!com.acme.StatefulCncRemote");
+ nonSerializedBean = (StatefulCncSuperIntf) new InitialContext().lookup("java:global/" + appName + "/StatefulBeanNotSerialized!com.acme.StatefulCncRemote");
- nonSerializedBean.sleep(3);
+ nonSerializedBean.sleep(3);
- try {
- System.out.println("Sleep a small amount to make sure the async method" +
- "is dispatched before we make the next call...");
- Thread.sleep(500);
- nonSerializedBean.hello();
- throw new EJBException("Did not receive concurrent access exception");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Successfully received concurrent access exception for " +
- " concurrent access attempt on non-serialized sfsb");
- }
+ try {
+ System.out.println("Sleep a small amount to make sure the async method" +
+ "is dispatched before we make the next call...");
+ Thread.sleep(500);
+ nonSerializedBean.hello();
+ throw new EJBException("Did not receive concurrent access exception");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Successfully received concurrent access exception for " +
+ " concurrent access attempt on non-serialized sfsb");
+ }
- try {
- serializedBean.sleep(3);
- try {
- System.out.println("Sleep a small amount to make sure the async method" +
- "is dispatched before we make the next call...");
- Thread.sleep(100);
- serializedBean.helloWait();
- throw new EJBException("Should have received timeout exception");
- } catch(ConcurrentAccessTimeoutException cate) {
- System.out.println("Successfully received timeout exception");
- }
+ try {
+ serializedBean.sleep(3);
+ try {
+ System.out.println("Sleep a small amount to make sure the async method" +
+ "is dispatched before we make the next call...");
+ Thread.sleep(100);
+ serializedBean.helloWait();
+ throw new EJBException("Should have received timeout exception");
+ } catch(ConcurrentAccessTimeoutException cate) {
+ System.out.println("Successfully received timeout exception");
+ }
- System.out.println("Attempt loopback call");
- serializedBean.attemptLoopback();
+ System.out.println("Attempt loopback call");
+ serializedBean.attemptLoopback();
- // Invoking the same bean must still work since the concurrent access
- // exceptions do not result in the bean being destroyed
- String result = serializedBean.hello();
- System.out.println("Serialized bean says " + result);
+ // Invoking the same bean must still work since the concurrent access
+ // exceptions do not result in the bean being destroyed
+ String result = serializedBean.hello();
+ System.out.println("Serialized bean says " + result);
- } catch(ConcurrentAccessException cae) {
- throw new EJBException("Shouldn't have received concurrent access exception");
- }
+ } catch(ConcurrentAccessException cae) {
+ throw new EJBException("Shouldn't have received concurrent access exception");
+ }
- nonSerializedBean.attemptLoopback();
+ nonSerializedBean.attemptLoopback();
- remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- remoteAsync.startTest();
-
- ExecutorService executor = Executors.newCachedThreadPool();
+ remoteAsync = (RemoteAsync) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ remoteAsync.startTest();
- IncrementCount ics[] = new IncrementCount[num];
- for(int i = 0; i < ics.length; i++) {
+ ExecutorService executor = Executors.newCachedThreadPool();
- ics[i] = new IncrementCount();
+ IncrementCount ics[] = new IncrementCount[num];
+ for(int i = 0; i < ics.length; i++) {
- executor.execute( ics[i] );
- }
+ ics[i] = new IncrementCount();
- executor.shutdown();
+ executor.execute( ics[i] );
+ }
- executor.awaitTermination(15, TimeUnit.SECONDS);
+ executor.shutdown();
- int count = serializedBean.getCount();
+ executor.awaitTermination(15, TimeUnit.SECONDS);
- if( count == num ) {
- System.out.println("Total count of " + count + " invocations is correct");
- } else {
- throw new EJBException("Wrong count total = " + count);
- }
+ int count = serializedBean.getCount();
- // Now put the bean to sleep and make a blocking 2nd call. The first method
- // is a @Remove method so when the blocking call awakes we should get the
- // appropriate exception.
- serializedBean.sleepAndRemove(3);
+ if( count == num ) {
+ System.out.println("Total count of " + count + " invocations is correct");
+ } else {
+ throw new EJBException("Wrong count total = " + count);
+ }
- try {
- System.out.println("Sleep a small amount to make sure the async method" +
- "is dispatched before we make the next call...");
- Thread.sleep(100);
- serializedBean.hello();
- throw new EJBException("Did not receive NoSuchEJBException");
- } catch(NoSuchEJBException nse) {
- System.out.println("Successfully received NoSuchEJBException for " +
- " concurrent access attempt on removed sfsb");
- }
+ // Now put the bean to sleep and make a blocking 2nd call. The first method
+ // is a @Remove method so when the blocking call awakes we should get the
+ // appropriate exception.
+ serializedBean.sleepAndRemove(3);
+
+ try {
+ System.out.println("Sleep a small amount to make sure the async method" +
+ "is dispatched before we make the next call...");
+ Thread.sleep(100);
+ serializedBean.hello();
+ throw new EJBException("Did not receive NoSuchEJBException");
+ } catch(NoSuchEJBException nse) {
+ System.out.println("Successfully received NoSuchEJBException for " +
+ " concurrent access attempt on removed sfsb");
+ }
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
class IncrementCount implements Runnable {
- public void run() {
- serializedBean.incrementCount(1);
- }
+ public void run() {
+ serializedBean.incrementCount(1);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
index 97a24c8..ac3e85d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
@@ -24,6 +24,6 @@
void startTest();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
index ef4b71f..3a9a1ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
@@ -39,9 +39,9 @@
}
public void startTest() {
- System.out.println("in SingletonBean::startTest()");
- // reset state
- return;
+ System.out.println("in SingletonBean::startTest()");
+ // reset state
+ return;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
index 35f62d3..84f56af 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
@@ -39,31 +39,31 @@
@Asynchronous
public void sleep(int seconds) {
- System.out.println("In StatefulBeanNotSerialized::asyncSleep");
- try {
- System.out.println("Sleeping for " + seconds + " seconds...");
- Thread.sleep(seconds * 1000);
- System.out.println("Woke up from sleep");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
+ System.out.println("In StatefulBeanNotSerialized::asyncSleep");
+ try {
+ System.out.println("Sleeping for " + seconds + " seconds...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Woke up from sleep");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
}
public String hello() {
- System.out.println("In StatefulBeanNotSerialized::hello");
- return "hello, world!\n";
+ System.out.println("In StatefulBeanNotSerialized::hello");
+ return "hello, world!\n";
}
public void attemptLoopback() {
- System.out.println("In StatefulBeanNotSerialized::attemptLoopback");
- StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
- try {
- me.hello();
- throw new EJBException("Should have received concurrent access ex");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Successfully received concurent access exception");
- }
+ System.out.println("In StatefulBeanNotSerialized::attemptLoopback");
+ StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
+ try {
+ me.hello();
+ throw new EJBException("Should have received concurrent access ex");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Successfully received concurent access exception");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
index 84f9e38..abb7705 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
@@ -32,14 +32,14 @@
}
public void attemptLoopback() {
- System.out.println("In StatefulBeanSerialized::attemptLoopback");
- StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
- try {
- me.hello();
- throw new EJBException("Should have received loopback ex");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Successfully received loopback exception");
- }
+ System.out.println("In StatefulBeanSerialized::attemptLoopback");
+ StatefulCncSuperIntf me = sessionCtx.getBusinessObject(StatefulCncLocal.class);
+ try {
+ me.hello();
+ throw new EJBException("Should have received loopback ex");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Successfully received loopback exception");
+ }
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
index 59c4f9f..1642024 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
@@ -29,63 +29,63 @@
@AccessTimeout(-1)
public String hello() {
- System.out.println("In StatefulBeanSuper::hello");
- return "hello, world!\n";
+ System.out.println("In StatefulBeanSuper::hello");
+ return "hello, world!\n";
}
@AccessTimeout(value=100, unit=TimeUnit.NANOSECONDS)
public String helloWait() {
- System.out.println("In StatefulBeanSuper::helloWait");
- return "hello, world!\n";
+ System.out.println("In StatefulBeanSuper::helloWait");
+ return "hello, world!\n";
}
-
+
@Asynchronous
public Future<String> helloAsync() {
- System.out.println("In StatefulBeanSuper::helloAsync");
- return new AsyncResult<String>("hello");
+ System.out.println("In StatefulBeanSuper::helloAsync");
+ return new AsyncResult<String>("hello");
}
@Asynchronous
public void fireAndForget() {
- System.out.println("In StatefulBeanSuper::fireAndForget");
+ System.out.println("In StatefulBeanSuper::fireAndForget");
}
@Asynchronous
public void sleep(int seconds) {
- System.out.println("In StatefulBeanSuper::asyncSleep");
- try {
- System.out.println("Sleeping for " + seconds + " seconds...");
- Thread.sleep(seconds * 1000);
- System.out.println("Woke up from sleep");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
+ System.out.println("In StatefulBeanSuper::asyncSleep");
+ try {
+ System.out.println("Sleeping for " + seconds + " seconds...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Woke up from sleep");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
}
@Asynchronous
@Remove
public void sleepAndRemove(int seconds) {
- System.out.println("In StatefulBeanSuper::sleepAndRemove");
- try {
- System.out.println("Sleeping for " + seconds + " seconds...");
- Thread.sleep(seconds * 1000);
- System.out.println("Woke up from sleep. I will now be removed...");
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
+ System.out.println("In StatefulBeanSuper::sleepAndRemove");
+ try {
+ System.out.println("Sleeping for " + seconds + " seconds...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Woke up from sleep. I will now be removed...");
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
}
public void incrementCount(int seconds) {
- System.out.println("In StatefulBeanSuper::incrementCount(" + seconds + ")");
- // increment count but wait a bit to try force serialization
- sleep(seconds);
- count++;
- System.out.println("Count = " + count);
+ System.out.println("In StatefulBeanSuper::incrementCount(" + seconds + ")");
+ // increment count but wait a bit to try force serialization
+ sleep(seconds);
+ count++;
+ System.out.println("Count = " + count);
}
public int getCount() {
- return count;
+ return count;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
index e248283..aa91d74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
@@ -24,7 +24,7 @@
public String hello();
public String helloWait();
-
+
public Future<String> helloAsync();
public void fireAndForget();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties
index 0329892..d791fd1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-full-webejb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml
index b87c3a4..39bc144 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
@@ -48,9 +48,9 @@
<antcall target="webclient-war-common">
<param name="hasWebclient" value="false"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
index 03cdc87..0b917cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
@@ -49,68 +49,68 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- try {
- HelloStateful sful = (HelloStateful) new InitialContext().lookup("java:comp/env/helloStateful");
- sful.hello();
- hello.foo();
- } catch(Exception e) {
- e.printStackTrace();
- }
+ try {
+ HelloStateful sful = (HelloStateful) new InitialContext().lookup("java:comp/env/helloStateful");
+ sful.hello();
+ hello.foo();
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- System.out.println("Remote intf bean says " +
- helloRemote.hello());
+ System.out.println("Remote intf bean says " +
+ helloRemote.hello());
- System.out.println("Calling testNoWait. This one should work since it's not a concurrent invocation");
- singleton.testNoWait();
+ System.out.println("Calling testNoWait. This one should work since it's not a concurrent invocation");
+ singleton.testNoWait();
- System.out.println("Call async wait, then sleep a bit to make sure it takes affect");
- singleton.asyncWait(1);
- try {
- // Sleep a bit to make sure async call processes before we proceed
- Thread.sleep(100);
- } catch(Exception e) {
- System.out.println(e);
- }
+ System.out.println("Call async wait, then sleep a bit to make sure it takes affect");
+ singleton.asyncWait(1);
+ try {
+ // Sleep a bit to make sure async call processes before we proceed
+ Thread.sleep(100);
+ } catch(Exception e) {
+ System.out.println(e);
+ }
- try {
- System.out.println("Calling testNoWait");
- singleton.testNoWait();
- throw new RuntimeException("Expected ConcurrentAccessException");
- } catch(ConcurrentAccessTimeoutException cate) {
- throw new RuntimeException("Expected ConcurrentAccessException");
- } catch(ConcurrentAccessException cae) {
- System.out.println("Got expected exception for concurrent access on method with 0 wait");
- }
+ try {
+ System.out.println("Calling testNoWait");
+ singleton.testNoWait();
+ throw new RuntimeException("Expected ConcurrentAccessException");
+ } catch(ConcurrentAccessTimeoutException cate) {
+ throw new RuntimeException("Expected ConcurrentAccessException");
+ } catch(ConcurrentAccessException cae) {
+ System.out.println("Got expected exception for concurrent access on method with 0 wait");
+ }
- singleton.wait(10);
+ singleton.wait(10);
- singleton.reentrantReadWrite();
+ singleton.reentrantReadWrite();
- singleton.callSing2WithTxAndRollback();
- singleton.hello();
+ singleton.callSing2WithTxAndRollback();
+ singleton.hello();
- singleton.read();
- singleton.write();
- singleton.reentrantReadRead();
- singleton.reentrantWriteWrite();
- singleton.reentrantWriteRead();
+ singleton.read();
+ singleton.write();
+ singleton.reentrantReadRead();
+ singleton.reentrantWriteWrite();
+ singleton.reentrantWriteRead();
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
index 068370c..19d22b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
@@ -26,7 +26,7 @@
@AccessTimeout(value=10, unit=TimeUnit.SECONDS)
public class HelloSingleton extends Super1 {
- @EJB
+ @EJB
Hello hello;
@EJB
@@ -35,146 +35,146 @@
@EJB
private HelloSingleton2 sing2;
- @Resource
+ @Resource
private SessionContext sesCtx;
-
+
private HelloSingleton me;
- @PostConstruct
+ @PostConstruct
//@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
private void init() {
- System.out.println("HelloSingleton::init()");
- me = sesCtx.getBusinessObject(HelloSingleton.class);
+ System.out.println("HelloSingleton::init()");
+ me = sesCtx.getBusinessObject(HelloSingleton.class);
- TimerService ts = sesCtx.getTimerService();
- ts.createTimer(2000, "");
- System.out.println("Created timer in HelloSingleton");
+ TimerService ts = sesCtx.getTimerService();
+ ts.createTimer(2000, "");
+ System.out.println("Created timer in HelloSingleton");
- slsb.hello();
+ slsb.hello();
- slsb.helloAsync();
+ slsb.helloAsync();
- //throw new EJBException("force PostConstruct failure");
+ //throw new EJBException("force PostConstruct failure");
}
@Timeout
@Lock(LockType.WRITE)
public void timeout(Timer t) {
- System.out.println("In HelloSingleton::timeout");
+ System.out.println("In HelloSingleton::timeout");
}
public void callSing2WithTxAndRollback() {
- // Call Singleton 2 with a transaction
- // If it's initialized lazily as a side-effect of this
- // invocation, the fact that we rollback our transaction
- // should not impact any transactional work performed in
- // its CMT/TX_REQUIRED constructor.
- try {
- // Executes in its own transaction but throws a runtime exception.
- sing2.hello1();
- } catch(EJBException e) {
- // Catch the runtime exception so it doesn't affect the client
- // tx (yet)
- }
+ // Call Singleton 2 with a transaction
+ // If it's initialized lazily as a side-effect of this
+ // invocation, the fact that we rollback our transaction
+ // should not impact any transactional work performed in
+ // its CMT/TX_REQUIRED constructor.
+ try {
+ // Executes in its own transaction but throws a runtime exception.
+ sing2.hello1();
+ } catch(EJBException e) {
+ // Catch the runtime exception so it doesn't affect the client
+ // tx (yet)
+ }
- // Make sure we can still call the singleton after a
- // runtime exception
- sing2.hello2();
+ // Make sure we can still call the singleton after a
+ // runtime exception
+ sing2.hello2();
- sesCtx.setRollbackOnly();
+ sesCtx.setRollbackOnly();
- System.out.println("Exiting HelloSingleton::callSing2WithTxAndRollback");
+ System.out.println("Exiting HelloSingleton::callSing2WithTxAndRollback");
}
public void wait(int seconds) {
- try {
- System.out.println("In HelloSingleton::wait. Sleeping with lock...");
- Thread.sleep(seconds * 1000);
- System.out.println("Awake in HelloSingleton::wait. Releasing lock...");
- } catch(Exception e) {
- System.out.println(e);
- }
+ try {
+ System.out.println("In HelloSingleton::wait. Sleeping with lock...");
+ Thread.sleep(seconds * 1000);
+ System.out.println("Awake in HelloSingleton::wait. Releasing lock...");
+ } catch(Exception e) {
+ System.out.println(e);
+ }
}
@Asynchronous
public void asyncWait(int seconds) {
- me.wait(seconds);
+ me.wait(seconds);
}
@AccessTimeout(value=5, unit=TimeUnit.MILLISECONDS)
public String hello() {
-
- System.out.println("get invoked interface = " +
- sesCtx.getInvokedBusinessInterface());
- HelloStateful sful = (HelloStateful) sesCtx.lookup("helloStateful");
- sful.hello();
- hello.foo();
- sful.goodbye();
+ System.out.println("get invoked interface = " +
+ sesCtx.getInvokedBusinessInterface());
- return "hello, world!\n";
+ HelloStateful sful = (HelloStateful) sesCtx.lookup("helloStateful");
+ sful.hello();
+ hello.foo();
+ sful.goodbye();
+
+ return "hello, world!\n";
}
@Lock(LockType.READ)
public void read() {
- System.out.println("In HelloSingleton::read()");
+ System.out.println("In HelloSingleton::read()");
}
public void write() {
- System.out.println("In HelloSingleton::write()");
+ System.out.println("In HelloSingleton::write()");
}
@Lock(LockType.READ)
public void reentrantReadRead() {
- System.out.println("In HelloSingleton::ReentrantReadRead()");
- me.read();
+ System.out.println("In HelloSingleton::ReentrantReadRead()");
+ me.read();
}
@Lock(LockType.READ)
public void reentrantReadWrite() {
- System.out.println("In HelloSingleton::ReentrantReadWrite()");
- try {
- me.write();
- throw new EJBException("Expected illegal loopback exception");
- } catch(IllegalLoopbackException ile) {
- System.out.println("Successfully caused illegal loopback");
- }
+ System.out.println("In HelloSingleton::ReentrantReadWrite()");
+ try {
+ me.write();
+ throw new EJBException("Expected illegal loopback exception");
+ } catch(IllegalLoopbackException ile) {
+ System.out.println("Successfully caused illegal loopback");
+ }
}
public void reentrantWriteRead() {
- System.out.println("In HelloSingleton::ReentrantWriteRead()");
- me.read();
+ System.out.println("In HelloSingleton::ReentrantWriteRead()");
+ me.read();
}
public void reentrantWriteWrite() {
- System.out.println("In HelloSingleton::ReentrantWriteWrite()");
- me.write();
+ System.out.println("In HelloSingleton::ReentrantWriteWrite()");
+ me.write();
}
@AccessTimeout(0)
public void testNoWait() {
- System.out.println("In HelloSingleton::testNoWait");
+ System.out.println("In HelloSingleton::testNoWait");
}
@PreDestroy
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
private void destroy() {
- System.out.println("HelloSingleton::destroy()");
+ System.out.println("HelloSingleton::destroy()");
}
}
-
+
/*
@Lock(LockType.WRITE)
class Super2 {
- @Lock(LockType.READ)
- public void super2() {}
+ @Lock(LockType.READ)
+ public void super2() {}
- public void super22() {}
+ public void super22() {}
}
*/
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
index 17af94f..05931bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
@@ -28,51 +28,51 @@
//@Resource
// private UserTransaction ut;
- @Resource
+ @Resource
private SessionContext sesCtx;
@PostConstruct
public void init() {
- System.out.println("In HelloSingleton2::init()");
- UserTransaction ut = sesCtx.getUserTransaction();
+ System.out.println("In HelloSingleton2::init()");
+ UserTransaction ut = sesCtx.getUserTransaction();
try {
- ut.begin();
- TimerService ts = sesCtx.getTimerService();
- ts.createTimer(2000, "");
- ut.commit();
+ ut.begin();
+ TimerService ts = sesCtx.getTimerService();
+ ts.createTimer(2000, "");
+ ut.commit();
} catch(Exception e) {
- try {
- ut.rollback();
- } catch(Exception e1) { e1.printStackTrace(); }
- e.printStackTrace();
- }
- //throw new EJBException("HelloSingleton2 :: force init failure");
+ try {
+ ut.rollback();
+ } catch(Exception e1) { e1.printStackTrace(); }
+ e.printStackTrace();
+ }
+ //throw new EJBException("HelloSingleton2 :: force init failure");
}
- @PreDestroy
+ @PreDestroy
public void destroy() {
- System.out.println("In HelloSingleton2::destroy");
+ System.out.println("In HelloSingleton2::destroy");
}
- @Timeout
+ @Timeout
public void timeout(Timer t) {
- System.out.println("In HelloSingleton2::timeout");
+ System.out.println("In HelloSingleton2::timeout");
}
//@Schedule(second="15", minute="*", persistent=false)
public void refresh() {
- System.out.println("In HelloSingleton2:refresh()");
+ System.out.println("In HelloSingleton2:refresh()");
}
//@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public void hello1() {
- throw new EJBException("HelloSingleton2::hello1 -- force business method runtime exception");
- //System.out.println("In HelloSingleton2:hello1()");
+ throw new EJBException("HelloSingleton2::hello1 -- force business method runtime exception");
+ //System.out.println("In HelloSingleton2:hello1()");
}
public void hello2() {
- System.out.println("In HelloSingleton2:hello2()");
+ System.out.println("In HelloSingleton2:hello2()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
index d908d14..01ee9fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
@@ -36,26 +36,26 @@
// invalid @EJB java.util.Observable sf22;
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateful::init()");
- me = sesCtx.getBusinessObject(HelloStateful.class);
+ System.out.println("HelloStateful::init()");
+ me = sesCtx.getBusinessObject(HelloStateful.class);
}
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public String hello() {
-
- System.out.println("get invoked interface = " +
- sesCtx.getInvokedBusinessInterface() );
-
- sf2.hello();
- sf2.goodbye();
- return "hello, world!\n";
+ System.out.println("get invoked interface = " +
+ sesCtx.getInvokedBusinessInterface() );
+
+ sf2.hello();
+ sf2.goodbye();
+
+ return "hello, world!\n";
}
public void foo() {
- System.out.println("In HelloStateful::foo");
+ System.out.println("In HelloStateful::foo");
}
@Remove
@@ -63,23 +63,23 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloStateful::destroy()");
+ System.out.println("HelloStateful::destroy()");
}
@AfterBegin
- private void afterBegin() {
- System.out.println("In HelloStateful::afterBegin()");
+ private void afterBegin() {
+ System.out.println("In HelloStateful::afterBegin()");
}
@BeforeCompletion
- protected void beforeCompletion() {
- System.out.println("In HelloStateful::beforeCompletion()");
+ protected void beforeCompletion() {
+ System.out.println("In HelloStateful::beforeCompletion()");
}
@AfterCompletion
void afterCompletion(boolean committed) {
- System.out.println("In HelloStateful::afterCompletion(). Committed = " +
- committed);
+ System.out.println("In HelloStateful::afterCompletion(). Committed = " +
+ committed);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
index bed2194..7a18e67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
@@ -23,14 +23,14 @@
@LocalBean
public class HelloStateful2 implements java.util.Observer {
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateful2::init()");
+ System.out.println("HelloStateful2::init()");
}
public String hello() {
- System.out.println("In HelloStateful2::hello()");
- return "hello, world!\n";
+ System.out.println("In HelloStateful2::hello()");
+ return "hello, world!\n";
}
@@ -39,12 +39,12 @@
@PreDestroy
private void destroy() {
- System.out.println("HelloStateful2::destroy()");
+ System.out.println("HelloStateful2::destroy()");
}
// not part of public interface
public void update(java.util.Observable o, Object a) {
- throw new EJBException("shouldn't be invoked by client");
+ throw new EJBException("shouldn't be invoked by client");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
index 8718981..44ce49a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
@@ -23,24 +23,24 @@
@LocalBean
public class HelloStateless implements HelloRemote {
- @PostConstruct
+ @PostConstruct
private void init() {
- System.out.println("HelloStateless::init()");
+ System.out.println("HelloStateless::init()");
}
public String hello() {
- System.out.println("In HelloStateless::hello()");
- return "hello, world!\n";
+ System.out.println("In HelloStateless::hello()");
+ return "hello, world!\n";
}
@Asynchronous
public void helloAsync() {
- System.out.println("In HelloStateless::helloAsync()");
+ System.out.println("In HelloStateless::helloAsync()");
}
@PreDestroy
private void destroy() {
- System.out.println("HelloStateless::destroy()");
+ System.out.println("HelloStateless::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
index 04f10bd..5ab379f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
@@ -24,15 +24,15 @@
@Lock(LockType.READ)
public class Super1 /*extends Super2*/ {
- public void super1() {}
+ public void super1() {}
- @Lock(LockType.WRITE)
- public void super11() {}
+ @Lock(LockType.WRITE)
+ public void super11() {}
@AccessTimeout(value=44544, unit=TimeUnit.HOURS)
- private void foobar() {}
+ private void foobar() {}
@AccessTimeout(value=44544, unit=TimeUnit.HOURS)
- public String hello() { return ""; }
+ public String hello() { return ""; }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml
index d01a390..fd67838 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/build.xml
@@ -39,9 +39,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-security tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-security tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties
index 354488f..021accb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-security-simple"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="appclientjar.files" value="${build.classes.dir}"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="application-client.xml"
+<property name="application-client.xml"\u0020
value="descriptor/application-client.xml"/>
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml
index 558e3d2..bcc50ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/build.xml
@@ -35,13 +35,13 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
- <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
-
+ <javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+
</javac>
</target>
@@ -69,15 +69,15 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
- value="**/Singleton*.class,**/Hello*.class"/>
- <param name="appclientjar.classes"
+ <param name="ejbjar.classes"
+ value="**/Singleton*.class,**/Hello*.class"/>
+ <param name="appclientjar.classes"
value="**/Client.class,**/FooManagedBean*.class,**/Hello*.class"/>
</antcall>
- </target>
+ </target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -85,7 +85,7 @@
<target name="run_bob" depends="init-common">
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+ <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client
${assemble.dir}/${appname}AppClient.jar"/>
@@ -100,7 +100,7 @@
<target name="run_mary" depends="init-common">
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+ <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client
${assemble.dir}/${appname}AppClient.jar"/>
@@ -112,9 +112,9 @@
</exec>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -126,7 +126,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
index 99320c0..5745ab8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
@@ -30,7 +30,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -54,19 +54,19 @@
static String appNameL;
- @EJB(lookup="java:app/env/forappclient")
+ @EJB(lookup="java:app/env/forappclient")
static Hello hello3;
- @EJB(mappedName="java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello")
+ @EJB(mappedName="java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello")
static Hello hello4;
- @EJB(name="java:app/env/appclientdefinedejbref1")
+ @EJB(name="java:app/env/appclientdefinedejbref1")
static Hello hello5;
- @EJB(name="java:app/appclientdefinedejbref2")
+ @EJB(name="java:app/appclientdefinedejbref2")
static Hello hello6;
- @EJB(name="java:global/appclientdefinedejbref3")
+ @EJB(name="java:global/appclientdefinedejbref3")
static Hello hello7;
@Resource(name="java:app/env/enventry1")
@@ -85,54 +85,54 @@
@PostConstruct
public static void init() {
- try {
- System.out.println("In init()");
+ try {
+ System.out.println("In init()");
- appClient = true;
+ appClient = true;
- System.out.println("AppName = " + appNameL);
- System.out.println("ModuleName = " + moduleName);
+ System.out.println("AppName = " + appNameL);
+ System.out.println("ModuleName = " + moduleName);
- fooMb.hello();
- fooMb2.hello();
- fooMb3.hello();
+ fooMb.hello();
+ fooMb2.hello();
+ fooMb3.hello();
- Integer envEntry = (Integer)
- new InitialContext().lookup("java:app/env/value1");
- System.out.println("java:app/env/value1 = " + envEntry);
-
- System.out.println("java:app/env/enventry1 = " + envEntry1);
- System.out.println("java:global/enventry2 = " + envEntry2);
- System.out.println("java:global/enventry3 = " + envEntry3);
- if( (envEntry3 == null) || envEntry3.intValue() != 18338 ) {
- throw new RuntimeException("invalid enventry3 value");
- }
-
- System.out.println("java:global/enventry4 = " + envEntry4);
- if( (envEntry4 == null) || envEntry4.intValue() != 18338 ) {
- throw new RuntimeException("invalid enventry4 value");
- }
+ Integer envEntry = (Integer)
+ new InitialContext().lookup("java:app/env/value1");
+ System.out.println("java:app/env/value1 = " + envEntry);
- FooManagedBean fmbl = (FooManagedBean) new InitialContext().lookup("java:module/FooManagedBean");
- fmbl.hello();
+ System.out.println("java:app/env/enventry1 = " + envEntry1);
+ System.out.println("java:global/enventry2 = " + envEntry2);
+ System.out.println("java:global/enventry3 = " + envEntry3);
+ if( (envEntry3 == null) || envEntry3.intValue() != 18338 ) {
+ throw new RuntimeException("invalid enventry3 value");
+ }
- FooManagedBean fmbl2 = (FooManagedBean) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-client/FooManagedBean");
- fmbl2.hello();
+ System.out.println("java:global/enventry4 = " + envEntry4);
+ if( (envEntry4 == null) || envEntry4.intValue() != 18338 ) {
+ throw new RuntimeException("invalid enventry4 value");
+ }
- } catch(NamingException e) {
- throw new RuntimeException(e);
- }
+ FooManagedBean fmbl = (FooManagedBean) new InitialContext().lookup("java:module/FooManagedBean");
+ fmbl.hello();
+
+ FooManagedBean fmbl2 = (FooManagedBean) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-client/FooManagedBean");
+ fmbl2.hello();
+
+ } catch(NamingException e) {
+ throw new RuntimeException(e);
+ }
}
public static void main(String args[]) {
for (String arg : args) {
System.out.println("Arg: " + arg);
}
- appName = args[0];
- principal = args[1];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ principal = args[1];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -140,156 +140,156 @@
public void doTest() {
- System.out.println("Executing test with user principal " + principal);
- boolean havePermission = principal.equals("bob");
- if( havePermission ) {
- System.out.println("Expecting permission to access protected methods");
- } else {
- System.out.println("NOT expecting permission to access protected methods");
- }
+ System.out.println("Executing test with user principal " + principal);
+ boolean havePermission = principal.equals("bob");
+ if( havePermission ) {
+ System.out.println("Expecting permission to access protected methods");
+ } else {
+ System.out.println("NOT expecting permission to access protected methods");
+ }
- String results;
+ String results;
- try {
-
- /**
- if( !appClient ) {
- System.out.println("In SE client. Using programmatic login");
- ProgrammaticLogin pm = new ProgrammaticLogin();
- pm.login("mary", "mob", "default", true);
- System.out.println("Programmatic login succeeded");
-
- }
- */
+ try {
- // ProgrammaticLogin login = new com.sun.appserv.security.api.ProgrammaticLogin();
-
- if( hello == null ) {
- hello = (Hello) new InitialContext().lookup("java:global/ejb-ejb31-security-simpleApp/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
- } else {
- // In an appclient.
- Hello hello2 = (Hello) new InitialContext().lookup("java:app/env/forappclient");
- System.out.println("java:app/env/forappclient lookup = " + hello2);
- System.out.println("hello3 = " + hello3);
+ /**
+ if( !appClient ) {
+ System.out.println("In SE client. Using programmatic login");
+ ProgrammaticLogin pm = new ProgrammaticLogin();
+ pm.login("mary", "mob", "default", true);
+ System.out.println("Programmatic login succeeded");
- Hello hello5 = (Hello) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
- System.out.println("hello4 = " + hello4);
- System.out.println("hello5 = " + hello5);
- String env = (String) new InitialContext().lookup("java:app/enventryforappclient");
- System.out.println("java:app env entry = " + env);
- }
+ }
+ */
- boolean pass;
+ // ProgrammaticLogin login = new com.sun.appserv.security.api.ProgrammaticLogin();
- try {
- hello.protectedSyncRemote();
- pass = havePermission;
- } catch(EJBAccessException e) {
- pass = !havePermission;
- }
-
+ if( hello == null ) {
+ hello = (Hello) new InitialContext().lookup("java:global/ejb-ejb31-security-simpleApp/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
+ } else {
+ // In an appclient.
+ Hello hello2 = (Hello) new InitialContext().lookup("java:app/env/forappclient");
+ System.out.println("java:app/env/forappclient lookup = " + hello2);
+ System.out.println("hello3 = " + hello3);
- System.out.println("pass = " + pass);
+ Hello hello5 = (Hello) new InitialContext().lookup("java:app/ejb-ejb31-security-simple-ejb/SingletonBean!com.acme.Hello");
+ System.out.println("hello4 = " + hello4);
+ System.out.println("hello5 = " + hello5);
+ String env = (String) new InitialContext().lookup("java:app/enventryforappclient");
+ System.out.println("java:app env entry = " + env);
+ }
- try {
- hello.unprotectedSyncRemote();
- pass = true;
- } catch(EJBAccessException e) {
- pass = false;
- }
+ boolean pass;
+
+ try {
+ hello.protectedSyncRemote();
+ pass = havePermission;
+ } catch(EJBAccessException e) {
+ pass = !havePermission;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- Future<Object> future = hello.protectedAsyncRemote();
- Object obj = future.get();
- pass = havePermission;
-
- } catch(ExecutionException ee) {
- if( ee.getCause() instanceof EJBAccessException ) {
- pass = !havePermission;
- } else {
- pass = false;
- }
- }
+ try {
+ hello.unprotectedSyncRemote();
+ pass = true;
+ } catch(EJBAccessException e) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
+
+ try {
+ Future<Object> future = hello.protectedAsyncRemote();
+ Object obj = future.get();
+ pass = havePermission;
+
+ } catch(ExecutionException ee) {
+ if( ee.getCause() instanceof EJBAccessException ) {
+ pass = !havePermission;
+ } else {
+ pass = false;
+ }
+ }
- try {
- Future<Object> future = hello.unprotectedAsyncRemote();
- Object obj = future.get();
- pass = true;
- } catch(ExecutionException ee) {
- pass = false;
- }
+ System.out.println("pass = " + pass);
+
+
+ try {
+ Future<Object> future = hello.unprotectedAsyncRemote();
+ Object obj = future.get();
+ pass = true;
+ } catch(ExecutionException ee) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testProtectedSyncLocal();
- pass = havePermission;
- } catch(EJBAccessException e) {
- pass = !havePermission;
- }
+ try {
+ hello.testProtectedSyncLocal();
+ pass = havePermission;
+ } catch(EJBAccessException e) {
+ pass = !havePermission;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testUnprotectedSyncLocal();
- pass = true;
- } catch(Exception e) {
- pass = false;
- }
+ try {
+ hello.testUnprotectedSyncLocal();
+ pass = true;
+ } catch(Exception e) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testProtectedAsyncLocal();
- pass = havePermission;
- } catch(EJBAccessException e) {
- pass = !havePermission;
- }
+ try {
+ hello.testProtectedAsyncLocal();
+ pass = havePermission;
+ } catch(EJBAccessException e) {
+ pass = !havePermission;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- try {
- hello.testUnprotectedAsyncLocal();
- pass = true;
- } catch(Exception e) {
- pass = false;
- }
+ try {
+ hello.testUnprotectedAsyncLocal();
+ pass = true;
+ } catch(Exception e) {
+ pass = false;
+ }
- System.out.println("pass = " + pass);
+ System.out.println("pass = " + pass);
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(NamingException ne) {
-
- if( appClient ) {
- stat.addStatus("local main", stat.FAIL);
- } else {
- System.out.println("Got expected security failure during lookup for non-authenticated SE client");
- stat.addStatus("local main", stat.PASS);
- }
+ } catch(NamingException ne) {
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ if( appClient ) {
+ stat.addStatus("local main", stat.FAIL);
+ } else {
+ System.out.println("Got expected security failure during lookup for non-authenticated SE client");
+ stat.addStatus("local main", stat.PASS);
+ }
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java
index 2cc7e66..aee2cef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean.java
@@ -31,21 +31,21 @@
@Resource
private FooManagedBean2 fmb2;
- @PostConstruct
+ @PostConstruct
private void init() {
System.out.println("In FooManagedBean::init()");
System.out.println("appName = " + appName);
fmb2.hello();
- }
+ }
public void hello() {
- System.out.println("In FooManagedBean::hello()");
+ System.out.println("In FooManagedBean::hello()");
}
-
+
@PreDestroy
- private void destroy() {
- System.out.println("In FooManagedBean::destroy()");
+ private void destroy() {
+ System.out.println("In FooManagedBean::destroy()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java
index 2bc7f3b..8481129 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/FooManagedBean2.java
@@ -28,26 +28,26 @@
String appName;
@Resource(name="java:module/env/fmbAppName", lookup="java:app/AppName")
- String appName2;
+ String appName2;
@Resource(lookup="java:module/env/fmbAppName")
- String appName3;
+ String appName3;
- @PostConstruct
+ @PostConstruct
private void init() {
System.out.println("In FooManagedBean2::init()");
System.out.println("appName = " + appName);
System.out.println("appName2 = " + appName2);
System.out.println("appName3 = " + appName3);
- }
+ }
public void hello() {
- System.out.println("In FooManagedBean2::hello()");
+ System.out.println("In FooManagedBean2::hello()");
}
@PreDestroy
- private void destroy() {
- System.out.println("In FooManagedBean2::destroy()");
+ private void destroy() {
+ System.out.println("In FooManagedBean2::destroy()");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml
index 89bcee1..9b7eb4e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/application-client.xml
@@ -31,7 +31,7 @@
<env-entry>
<env-entry-name>envEntry3</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
- <lookup-name>java:app/env/value1</lookup-name>
+ <lookup-name>java:app/env/value1</lookup-name>
</env-entry>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml
index 8079fbd..4b4fbd7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/ejb-jar.xml
@@ -23,7 +23,7 @@
<enterprise-beans>
<session>
<ejb-name>SingletonBean</ejb-name>
-
+
<env-entry>
<env-entry-name>java:app/enventryforappclient</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml
index 1e958ab..ec2df51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/descriptor/sun-ejb-jar.xml
@@ -21,10 +21,10 @@
<sun-ejb-jar>
<security-role-mapping>
<role-name>foo</role-name>
- <principal-name>bob</principal-name>
+ <principal-name>bob</principal-name>
</security-role-mapping>
<security-role-mapping>
<role-name>bar</role-name>
- <principal-name>mary</principal-name>
+ <principal-name>mary</principal-name>
</security-role-mapping>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
index 58d1488..7f1e43c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
@@ -43,27 +43,27 @@
public void init() {
System.out.println("In SingletonBean::init()");
System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new EJBException("null ORB");
- }
+ if( orb == null ) {
+ throw new EJBException("null ORB");
+ }
- Hello meViaAppClientDefinedDependency = (Hello)
- sessionCtx.lookup("java:app/env/appclientdefinedejbref1");
- System.out.println("meViaAppClientDefinedDependency =" +
- meViaAppClientDefinedDependency);
- Hello meViaAppClientDefinedDependency2 = (Hello)
- sessionCtx.lookup("java:app/appclientdefinedejbref2");
+ Hello meViaAppClientDefinedDependency = (Hello)
+ sessionCtx.lookup("java:app/env/appclientdefinedejbref1");
+ System.out.println("meViaAppClientDefinedDependency =" +
+ meViaAppClientDefinedDependency);
+ Hello meViaAppClientDefinedDependency2 = (Hello)
+ sessionCtx.lookup("java:app/appclientdefinedejbref2");
- Hello meViaAppClientDefinedDependency3 = (Hello)
- sessionCtx.lookup("java:global/appclientdefinedejbref3");
+ Hello meViaAppClientDefinedDependency3 = (Hello)
+ sessionCtx.lookup("java:global/appclientdefinedejbref3");
- String appLevelEnvEntry = (String)
- sessionCtx.lookup("java:app/env/enventry1");
- System.out.println("appLevelEnvEntry = " + appLevelEnvEntry);
+ String appLevelEnvEntry = (String)
+ sessionCtx.lookup("java:app/env/enventry1");
+ System.out.println("appLevelEnvEntry = " + appLevelEnvEntry);
- String globalLevelEnvEntry = (String)
- sessionCtx.lookup("java:global/enventry2");
- System.out.println("globalLevelEnvEntry = " + globalLevelEnvEntry);
+ String globalLevelEnvEntry = (String)
+ sessionCtx.lookup("java:global/enventry2");
+ System.out.println("globalLevelEnvEntry = " + globalLevelEnvEntry);
}
@@ -71,111 +71,111 @@
@RolesAllowed("foo")
public void protectedSyncRemote() {
- System.out.println("In SingletonBean::protectedSyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
+ System.out.println("In SingletonBean::protectedSyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
}
@PermitAll
public void unprotectedSyncRemote() {
- System.out.println("In SingletonBean::unprotectedSyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
+ System.out.println("In SingletonBean::unprotectedSyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
}
@RolesAllowed("foo")
@Asynchronous
public Future<Object> protectedAsyncRemote() {
- System.out.println("In SingletonBean::protectedAsyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::protectedAsyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@Asynchronous
@PermitAll
public Future<Object> unprotectedAsyncRemote() {
- System.out.println("In SingletonBean::unprotectedAsyncRemote cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::unprotectedAsyncRemote cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@RolesAllowed("foo")
@Asynchronous
public Future<Object> protectedAsyncLocal() {
- System.out.println("In SingletonBean::protectedAsyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::protectedAsyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@Asynchronous
@PermitAll
public Future<Object> unprotectedAsyncLocal() {
- System.out.println("In SingletonBean::unprotectedAsyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return new AsyncResult<Object>(new String());
+ System.out.println("In SingletonBean::unprotectedAsyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return new AsyncResult<Object>(new String());
}
@RolesAllowed("foo")
public void protectedSyncLocal() {
- System.out.println("In SingletonBean::protectedSyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return;
+ System.out.println("In SingletonBean::protectedSyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return;
}
-
+
@PermitAll
public void unprotectedSyncLocal() {
- System.out.println("In SingletonBean::unprotectedSyncLocal cp = " +
- sessionCtx.getCallerPrincipal() + " , " +
- Thread.currentThread());
- return ;
+ System.out.println("In SingletonBean::unprotectedSyncLocal cp = " +
+ sessionCtx.getCallerPrincipal() + " , " +
+ Thread.currentThread());
+ return ;
}
@PermitAll
public void testProtectedSyncLocal() {
- me.protectedSyncLocal();
+ me.protectedSyncLocal();
}
@PermitAll
public void testProtectedAsyncLocal() {
- try {
- Future<Object> future = me.protectedAsyncLocal();
- Object obj = future.get();
- } catch(Exception ee) {
- if( ee.getCause() instanceof EJBAccessException) {
- throw (EJBAccessException) ee.getCause();
- }
- }
+ try {
+ Future<Object> future = me.protectedAsyncLocal();
+ Object obj = future.get();
+ } catch(Exception ee) {
+ if( ee.getCause() instanceof EJBAccessException) {
+ throw (EJBAccessException) ee.getCause();
+ }
+ }
}
@PermitAll
public void testUnprotectedSyncLocal() {
- me.unprotectedSyncLocal();
+ me.unprotectedSyncLocal();
}
@PermitAll
public void testUnprotectedAsyncLocal() {
- try {
- Future<Object> future = me.unprotectedAsyncLocal();
- Object obj = future.get();
- // Success
- } catch(Exception ee) {
- throw (EJBException) new EJBException("Got unexpected exception").initCause(ee.getCause());
- }
+ try {
+ Future<Object> future = me.unprotectedAsyncLocal();
+ Object obj = future.get();
+ // Success
+ } catch(Exception ee) {
+ throw (EJBException) new EJBException("Got unexpected exception").initCause(ee.getCause());
}
-
+ }
+
@PreDestroy
public void destroy() {
System.out.println("In SingletonBean::destroy()");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml
index 1f84f81..1c8dc7f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/build.xml
@@ -60,9 +60,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-singleton tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-singleton tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties
index 4f123f5..e3a550b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-cache"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml
index 33783d4..29a3c19 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Cache*.class,**/Singleton*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
index 31ed837..42de21a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
@@ -26,17 +26,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -44,27 +44,27 @@
public void doTest() {
- try {
+ try {
- CacheRemote cache = (CacheRemote) new InitialContext().lookup("java:global/" + appName + "/CacheBean!com.acme.CacheRemote");
+ CacheRemote cache = (CacheRemote) new InitialContext().lookup("java:global/" + appName + "/CacheBean!com.acme.CacheRemote");
- // sleep for a few second
- int sleep = 11;
- System.out.println("Waiting " + sleep + " seconds for cache refresh...");
- System.out.println("(Lower this value once minimum timeout is 1 sec)");
- Thread.sleep(sleep * 1000);
- System.out.println("Waking up from sleep. Now check cache");
-
- int numRefreshes = cache.checkCache();
-
- System.out.println("Num refreshes = " + numRefreshes);
+ // sleep for a few second
+ int sleep = 11;
+ System.out.println("Waiting " + sleep + " seconds for cache refresh...");
+ System.out.println("(Lower this value once minimum timeout is 1 sec)");
+ Thread.sleep(sleep * 1000);
+ System.out.println("Waking up from sleep. Now check cache");
- stat.addStatus("local main", stat.PASS);
+ int numRefreshes = cache.checkCache();
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ System.out.println("Num refreshes = " + numRefreshes);
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
index d164b13..7f918ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
@@ -40,16 +40,16 @@
@PostConstruct
private void init() {
System.out.println("In Cache:init()");
- me = sesCtx.getBusinessObject(CacheBean.class);
- me.runAsync();
- try {
- System.out.println("Blocking 2 secs in init");
- Thread.sleep(1500);
- System.out.println("Waking up from sleep in init...");
- } catch(Exception e) {
- e.printStackTrace();
- }
- finishedInit = true;
+ me = sesCtx.getBusinessObject(CacheBean.class);
+ me.runAsync();
+ try {
+ System.out.println("Blocking 2 secs in init");
+ Thread.sleep(1500);
+ System.out.println("Waking up from sleep in init...");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ finishedInit = true;
}
@Asynchronous
@@ -57,55 +57,55 @@
public int checkCache() {
- if( failure ) {
- throw new EJBException(failureMsg);
- }
+ if( failure ) {
+ throw new EJBException(failureMsg);
+ }
- int refreshes = refreshCount.intValue();
- if( refreshes == 0 ) {
- throw new EJBException("no refreshes");
- }
+ int refreshes = refreshCount.intValue();
+ if( refreshes == 0 ) {
+ throw new EJBException("no refreshes");
+ }
- System.out.println("Successful cache check total refreshes = " + refreshes);
- return refreshes;
+ System.out.println("Successful cache check total refreshes = " + refreshes);
+ return refreshes;
}
@Schedule(second="*/1", minute="*", hour="*", persistent=false)
private void refresh() {
- int count = refreshCount.incrementAndGet();
- System.out.println("In Cache:refresh() num refreshes = " + count);
+ int count = refreshCount.incrementAndGet();
+ System.out.println("In Cache:refresh() num refreshes = " + count);
}
@PreDestroy
private void destroy() {
- shutdown = true;
+ shutdown = true;
System.out.println("In Cache:destroy()");
}
@Asynchronous
public void runAsync() {
- if( !finishedInit ) {
- failure = true;
- failureMsg = "Async called before init finished";
- }
-
- System.out.println("In Singleton::run()");
-
- while(!shutdown) {
-
- try {
- System.out.println("Going to sleep...");
- Thread.sleep(5000);
- System.out.println("Waking up from sleep...");
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- System.out.println("Exiting Cache::run() due to shutdown");
- return;
+ if( !finishedInit ) {
+ failure = true;
+ failureMsg = "Async called before init finished";
}
-
+
+ System.out.println("In Singleton::run()");
+
+ while(!shutdown) {
+
+ try {
+ System.out.println("Going to sleep...");
+ Thread.sleep(5000);
+ System.out.println("Waking up from sleep...");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ System.out.println("Exiting Cache::run() due to shutdown");
+ return;
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties
index f729454..573ef2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-hello"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml
index b72a40f..1a8433e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,24 +46,24 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Singleton*.class,**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="startDerby"/>
<sleep minutes="2"/>
- <antcall target="deploy-jar-common"/>
+ <antcall target="deploy-jar-common"/>
</target>
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="stopDerby"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
index c68e043..fceb402 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -47,37 +47,37 @@
public void doTest() {
- try {
+ try {
- // Ensure that MEJB is registered under all three of its JNDI names
- System.out.println("Looking up MEJB Homes");
- ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
- ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
+ // Ensure that MEJB is registered under all three of its JNDI names
+ System.out.println("Looking up MEJB Homes");
+ ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
+ ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+ ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
- System.out.println("mejb home obj 1 = " + mh1Obj);
- System.out.println("mejb home obj 2 = " + mh2Obj);
- System.out.println("mejb home obj 3 = " + mh3Obj);
+ System.out.println("mejb home obj 1 = " + mh1Obj);
+ System.out.println("mejb home obj 2 = " + mh2Obj);
+ System.out.println("mejb home obj 3 = " + mh3Obj);
- Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+ Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
- System.out.println("Singleton says : " + hello.hello());
+ System.out.println("Singleton says : " + hello.hello());
hello.async();
- try {
- hello.test_Err_or("foo", "bar");
- throw new RuntimeException("Expected EJBException");
- } catch(EJBException e) {
- System.out.println("Got expected EJBException after java.lang.Error thrown from ejb");
- }
+ try {
+ hello.test_Err_or("foo", "bar");
+ throw new RuntimeException("Expected EJBException");
+ } catch(EJBException e) {
+ System.out.println("Got expected EJBException after java.lang.Error thrown from ejb");
+ }
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java
index 9bb87ef..830ce33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client2.java
@@ -23,29 +23,29 @@
public static void main(String args[]) {
- String host;
- String port;
+ String host;
+ String port;
- try {
- Properties p = new Properties();
- if( args.length > 0 ) {
- host = args[0];
- p.put("org.omg.CORBA.ORBInitialHost", host);
- }
+ try {
+ Properties p = new Properties();
+ if( args.length > 0 ) {
+ host = args[0];
+ p.put("org.omg.CORBA.ORBInitialHost", host);
+ }
- if( args.length > 1 ) {
- port = args[1];
- p.put("org.omg.CORBA.ORBInitialPort", port);
- }
+ if( args.length > 1 ) {
+ port = args[1];
+ p.put("org.omg.CORBA.ORBInitialPort", port);
+ }
- InitialContext ic = new InitialContext(p);
- Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
- h.hello();
+ InitialContext ic = new InitialContext(p);
+ Hello h = (Hello) ic.lookup("HH#com.acme.Hello");
+ h.hello();
- } catch(Exception e) {
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
index 2bdd2ab..8f44c96 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
@@ -24,8 +24,8 @@
@Entity
public class FooEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -33,10 +33,10 @@
public FooEntity(String name) {
setName(name);
}
-
+
public FooEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
index 61b72f1..c23f7cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
@@ -54,7 +54,7 @@
ManagementHome mHome2;
*/
-
+
//MEJBHome mHome2;
@@ -63,30 +63,30 @@
public void init() {
System.out.println("In SingletonBean::init()");
System.out.println("orb = " + orb);
- if( orb == null ) {
- throw new EJBException("null ORB");
- }
- try {
- // same problem ManagementHome mHomeL = (ManagementHome) new InitialContext().lookup("java:comp/env/mejb");
- // same problem ManagementHome mHomeL2 = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
- // System.out.println("mHomeL = " + mHomeL);
- // System.out.println("mHomeL2 = " + mHomeL2);
- } catch(Exception e) {
- throw new EJBException(e);
- }
+ if( orb == null ) {
+ throw new EJBException("null ORB");
+ }
+ try {
+ // same problem ManagementHome mHomeL = (ManagementHome) new InitialContext().lookup("java:comp/env/mejb");
+ // same problem ManagementHome mHomeL2 = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+ // System.out.println("mHomeL = " + mHomeL);
+ // System.out.println("mHomeL2 = " + mHomeL2);
+ } catch(Exception e) {
+ throw new EJBException(e);
+ }
- // System.out.println("mHome1 = " + mHome1);
- // System.out.println("mHome2 = " + mHome2);
+ // System.out.println("mHome1 = " + mHome1);
+ // System.out.println("mHome2 = " + mHome2);
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
- return "hello, world!\n";
+ System.out.println("In SingletonBean::hello()");
+ return "hello, world!\n";
}
public void test_Err_or(String s1, String s2) {
- throw new Error("test java.lang.Error");
+ throw new Error("test java.lang.Error");
}
@Asynchronous
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties
index dddab6e..8cfaf68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-multimodule"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.sun.devtest.client.Client"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml
index e851c5a..07d3188 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/build.xml
@@ -30,14 +30,14 @@
&testproperties;
<target name="all" depends="build,deploy">
- <antcall target="run"/>
- <antcall target="undeploy-common"/>
+ <antcall target="run"/>
+ <antcall target="undeploy-common"/>
</target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,77 +49,77 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
- <echo message="Assemble dir: ${assemble.dir} "/>
+ <echo message="Assemble dir: ${assemble.dir} "/>
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Tracker.class, **/InitOrderTrackerBean.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod1.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod2.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-client.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-client.jar"
+ basedir="${build.classes.dir}"
update="true"
- manifest="./client/MANIFEST.MF"
+ manifest="./client/MANIFEST.MF"
includes ="**/*Tracker.class, **/*Client.class">
</jar>
<!--
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-multimodule-ejb.jar
+ <param name="appclientjar.files"
+ value="${build.classes.dir}"/>
+ <param name="appclient.jar"
+ value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-multimodule-ejb.jar
</antcall>
-->
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*ejb.jar"/>
- <include name="*ejb1.jar"/>
- <include name="*ejb2.jar"/>
- <include name="*client.jar"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- <include name="META-INF/application.xml"/>
- </fileset>
- <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ <delete file="${assemble.dir}/${appname}.ear"/>
+ <mkdir dir="${assemble.dir}"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${assemble.dir}">
+ <include name="*ejb.jar"/>
+ <include name="*ejb1.jar"/>
+ <include name="*ejb2.jar"/>
+ <include name="*client.jar"/>
+ </fileset>
+ <fileset dir="${build.classes.dir}">
+ <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
+ </fileset>
+ <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+ </jar>
- </target>
-
+ </target>
+
<target name="deploy" depends="build">
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="--force=true"/>
- <arg line="${as.props}"/>
+ <arg line="${as.props}"/>
<arg line="${deployed.app}"/>
</exec>
<echo message="Deployment on target server ${appserver.instance.name} successful"/>
-
- </target>
+
+ </target>
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="se.client: ${se.client}"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
index e460cbf..5646995 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
@@ -31,23 +31,23 @@
public class Client {
- private static String[] BEAN_NAMES = new String[] {
- "org.glassfish.devtest.ejb31.singleton.multimodule.servlet.InitOrderTrackerBean",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.BeanA_Mod1",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.RootBean_Mod1",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.BeanA_Mod2",
- "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.RootBean_Mod2"
- };
+ private static String[] BEAN_NAMES = new String[] {
+ "org.glassfish.devtest.ejb31.singleton.multimodule.servlet.InitOrderTrackerBean",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.BeanA_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod1.RootBean_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.BeanA_Mod2",
+ "org.glassfish.devtest.ejb31.singleton.multimodule.mod2.RootBean_Mod2"
+ };
- private static final String INIT_ORDER_BEAN = BEAN_NAMES[0];
+ private static final String INIT_ORDER_BEAN = BEAN_NAMES[0];
- private static final String BEAN_MOD1 = BEAN_NAMES[1];
+ private static final String BEAN_MOD1 = BEAN_NAMES[1];
- private static final String ROOT1 = BEAN_NAMES[2];
+ private static final String ROOT1 = BEAN_NAMES[2];
- private static final String BEAN_MOD2 = BEAN_NAMES[3];
+ private static final String BEAN_MOD2 = BEAN_NAMES[3];
- private static final String ROOT2 = BEAN_NAMES[4];
+ private static final String ROOT2 = BEAN_NAMES[4];
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -65,37 +65,37 @@
}
private void test() {
- try {
-
- String lookupName = "java:global/ejb-ejb31-singleton-multimoduleApp/ejb-ejb31-singleton-multimodule-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker";
- System.out.println("*****************************************************");
- System.out.println("*** " + lookupName + " ***");
- System.out.println("*****************************************************");
- tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
-
- Map<String, Integer> initOrder = tracker.getInitializedNames();
- boolean result = initOrder.size() == BEAN_NAMES.length;
+ try {
- int b1m1 = initOrder.get(BEAN_MOD1);
- int b2m2 = initOrder.get(BEAN_MOD2);
- int root1 = initOrder.get(ROOT1);
- int root2 = initOrder.get(ROOT2);
+ String lookupName = "java:global/ejb-ejb31-singleton-multimoduleApp/ejb-ejb31-singleton-multimodule-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker";
+ System.out.println("*****************************************************");
+ System.out.println("*** " + lookupName + " ***");
+ System.out.println("*****************************************************");
+ tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
- boolean test1 = b1m1 < root1;
- boolean test2 = root1 < root2;
- boolean test3 = b2m2 < root2;
- for (String key : initOrder.keySet()) {
- System.out.println(key + ": " + initOrder.get(key));
- }
+ Map<String, Integer> initOrder = tracker.getInitializedNames();
+ boolean result = initOrder.size() == BEAN_NAMES.length;
- result = result && test1 && test2 && test3;
+ int b1m1 = initOrder.get(BEAN_MOD1);
+ int b2m2 = initOrder.get(BEAN_MOD2);
+ int root1 = initOrder.get(ROOT1);
+ int root2 = initOrder.get(ROOT2);
- stat.addStatus("EJB singleton-cross-module-dependency",
- (result ? stat.PASS : stat.FAIL));
- } catch (Throwable th) {
- th.printStackTrace();
- stat.addStatus("EJB singleton-cross-module-dependency", stat.FAIL);
- }
+ boolean test1 = b1m1 < root1;
+ boolean test2 = root1 < root2;
+ boolean test3 = b2m2 < root2;
+ for (String key : initOrder.keySet()) {
+ System.out.println(key + ": " + initOrder.get(key));
+ }
+
+ result = result && test1 && test2 && test3;
+
+ stat.addStatus("EJB singleton-cross-module-dependency",
+ (result ? stat.PASS : stat.FAIL));
+ } catch (Throwable th) {
+ th.printStackTrace();
+ stat.addStatus("EJB singleton-cross-module-dependency", stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index f10b62f..899bdd3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -46,5 +46,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index b96868f..a8e8010 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -37,10 +37,10 @@
@EJB
LocalInitTracker tracker;
-
+
@PostConstruct
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index a9738b1..2c9808e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -47,5 +47,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index dd49b4d..cf306eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -22,7 +22,7 @@
@Local
public interface LocalInitTracker {
-
+
public void add(String entry);
public Map<String, Integer> getInitializedNames();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties
index 971e12f..c9841de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-singleton-threemodules"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.sun.devtest.client.Client"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml
index ba787e5..e9423ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/build.xml
@@ -30,14 +30,14 @@
&testproperties;
<target name="all" depends="build,deploy">
- <antcall target="run"/>
- <antcall target="undeploy-common"/>
+ <antcall target="run"/>
+ <antcall target="undeploy-common"/>
</target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,77 +49,77 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
- <echo message="Assemble dir: ${assemble.dir} "/>
+ <echo message="Assemble dir: ${assemble.dir} "/>
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Tracker.class, **/InitOrderTrackerBean.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb1.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod1.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb2.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/*Mod2.class, **/LocalInitTracker.class">
</jar>
- <jar jarfile="${assemble.dir}/${appname}-client.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-client.jar"
+ basedir="${build.classes.dir}"
update="true"
- manifest="./client/MANIFEST.MF"
+ manifest="./client/MANIFEST.MF"
includes ="**/*Tracker.class, **/*Client.class">
</jar>
<!--
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-threemodules-ejb.jar
+ <param name="appclientjar.files"
+ value="${build.classes.dir}"/>
+ <param name="appclient.jar"
+ value="${assemble.dir}/${appname}-client.jar"/>/space/work/v3/appserv-tests/build/module/archive/ejb-ejb31-singleton-threemodules-ejb.jar
</antcall>
-->
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*ejb.jar"/>
- <include name="*ejb1.jar"/>
- <include name="*ejb2.jar"/>
- <include name="*client.jar"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- <include name="META-INF/application.xml"/>
- </fileset>
- <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ <delete file="${assemble.dir}/${appname}.ear"/>
+ <mkdir dir="${assemble.dir}"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${assemble.dir}">
+ <include name="*ejb.jar"/>
+ <include name="*ejb1.jar"/>
+ <include name="*ejb2.jar"/>
+ <include name="*client.jar"/>
+ </fileset>
+ <fileset dir="${build.classes.dir}">
+ <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
+ </fileset>
+ <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+ </jar>
- </target>
-
+ </target>
+
<target name="deploy" depends="build">
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="--force=true"/>
- <arg line="${as.props}"/>
+ <arg line="${as.props}"/>
<arg line="${deployed.app}"/>
</exec>
<echo message="Deployment on target server ${appserver.instance.name} successful"/>
-
- </target>
+
+ </target>
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="se.client: ${se.client}"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/${appname}-ejb.jar:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
index aeb38c4..ad88800 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
@@ -33,13 +33,13 @@
public class Client {
- private static String[] EXPECTED_ORDER = new String[] {
- "org.glassfish.devtest.ejb31.singleton.servlet.InitOrderTrackerBean",
- "org.glassfish.devtest.ejb31.singleton.mod1.BeanA_Mod1",
- "org.glassfish.devtest.ejb31.singleton.mod1.RootBean_Mod1",
- "org.glassfish.devtest.ejb31.singleton.mod2.BeanA_Mod2",
- "org.glassfish.devtest.ejb31.singleton.mod2.RootBean_Mod2"
- };
+ private static String[] EXPECTED_ORDER = new String[] {
+ "org.glassfish.devtest.ejb31.singleton.servlet.InitOrderTrackerBean",
+ "org.glassfish.devtest.ejb31.singleton.mod1.BeanA_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.mod1.RootBean_Mod1",
+ "org.glassfish.devtest.ejb31.singleton.mod2.BeanA_Mod2",
+ "org.glassfish.devtest.ejb31.singleton.mod2.RootBean_Mod2"
+ };
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -57,28 +57,28 @@
}
private void test() {
- try {
-
- String lookupName = "java:global/ejb-ejb31-singleton-threemodulesApp/ejb-ejb31-singleton-threemodules-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker";
- System.out.println("*****************************************************");
- System.out.println("*** " + lookupName + " ***");
- System.out.println("*****************************************************");
- tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
-
- List<String> actualList = tracker.getInitializedNames();
- boolean result = actualList.size() == EXPECTED_ORDER.length;
- for (int i=0; i<EXPECTED_ORDER.length; i++) {
- if (! EXPECTED_ORDER[i].equals(actualList.get(i))) {
- result = false;
- }
- }
+ try {
+
+ String lookupName = "java:global/ejb-ejb31-singleton-threemodulesApp/ejb-ejb31-singleton-threemodules-ejb/InitOrderTrackerBean!org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker";
+ System.out.println("*****************************************************");
+ System.out.println("*** " + lookupName + " ***");
+ System.out.println("*****************************************************");
+ tracker = (RemoteInitTracker) new InitialContext().lookup(lookupName);
+
+ List<String> actualList = tracker.getInitializedNames();
+ boolean result = actualList.size() == EXPECTED_ORDER.length;
+ for (int i=0; i<EXPECTED_ORDER.length; i++) {
+ if (! EXPECTED_ORDER[i].equals(actualList.get(i))) {
+ result = false;
+ }
+ }
System.out.println(actualList);
- stat.addStatus("EJB singleton-three-module-dependency",
- (result ? stat.PASS : stat.FAIL));
- } catch (Throwable th) {
- th.printStackTrace();
- stat.addStatus("EJB singleton-three-module-dependency", stat.FAIL);
- }
+ stat.addStatus("EJB singleton-three-module-dependency",
+ (result ? stat.PASS : stat.FAIL));
+ } catch (Throwable th) {
+ th.printStackTrace();
+ stat.addStatus("EJB singleton-three-module-dependency", stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index 1fdc8e0..681d041 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -46,5 +46,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index 2b60295..3909cc4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -37,10 +37,10 @@
@EJB
LocalInitTracker tracker;
-
+
@PostConstruct
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index 900d211..67787ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -47,5 +47,5 @@
public void afterInit() {
tracker.add(this.getClass().getName());
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index a2ccdd8..d41bd0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -22,7 +22,7 @@
@Local
public interface LocalInitTracker {
-
+
public void add(String entry);
public List getInitializedNames();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties
index eccf2e7..ed7bef0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-aroundtimeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb31.aroundtimeout.client.StandaloneClient"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml
index b130fa7..aa9b030 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class,**/Common*.class,**/Interceptor*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class,**/Sful2.class,**/Sless3.class,**/Sless4.class,**/Sless5.class,**/Sless6.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
index 8b7e34f..48caac5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
@@ -25,7 +25,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) throws Exception {
@@ -36,11 +36,11 @@
Thread.sleep(7000);
client.doTest();
stat.printSummary("ejb-ejb31-aroundtimeoutID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
private static @EJB Sless3 sless3;
private static @EJB Sless4 sless4;
private static @EJB Sless5 sless5;
@@ -81,8 +81,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
index b6eb3a7..faf2a1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
@@ -36,16 +36,16 @@
static void aroundTimeoutCalled(InvocationContext ctx, String id) {
- List<String> aroundtimeout = (List<String>)
+ List<String> aroundtimeout = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
-
+
if( aroundtimeout == null ) {
aroundtimeout = new LinkedList<String>();
ctx.getContextData().put(INTERCEPTORS_PROP, aroundtimeout);
}
aroundtimeout.add(id);
-
+
}
static void checkResults(InvocationContext ctx) {
@@ -82,9 +82,9 @@
for( char nextChar : methodNameUpper.toCharArray() ) {
expected.add(nextChar + "");
}
- }
+ }
- List<String> actual = (List<String>)
+ List<String> actual = (List<String>)
ctx.getContextData().get(INTERCEPTORS_PROP);
String msg = "Expected " + expected + " for method " +
@@ -101,7 +101,7 @@
}
calls.add(info);
}
-
+
static void checkResults(String s0, int expected) {
List<String> results = new ArrayList<String>();
for (String s : calls) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
index 699640b..ccebf5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
@@ -26,7 +26,7 @@
public class InterceptorA {
@Resource SessionContext sessionCtx;
-
+
@PostConstruct
private void postConstruct(InvocationContext ctx) {
try {
@@ -38,7 +38,7 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
/**
// access injected environment dependency
@@ -49,10 +49,10 @@
// look up ejb-ref defined within default interceptor in ejb-jar.xml
InitialContext ic = new InitialContext();
Sless3 sless3 = (Sless3) ic.lookup("java:comp/env/ejb/Sless3");
-
-
+
+
Common.aroundTimeoutCalled(ctx, "A");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
index 741452d..69093e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
@@ -32,9 +32,9 @@
// around-timeout declared in ejb-jar.xml
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "B");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
index d015b9b..82f8e46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
@@ -33,9 +33,9 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "C");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
index 104ef8e..73f2120 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
@@ -35,7 +35,7 @@
@AroundTimeout
@AroundInvoke
Object aroundAll(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "D");
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB5 ) {
@@ -44,5 +44,5 @@
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
index 56cb0cf..aa3d5b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
@@ -33,9 +33,9 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "E");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
index 34c91ab..ea4b892 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
@@ -33,9 +33,9 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "F");
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
index c747fc1..4f35af9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
@@ -34,7 +34,7 @@
@AroundTimeout
Object aroundTimeout(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Common.aroundTimeoutCalled(ctx, "G");
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB6 ) {
@@ -43,10 +43,10 @@
}
return ctx.proceed();
}
-
+
@AroundInvoke
Object aroundInvoke(InvocationContext ctx)
- throws Exception {
+ throws Exception {
Object instance = ctx.getTarget();
if( instance instanceof SlessEJB6 ) {
((SlessEJB6) instance).aroundTimeoutCalled = false;
@@ -54,5 +54,5 @@
}
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
index cfc4e10..af61cb5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless3
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
index 5b56aa6..14a961a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless4
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
index 4fcb31e..c233296 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless5
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
index 77f94db..0eaa459 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
import jakarta.ejb.Remote;
-
+
@Remote
public interface Sless6
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
index 018cf92..a2f0d51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
@@ -61,18 +61,18 @@
@Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-dcef")
private void dcef() {}
-
+
@ExcludeDefaultInterceptors
@ExcludeClassInterceptors
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-nothing")
private void nothing() {}
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-dcbaef")
private void dcbaef() {}
// total ordering overridden in deployment descriptor
- @Interceptors({InterceptorE.class, InterceptorF.class})
+ @Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB3-abcdef")
private void abcdef() {}
@@ -91,7 +91,7 @@
Common.checkResults(ctx);
return null;
}
-
+
@AroundInvoke
private Object aroundInvoke(InvocationContext ctx) throws Exception
{
@@ -101,7 +101,7 @@
}
return ctx.proceed();
}
-
+
public void verify() {
Common.checkResults("SlessEJB3", EXPECTED);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
index 812be99..39fbdee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
@@ -45,7 +45,7 @@
// aroundTimeout should be still false, and exception is expected.
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-cbd")
public void cbd() {
- System.out.println("in SlessEJB4:cbd(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB4:cbd(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
// a little extra checking to make sure aroundTimeout is invoked...
@@ -68,13 +68,13 @@
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-abef")
public void abef(Timer t) {}
- // @ExcludeDefaultInterceptors is a no-op here since it
+ // @ExcludeDefaultInterceptors is a no-op here since it
// was already excluded at class-level
@ExcludeDefaultInterceptors
@Interceptors({InterceptorE.class, InterceptorF.class})
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-cbdef")
public void cbdef() {}
-
+
@ExcludeClassInterceptors
@Schedule(second="*", minute="*", hour="*", info="SlessEJB4-nothing")
public void nothing() {}
@@ -91,7 +91,7 @@
throw new EJBException(e);
}
}
-
+
public void verify() {
Common.checkResults("SlessEJB4", EXPECTED);
Collection<Timer> timers = timerSvc.getTimers();
@@ -100,5 +100,5 @@
aroundTimeoutCalled = false;
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
index ebda1ba..81e844c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
@@ -40,18 +40,18 @@
private final static int EXPECTED = 3;
- // Called as a timeout and through interface. InderceptorD will
+ // Called as a timeout and through interface. InderceptorD will
// set aroundAllCalled to true either way.
@Schedule(second="*", minute="*", hour="*", info="SlessEJB5-abdc")
public void abdc() {
- System.out.println("in SlessEJB5:abdc(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB5:abdc(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
// a little extra checking to make sure AroundTimeout is invoked...
if( !aroundTimeoutCalled ) {
throw new EJBException("bean class aroundTimeout not called");
}
- // Enough if it is set once to true. Otherwise a timer can be executed
+ // Enough if it is set once to true. Otherwise a timer can be executed
// between verify() and direct call to this method through the interface
// aroundTimeoutCalled = false;
@@ -84,11 +84,11 @@
throw new EJBException(e);
}
}
-
+
public void verify() {
Common.checkResults("SlessEJB5", EXPECTED);
aroundTimeoutCalled = true;
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
index b62a976..69bf805 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
@@ -44,9 +44,9 @@
// Called as a timeout only. InterceptorG has 2 separate aroundXXX calls.
@Interceptors({InterceptorA.class, InterceptorG.class})
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-ag")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-ag")
public void ag() {
- System.out.println("in SlessEJB6:ag(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:ag(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -60,11 +60,11 @@
Common.storeResult("SlessEJB6-ag");
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-ag")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-ag")
public void ag(Timer t) {
System.out.println("in SlessEJB6:ag(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( aroundTimeoutCalled ) {
aroundTimeoutCalled = false;
throw new EJBException("bean class aroundTimeout was incorrectly called");
@@ -76,11 +76,11 @@
Common.storeResult("SlessEJB6_Timer-ag");
}
- // bg() (but not bg(param)) marked through ejb-jar.xml
+ // bg() (but not bg(param)) marked through ejb-jar.xml
// as having aroundtimeout B,G
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-bg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-bg")
public void bg() {
- System.out.println("in SlessEJB6:bg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:bg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -94,11 +94,11 @@
Common.storeResult("SlessEJB6-bg");
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-bg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-bg")
public void bg(Timer t) {
System.out.println("in SlessEJB6:bg(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( aroundTimeoutCalled ) {
aroundTimeoutCalled = false;
throw new EJBException("bean class aroundTimeout was incorrectly called");
@@ -112,9 +112,9 @@
// overloaded version of interceptor-binding used in ejb-jar.xml to
// mark all methods with name cg as having aroundtimeout C,G
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-cg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-cg")
public void cg() {
- System.out.println("in SlessEJB6:cg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:cg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -128,9 +128,9 @@
Common.storeResult("SlessEJB6-cg");
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-cg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-cg")
public void cg(Timer t) {
- System.out.println("in SlessEJB6:cg(Timer t). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:cg(Timer t). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( !aroundTimeoutCalled ) {
@@ -144,12 +144,12 @@
Common.storeResult("SlessEJB6_Timer-cg");
}
- // Kind of like ag(), in that dg() is overloaded, but it's the
+ // Kind of like ag(), in that dg() is overloaded, but it's the
// signature that has a parameter that is assigned aroundtimeout using
// @Interceptor.
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-dg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-dg")
public void dg() {
- System.out.println("in SlessEJB6:dg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:dg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( aroundTimeoutCalled ) {
@@ -164,11 +164,11 @@
}
@Interceptors({InterceptorD.class, InterceptorG.class})
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-dg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-dg")
public void dg(Timer t) {
System.out.println("in SlessEJB6:dg(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( !aroundTimeoutCalled ) {
throw new EJBException("bean class aroundTimeout not called");
}
@@ -184,9 +184,9 @@
// Like dg(), except that dg(Timer t) is assigned its interceptor
// chain through ejb-jar.xml
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-eg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6-eg")
public void eg() {
- System.out.println("in SlessEJB6:eg(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:eg(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( aroundTimeoutCalled ) {
@@ -204,7 +204,7 @@
// 2 separate aroundXXX calls.
@Interceptors({InterceptorA.class, InterceptorG.class})
public void noaroundtimeout() {
- System.out.println("in SlessEJB6:noaroundtimeout(). aroundTimeoutCalled = " +
+ System.out.println("in SlessEJB6:noaroundtimeout(). aroundTimeoutCalled = " +
aroundTimeoutCalled);
if( aroundTimeoutCalled ) {
@@ -217,11 +217,11 @@
aroundInvokeCalled = false;
}
- @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-eg")
+ @Schedule(second="*", minute="*", hour="*", info="SlessEJB6_Timer-eg")
public void eg(Timer t) {
System.out.println("in SlessEJB6:eg(Timer t). " +
"aroundTimeoutCalled = " + aroundTimeoutCalled);
-
+
if( !aroundTimeoutCalled ) {
throw new EJBException("bean class aroundTimeout not called");
}
@@ -239,5 +239,5 @@
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
index 87b5107..264b8a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
@@ -31,7 +31,7 @@
@Stateless
@ExcludeDefaultInterceptors
@Interceptors({InterceptorD.class, InterceptorC.class})
-public class SlessEJB7
+public class SlessEJB7
{
private final static int EXPECTED = 1;
@@ -52,7 +52,7 @@
Common.storeResult("SlessEJB7-dc");
return null;
}
-
+
@AroundInvoke
private Object aroundInvoke(InvocationContext ctx) throws Exception
{
@@ -61,7 +61,7 @@
return ctx.proceed();
}
-
+
public void verify() {
Common.checkResults("SlessEJB7", EXPECTED);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml
index cd41c10..49352a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/build.xml
@@ -90,17 +90,17 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-timer tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-timer tests)
- ant nonpersistenttimer (Executes the non-persistent ejb-timer test)
- ant schedule_exp (Executes the schedule_exp ejb-timer test)
- ant schedule_ann (Executes the schedule_ann ejb-timer test)
- ant schedule_on_ejb_timeout (Executes the schedule_on_ejb_timeout ejb-timer test)
- ant aroundtimeout (Executes the aroundtimeout ejb-timer test)
- ant mdb (Executes the mdb ejb-timer test)
+ ant nonpersistenttimer (Executes the non-persistent ejb-timer test)
+ ant schedule_exp (Executes the schedule_exp ejb-timer test)
+ ant schedule_ann (Executes the schedule_ann ejb-timer test)
+ ant schedule_on_ejb_timeout (Executes the schedule_on_ejb_timeout ejb-timer test)
+ ant aroundtimeout (Executes the aroundtimeout ejb-timer test)
+ ant mdb (Executes the mdb ejb-timer test)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties
index bf38417..70c969d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.properties
@@ -15,15 +15,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-keepstate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml
index cf23989..4e0bb80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,8 +49,8 @@
<param name="ejbjar.classes" value="**/KeepState*.class" />
<param name="appclientjar.classes" value="**/Client.class,**/KeepStateIF.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="First time deploy succeeded." />
@@ -90,10 +90,10 @@
value="--force=true --keepstate=${keepstate} --retrieve ${assemble.dir} ${assemble.dir}/${appname}App.ear "/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
index b1d85fe..bd797b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
@@ -26,7 +26,7 @@
@EJB private static KeepStateIF bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean keepState = Boolean.valueOf(args[0]);
String testName = "ejb31-timer-keepstate-" + keepState;
stat.addDescription(testName);
@@ -41,7 +41,7 @@
}
public static void testKeepState(boolean keepState) throws Exception {
- String result = bean.verifyTimers(keepState);
+ String result = bean.verifyTimers(keepState);
System.out.println("testKeepStateTrue result: " + result);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
index 0a0a08a..922a114 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
@@ -23,9 +23,9 @@
@Singleton
public class KeepStateBean implements KeepStateIF {
private List<String> infos = new ArrayList<String>();
-
+
/**
- * keepstate is passed from build.xml to appclient as application args, and to this
+ * keepstate is passed from build.xml to appclient as application args, and to this
* business method. The test EAR app is deployed once first, then KeepStateIF.INFO
* is modified, rebuild, and redeployed. If redeployed with keepstate true, no new
* auto timers are created, and existing timers are carried over. So these timers
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties
index 293480d..44f14c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb31-timer31-mdb"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml
index dab2b413..b6413bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Interceptor*.class,**/Singleton*.class,**/MessageBean.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,16 +65,16 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -85,7 +85,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
index 7c6869e..71efffb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
@@ -26,17 +26,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -44,29 +44,29 @@
public void doTest() {
- try {
+ try {
- SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.SingletonRemote");
+ SingletonRemote singleton = (SingletonRemote) new InitialContext().lookup("java:global/" + appName + "/SingletonBean!com.acme.SingletonRemote");
- System.out.println("Waiting a few seconds for timer callback...");
- try {
- Thread.sleep(4000);
- } catch(Exception e) {
- e.printStackTrace();
- }
+ System.out.println("Waiting a few seconds for timer callback...");
+ try {
+ Thread.sleep(4000);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
- System.out.println("Test passed = " + singleton.getTestPassed());
+ System.out.println("Test passed = " + singleton.getTestPassed());
- if( singleton.getTestPassed() ) {
- stat.addStatus("local main", stat.PASS);
- } else {
- stat.addStatus("local main", stat.FAIL);
- }
+ if( singleton.getTestPassed() ) {
+ stat.addStatus("local main", stat.PASS);
+ } else {
+ stat.addStatus("local main", stat.FAIL);
+ }
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml
index c9b225d..6915cd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/sun-ejb-jar.xml
@@ -21,6 +21,6 @@
<sun-ejb-jar>
<security-role-mapping>
<role-name>foo</role-name>
- <principal-name>bob</principal-name>
+ <principal-name>bob</principal-name>
</security-role-mapping>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
index b35a245..ee79a41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
@@ -31,5 +31,5 @@
bean.mname = m.getName();
return ctx.proceed();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
index ad18dfc..aa73094 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
@@ -40,50 +40,50 @@
String mname;
- @EJB
+ @EJB
private SingletonBean singleton;
@Resource
- private MessageDrivenContext mdc;
-
+ private MessageDrivenContext mdc;
+
@PostConstruct
public void init() {
System.out.println("In MessageBean::init()");
}
public void onMessage(Message message) {
- System.out.println("In MessageBean::onMessage()");
- System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
+ System.out.println("In MessageBean::onMessage()");
+ System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
verifyMethodName("onMessage");
}
@Schedule(second="*/1", minute="*", hour="*")
private void onTimeout() {
- System.out.println("In MessageBean::onTimeout()");
- System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
+ System.out.println("In MessageBean::onTimeout()");
+ System.out.println("getCallerPrincipal = " + mdc.getCallerPrincipal());
verifyMethodName("onTimeout");
- try {
- System.out.println("IsCallerInRole('foo')= " +
- mdc.isCallerInRole("foo"));
- throw new EJBException("Expecting IllegalStateEXception for call to isCallerInRole() from timer callback");
- } catch(IllegalStateException ise) {
- System.out.println("Successfully received exception for invocation of isCallerInRole from timer callback");
- }
-
+ try {
+ System.out.println("IsCallerInRole('foo')= " +
+ mdc.isCallerInRole("foo"));
+ throw new EJBException("Expecting IllegalStateEXception for call to isCallerInRole() from timer callback");
+ } catch(IllegalStateException ise) {
+ System.out.println("Successfully received exception for invocation of isCallerInRole from timer callback");
+ }
+
if (singleton.getAroundTimeoutCalled(null)) {
- singleton.test1Passed();
+ singleton.test1Passed();
}
}
private void onDDTimeout(Timer t) {
- System.out.println("In MessageBean::onDDTimeout()");
+ System.out.println("In MessageBean::onDDTimeout()");
if (singleton.getAroundTimeoutCalled((String)t.getInfo())) {
- singleton.test2Passed();
+ singleton.test2Passed();
}
}
-
+
@PreDestroy
public void destroy() {
System.out.println("In MessageBean::destroy()");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
index 6494096..46cd841 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
@@ -36,17 +36,17 @@
public void init() {
System.out.println("In SingletonBean::init()");
}
-
+
public void test1Passed() {
- passed1 = true;
+ passed1 = true;
}
public void test2Passed() {
- passed2 = true;
+ passed2 = true;
}
public boolean getTestPassed() {
- return passed1 && passed2;
+ return passed1 && passed2;
}
public boolean getAroundTimeoutCalled(String s) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties
index 9fc0842..4514e12 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-methodintf"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="client.timer31.methodintf.Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml
index dae6f4f..2f1b034 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${jndiroot}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
index 93c157c..761e5de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
@@ -25,12 +25,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb31-timer-methodintf");
try {
@@ -39,7 +39,7 @@
System.out.println("Waiting timers to expire for schedule_ann timer test");
Thread.sleep(8000);
System.out.println("Verifying timers transaction status");
- boolean pass = bean.verifyTimers();
+ boolean pass = bean.verifyTimers();
stat.addStatus("methodintf: ", ((pass)? stat.PASS : stat.FAIL) );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties
index 08ea5f8..fcb6fc2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-nonpersistenttimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml
index a01e70e..eb3d2de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="com/sun/s1asdev/ejb31/timer/nonpersistenttimer/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/StatefulWrapper.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
index 0a357f1..6059111 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
@@ -25,14 +25,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static StatefulWrapper wrapper;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb31-timer-nonpersistenttimer");
@@ -54,22 +54,22 @@
stat.addStatus("Foo: ejbs/Foo_BMT", (result)? stat.PASS : stat.FAIL);
- /** TODO
+ /** TODO
result = wrapper.doMessageDrivenTest("jms/TimerMDBQueue_CMT", doJms);
- System.out.println("Message-driven test jms/TimerMDBQueue_CMT"
+ System.out.println("Message-driven test jms/TimerMDBQueue_CMT"
+ ((result)? " passed!!" : "failed!!"));
- stat.addStatus("Message-driven test: jms/TimerMDBQueue_CMT",
+ stat.addStatus("Message-driven test: jms/TimerMDBQueue_CMT",
(result)? stat.PASS : stat.FAIL);
result = wrapper.doMessageDrivenTest("jms/TimerMDBQueue_BMT", doJms);
- System.out.println("Message-driven test jms/TimerMDBQueue_BMT"
+ System.out.println("Message-driven test jms/TimerMDBQueue_BMT"
+ ((result)? " passed!!" : "failed!!"));
- stat.addStatus("Message-driven test: jms/TimerMDBQueue_BMT",
+ stat.addStatus("Message-driven test: jms/TimerMDBQueue_BMT",
(result)? stat.PASS : stat.FAIL);
- **/
+ **/
try {
- wrapper.removeFoo();
+ wrapper.removeFoo();
} catch(Exception e) {
e.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
index 562be71..dc8ff30 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
@@ -40,7 +40,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -67,7 +67,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -96,7 +96,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -128,7 +128,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -160,7 +160,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java
index e3be7dc..7cd0d17 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/AppInfo.java
@@ -28,6 +28,6 @@
public String toString()
{
- return foo;
+ return foo;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
index 731db69..f1a2a4b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
@@ -33,7 +33,7 @@
try {
System.out.println("In FooEJB::ejbTimeout --> " + t.getInfo());
if (t.isPersistent())
- throw new RuntimeException("FooEJB::ejbTimeout -> "
+ throw new RuntimeException("FooEJB::ejbTimeout -> "
+ t.getInfo() + " is PERSISTENT!!!");
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -52,7 +52,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
setContext(sc);
System.out.println("In FooEJB::setSessionContext");
@@ -64,7 +64,7 @@
}
public void ejbCreate() throws EJBException {
- System.out.println("In ejbnonpersistenttimer.Foo::ejbCreate !!");
+ System.out.println("In ejbnonpersistenttimer.Foo::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -88,6 +88,6 @@
public void ejbPassivate() {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
index a41cdce..bb52274 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
@@ -19,7 +19,7 @@
import jakarta.jms.*;
import jakarta.ejb.*;
-public class MessageDrivenEJB extends TimerStuffImpl
+public class MessageDrivenEJB extends TimerStuffImpl
implements MessageDrivenBean, TimedObject, MessageListener {
private MessageDrivenContext mdc;
@@ -36,7 +36,7 @@
System.out.println("Received message " + info + " , redelivered = " + redelivered);
if (info.equals("test1") ) {
- System.out.println("In onMessage : Got t for timer = " +
+ System.out.println("In onMessage : Got t for timer = " +
t.getInfo());
doTimerStuff("onMessage", true);
getInfo(t);
@@ -44,9 +44,9 @@
getTimeRemainingTest2(5, t);
cancelTimer(t);
-
+
createTimerAndCancel(10000000);
-
+
Timer t1 = createTimer(1000000, "messagedrivenejb");
cancelTimer(t1);
Timer t2 = createTimer(10000, "messagedrivenejb");
@@ -57,7 +57,7 @@
if( isBMT() ) {
cancelTimer(t);
} else {
- cancelTimerAndRollback(t);
+ cancelTimerAndRollback(t);
}
}
} else if( info.equals("test3") ) {
@@ -79,8 +79,8 @@
cancelTimer(t);
Timer ctar = createTimer(1, 1, "cancelTimerAndRollback");
cancelTimer(ctar);
- }
-
+ }
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -90,7 +90,7 @@
checkCallerSecurityAccess("ejbTimeout", false);
try {
- System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ t.getInfo());
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -109,9 +109,9 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
+ this.mdc = mdc;
setContext(mdc);
- System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::setMessageDrivenContext !!");
+ System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::setMessageDrivenContext !!");
checkCallerSecurityAccess("setMessageDrivenContext", false);
getTimerService("setMessageDrivenContext", false);
@@ -119,7 +119,7 @@
}
public void ejbCreate() throws EJBException {
- System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -128,7 +128,7 @@
}
public void ejbRemove() {
- System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In ejbnonpersistenttimer.MessageDrivenEJB::ejbRemove !!");
checkCallerSecurityAccess("ejbRemove", false);
checkGetSetRollbackOnly("ejbRemove", false);
getTimerService("ejbRemove", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
index 37ef97c..4c7e088 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
@@ -38,19 +38,19 @@
private QueueSender queueSender;
*/
- public boolean doMessageDrivenTest(String jndiName,
+ public boolean doMessageDrivenTest(String jndiName,
boolean jms) {
boolean result = false;
- /**
+ /**
if( jms ) { return; }
try {
System.out.println("********PG-> in doMessageDrivenTest() for jndiName = " + jndiName );
-
+
setup(setup);
System.out.println("********PG-> in doMessageDrivenTest() after setup");
Context ic = new InitialContext();
- Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
+ Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
System.out.println("Doing message driven tests for" + jndiName);
@@ -68,7 +68,7 @@
long sleepTime = 30000;
System.out.println("Sleeping for " + sleepTime / 1000 + " seconds");
Thread.sleep(sleepTime);
-
+
// at this point, all foo timers should have been cancelled
// by the message bean.
foo.assertNoTimers();
@@ -79,27 +79,27 @@
} finally {
cleanup();
}
- **/
+ **/
return result;
}
private void setup() throws Exception {
- /**
+ /**
//PG-> context = new InitialContext();
-
- TopicConnectionFactory topicConFactory =
+
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("java:comp/env/jms/MyTopicConnectionFactory");
-
+
System.out.println("********PG-> setup(): after lookup");
topicCon = topicConFactory.createTopicConnection();
System.out.println("********PG-> setup(): after createTopicConnection");
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
System.out.println("********PG-> setup(): after createTopicSession");
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
System.out.println("********PG-> setup(): after createPublisher");
@@ -107,25 +107,25 @@
topicCon.start();
System.out.println("********PG-> setup(): after start");
- QueueConnectionFactory queueConFactory =
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/jms/MyQueueConnectionFactory");
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueCon.start();
- **/
+ **/
}
private void cleanup() {
- /**
+ /**
try {
if( topicCon != null ) {
topicCon.close();
@@ -139,7 +139,7 @@
**/
}
/**
- public void publishMsgs(Topic topic, Message msg, int num)
+ public void publishMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + topic);
@@ -147,7 +147,7 @@
}
}
- public void sendMsgs(Queue queue, Message msg, int num)
+ public void sendMsgs(Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + queue);
@@ -196,37 +196,37 @@
System.out.println("doTest(): creating the timer");
Timer timer = timerStuff.createTimer(1, 1);
-
+
//
System.out.println("doTest(): creating the timer2");
Timer timer2 = timerStuff.createTimer(10000, 10000);
-
+
//
System.out.println("doTest(): creating the timer3");
Timer timer3 = timerStuff.createTimer(new Date());
-
+
//
System.out.println("doTest(): creating the timer4");
Timer timer4 = timerStuff.createTimer(new Date(new Date().getTime() + 2000));
-
+
//
System.out.println("doTest(): creating the timer5");
Timer timer5 = timerStuff.createTimer(new Date(new Date().getTime() + 20000), 10000);
System.out.println("doTest(): creating the createTimerAndRollback");
timerStuff.createTimerAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancel");
timerStuff.createTimerAndCancel(20000);
-
+
// @@@ reevaluate double cancel logic
//timerStuff.createTimerAndCancelAndCancel(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancelAndRollback");
timerStuff.createTimerAndCancelAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the cancelTimer(timer2)");
timerStuff.cancelTimer(timer2);
@@ -237,18 +237,18 @@
timerStuff.cancelTimerAndRollback(timer5);
// @@@ reevaluate double cancel logic
//timerStuff.cancelTimerAndCancelAndRollback(timer6);
-
- Timer timer7 =
+
+ Timer timer7 =
timerStuff.createTimer(1, 1, "cancelTimer");
- Timer timer8 =
+ Timer timer8 =
timerStuff.createTimer(1, 1, "cancelTimerAndRollback");
- Timer timer9 =
+ Timer timer9 =
timerStuff.createTimer(1, "cancelTimerAndRollback");
Timer timer11 = timerStuff.getTimeRemainingTest1(20);
timerStuff.getTimeRemainingTest2(20, timer11);
timerStuff.getTimeRemainingTest2(20, timer);
-
+
Timer timer12 = timerStuff.getNextTimeoutTest1(20);
timerStuff.getNextTimeoutTest2(20, timer12);
timerStuff.getNextTimeoutTest2(20, timer);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
index b0770e5..2aa251f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
@@ -65,11 +65,11 @@
void assertTimerNotActive(Timer timer) throws Exception;
void sendMessageAndCreateTimer() throws Exception;
- void recvMessageAndCreateTimer(boolean expectMessage)
+ void recvMessageAndCreateTimer(boolean expectMessage)
throws Exception;
- void sendMessageAndCreateTimerAndRollback()
+ void sendMessageAndCreateTimerAndRollback()
throws Exception;
- void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws Exception;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
index 1267451..65c17fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
@@ -33,14 +33,14 @@
import jakarta.jms.TextMessage;
public class TimerStuffImpl implements TimerStuff {
-
+
private static final int TX_CMT = 0;
private static final int TX_BMT = 1;
private static final int TX_UNSPECIFIED = 2;
-
+
private EJBContext context_;
private int txMode = TX_CMT;
-
+
private Queue queue;
private QueueSession session;
private QueueConnection connection;
@@ -60,12 +60,12 @@
} else {
txMode = TX_UNSPECIFIED;
}
- /** TODO
+ /** TODO
queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
- qcFactory = (QueueConnectionFactory)
+ qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- **/
+ **/
} catch(Exception e) {
e.printStackTrace();
@@ -75,7 +75,7 @@
protected boolean isCMT() { return txMode == TX_CMT; }
protected boolean isBMT() { return txMode == TX_BMT; }
protected boolean isTxUnspecified() { return txMode == TX_UNSPECIFIED; }
-
+
public Timer createTimer(long duration, String info) throws Exception {
TimerService ts = context_.getTimerService();
Timer t = ts.createSingleActionTimer(duration, new TimerConfig(info, false));
@@ -86,30 +86,30 @@
return createTimer(duration, "createTimer<long>" + duration);
}
- public Timer createTimer(long initialDuration, long interval)
+ public Timer createTimer(long initialDuration, long interval)
throws Exception {
- return createTimer(initialDuration, interval,
+ return createTimer(initialDuration, interval,
"createTimer<long, long>" + initialDuration +
"," + interval);
}
- public Timer createTimer(long initialDuration, long interval,
- String info)
+ public Timer createTimer(long initialDuration, long interval,
+ String info)
throws Exception {
if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(initialDuration, interval,
+ Timer t = ts.createIntervalTimer(initialDuration, interval,
new TimerConfig(new AppInfo(info), false));
-
+
if( isBMT() ) {
context_.getUserTransaction().commit();
}
return t;
}
- public Timer createTimer(Date expirationTime)
+ public Timer createTimer(Date expirationTime)
throws Exception {
TimerService ts = context_.getTimerService();
if( isBMT() ) {
@@ -120,7 +120,7 @@
// This should happen very rarely since container puts the brakes
// on a bit by adding a few seconds if, upon creation, the expiration
// time has already passed.
- Timer t = ts.createSingleActionTimer(expirationTime,
+ Timer t = ts.createSingleActionTimer(expirationTime,
new TimerConfig("createTimer<Date>" + expirationTime, false));
if( isBMT() ) {
context_.getUserTransaction().commit();
@@ -128,14 +128,14 @@
return t;
}
- public Timer createTimer(Date expirationTime, long interval)
+ public Timer createTimer(Date expirationTime, long interval)
throws Exception {
if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(expirationTime, interval,
+ Timer t = ts.createIntervalTimer(expirationTime, interval,
new TimerConfig("createTimer<Date, long>" + expirationTime +
"," + interval, false));
if( isBMT() ) {
@@ -151,7 +151,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndRollback" + duration, false));
if( isBMT() ) {
context_.getUserTransaction().rollback();
@@ -165,7 +165,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancel" + duration, false));
t.cancel();
if( isBMT() ) {
@@ -175,12 +175,12 @@
public void createTimerAndCancelAndCancel(long duration) throws Exception {
if( isTxUnspecified() ) {
- return;
+ return;
} else if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndCancel"+ duration, false));
t.cancel();
t.cancel();
@@ -189,7 +189,7 @@
}
}
- public void createTimerAndCancelAndRollback(long duration)
+ public void createTimerAndCancelAndRollback(long duration)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -197,7 +197,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndRollback" + duration, false));
t.cancel();
if( isBMT() ) {
@@ -242,8 +242,8 @@
context_.getUserTransaction().commit();
}
}
-
- public void cancelTimerAndRollback(Timer timer)
+
+ public void cancelTimerAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -258,7 +258,7 @@
}
}
- public void cancelTimerAndCancelAndRollback(Timer timer)
+ public void cancelTimerAndCancelAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -308,7 +308,7 @@
// success
} else {
throw new RemoteException("getTimers failure");
- }
+ }
}
public Timer getTimeRemainingTest1(int numIterations) throws Exception {
@@ -316,7 +316,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getTimeRemainingTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -345,7 +345,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getNextTimeoutTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -369,7 +369,7 @@
}
}
- // Make sure there are no active timers.
+ // Make sure there are no active timers.
public void assertNoTimers() throws Exception {
checkCallerSecurityAccess("assertNoTimers", true);
TimerService ts = context_.getTimerService();
@@ -379,11 +379,11 @@
}
}
- public void assertTimerNotActive(Timer timer)
+ public void assertTimerNotActive(Timer timer)
throws RemoteException {
try {
timer.getTimeRemaining();
- throw
+ throw
new Exception("assertTimerNotActive called with active timer");
} catch(NoSuchObjectLocalException nsole) {
// caught expected exception
@@ -392,10 +392,10 @@
}
}
- public Serializable getInfoNoError(Timer timer)
+ public Serializable getInfoNoError(Timer timer)
throws Exception {
return getInfo(timer, false);
-
+
}
public Serializable getInfo(Timer timer) throws Exception {
@@ -446,18 +446,18 @@
return;
}
- public void recvMessageAndCreateTimer(boolean expectMessage)
+ public void recvMessageAndCreateTimer(boolean expectMessage)
throws Exception {
if( isTxUnspecified() ) {
return;
}
try {
-
+
if( isBMT() ) {
context_.getUserTransaction().begin();
}
- recvMessageAndCreateTimer("recvMessageAndCreateTimer",
+ recvMessageAndCreateTimer("recvMessageAndCreateTimer",
expectMessage);
} catch(Exception e) {
@@ -471,7 +471,7 @@
return;
}
- public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws Exception {
if( isTxUnspecified() ) {
@@ -511,7 +511,7 @@
Timer t = ts.createSingleActionTimer(1, new TimerConfig(timerName, false));
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -522,11 +522,11 @@
QueueReceiver receiver = session.createReceiver(queue);
// Send a message.
TextMessage message = (TextMessage) receiver.receiveNoWait();
-
+
if( message == null ) {
if( expectMessage ) {
throw new RemoteException("Expecting message in " +
- "recvMessageAndCreateTimerAndRollback");
+ "recvMessageAndCreateTimerAndRollback");
}
} else {
if( !expectMessage ) {
@@ -534,12 +534,12 @@
message.getText());
}
}
-
+
TimerService ts = context_.getTimerService();
Timer t = ts.createSingleActionTimer(1, new TimerConfig(timerName, false));
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -625,7 +625,7 @@
context_.getUserTransaction().begin();
txStarted = true;
}
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("doTimerStuff_" + method, false));
t.cancel();
if( !allowed ) {
@@ -688,7 +688,7 @@
} catch(IllegalStateException e) { }
getTimerService("ejbTimeout", true);
doTimerStuff("ejbTimeout", true);
- }
+ }
}
protected void checkCallerSecurityAccess(String method, boolean allowed) {
@@ -730,19 +730,19 @@
protected void setupJmsConnection() {
- /** TODO
-
+ /** TODO
+
try {
InitialContext ic = new InitialContext();
connection = qcFactory.createQueueConnection();
session = connection.createQueueSession(true, 0);
connection.start();
} catch(Exception e) { e.printStackTrace(); }
- */
+ */
}
protected void cleanup() {
- /** TODO
+ /** TODO
if( connection != null ) {
try {
connection.close();
@@ -751,7 +751,7 @@
jmse.printStackTrace();
}
}
- **/
+ **/
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties
index 71dd1a1..6989f06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-reschedule-after-failures"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="test.client"\u0020
+ value="Client"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml
index 42f73c2..fdd85ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,20 +48,20 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="reset">
<param name="reset-value" value="true"/>
</antcall>
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="reset" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -74,13 +74,13 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="reset">
<param name="reset-value" value=""/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
index 7ddeae1..7b0379d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
@@ -23,25 +23,25 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb31-timer-reschedule_after_failures");
try {
System.out.println("Creating timers for reschedule_after_failures timer test");
- bean.createTimers();
+ bean.createTimers();
System.out.println("Waiting some time for timers to fail and be rescheduled for reschedule_after_failures timer test");
Thread.sleep(24000);
System.out.println("Verifying timers for reschedule_after_failures timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("reschedule_after_failures: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties
index 703c3a9..e3c23f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-schedule-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml
index ffdf71a..89400a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
index eb62bc4..b9f7f87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
@@ -23,14 +23,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb31-timer-schedule_ann");
@@ -40,7 +40,7 @@
System.out.println("Waiting timers to expire for schedule_ann timer test");
Thread.sleep(12000);
System.out.println("Verifying timers for schedule_ann timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("schedule_ann: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
index ecbf26a..ddcce66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
@@ -107,7 +107,7 @@
errors.add(info);
}
}
-
+
if (!expected_callers.isEmpty()) {
System.out.println("Missed info count: " + expected_callers.size());
StringBuffer sb = new StringBuffer();
@@ -134,12 +134,12 @@
for (String e : errors) {
sb.append("" + e).append(", ");
}
- throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ sb.toString() + " were not available at verify!");
}
if (timerSvc.getTimers().size() != 0) {
- throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ timerSvc.getTimers().size());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties
index 919e811..f4eb21e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.properties
@@ -15,15 +15,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-schedule-exp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml
index 7651048..9899d8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
index 623387d..fc26249 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
@@ -25,14 +25,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb31-timer-schedule_exp");
@@ -40,11 +40,11 @@
try {
System.out.println("Creating timers for schedule_exp timer test");
- bean.createTimers();
+ bean.createTimers();
System.out.println("Waiting timers to expire for schedule_exp timer test");
Thread.sleep(12000);
System.out.println("Verifying timers for schedule_exp timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("schedule_exp: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
index 51e9fa7..f5f90b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
@@ -53,7 +53,7 @@
expected_callers.add("" + tc.getInfo());
int dayOfWeek = (now.get(Calendar.DAY_OF_WEEK) - 1); // SUN is 1
- System.out.println("createTimers(): creating timer with dayOfWeek=today-today ("
+ System.out.println("createTimers(): creating timer with dayOfWeek=today-today ("
+ dayOfWeek + "-" + dayOfWeek + ") ");
se = new ScheduleExpression().second("2 / 5").minute("*").hour("*").
dayOfWeek("" + dayOfWeek+" - " + dayOfWeek);
@@ -77,7 +77,7 @@
second -= 60;
}
- System.out.println("createTimers(): creating timer with second=" + (second + 5)
+ System.out.println("createTimers(): creating timer with second=" + (second + 5)
+ ", hour=" + s );
se = new ScheduleExpression().second(second + 5).minute("*").hour(s);
@@ -174,7 +174,7 @@
}
t.cancel();
}
-
+
if (!expected_callers.isEmpty()) {
StringBuffer sb = new StringBuffer();
for (String c : expected_callers) {
@@ -199,12 +199,12 @@
for (String e : errors) {
sb.append("" + e).append(", ");
}
- throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ throw new EJBException("Internal error: ScheduleExpressions for infos: "
+ sb.toString() + " were not available at verify!");
}
if (timerSvc.getTimers().size() != 0) {
- throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ timerSvc.getTimers().size());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties
index 81a9f7d..5132f2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-schedule-on-ejb-timeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml
index 92bd553..790592e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Stles*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Stles.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
index 99ae483..561d14c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
@@ -32,14 +32,14 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@EJB private static Stles bean;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb31-timer-schedule_on_ejb_timeout");
@@ -48,7 +48,7 @@
System.out.println("Waiting timers to expire for schedule_on_ejb_timeout timer test");
Thread.sleep(2000);
System.out.println("Verifying timers for schedule_on_ejb_timeout timer test");
- bean.verifyTimers();
+ bean.verifyTimers();
stat.addStatus("schedule_on_ejb_timeout: ", stat.PASS );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
index 48e8ca4..26d9ac5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
@@ -19,7 +19,7 @@
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
version="3.1">
<enterprise-beans>
<session>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
index 953da94..2ef5ff9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
@@ -48,9 +48,9 @@
public void verifyTimers() throws Exception {
if (!timers.contains("Timer01"))
- throw new EJBException("Timer01 hadn't fired");
+ throw new EJBException("Timer01 hadn't fired");
if (!timers.contains("Timer00"))
- throw new EJBException("Timer00 hadn't fired");
+ throw new EJBException("Timer00 hadn't fired");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml
index ccb865c..9eeb31d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/build.xml
@@ -105,10 +105,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32 tests in a full profile)
- ant lite (Executes set of the ejb-ejb32 tests in a lite profile)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32 tests in a full profile)
+ ant lite (Executes set of the ejb-ejb32 tests in a lite profile)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties
index acbded9..e9f6d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-ejblite-async"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml
index 95c0eb3..80265b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/build.xml
@@ -34,11 +34,11 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
index 7205b70..84a8313 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
@@ -35,7 +35,7 @@
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@EJB SingletonBean sb;
@@ -46,13 +46,13 @@
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- try {
+ try {
sb.hello();
@@ -80,18 +80,18 @@
}
- } catch(RuntimeException e) {
- throw e;
- } catch(Exception e) {
- throw new RuntimeException(e);
+ } catch(RuntimeException e) {
+ throw e;
+ } catch(Exception e) {
+ throw new RuntimeException(e);
}
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
index 4d6a53c..96004a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
@@ -37,24 +37,24 @@
@PostConstruct
public void init() {
System.out.println("In SingletonBean::init()");
- System.out.println("Thread = " + Thread.currentThread());
- me.fooAsync();
+ System.out.println("Thread = " + Thread.currentThread());
+ me.fooAsync();
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
- return "hello, world!\n";
+ System.out.println("In SingletonBean::hello()");
+ return "hello, world!\n";
}
@Asynchronous
public void fooAsync() {
- System.out.println("In SingletonBean::fooAsync()");
- System.out.println("Thread = " + Thread.currentThread());
- gotAsyncCall = true;
+ System.out.println("In SingletonBean::fooAsync()");
+ System.out.println("Thread = " + Thread.currentThread());
+ gotAsyncCall = true;
}
public boolean getPassed() {
- return gotAsyncCall;
+ return gotAsyncCall;
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
index 3a92359..e46c7a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
@@ -29,7 +29,7 @@
}
public void hello() {
- System.out.println("In StatefulBean::hello()");
+ System.out.println("In StatefulBean::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
index ae2767f..c1a2fd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
@@ -30,7 +30,7 @@
}
public void hello() {
- System.out.println("In StatefulBean2::hello()");
+ System.out.println("In StatefulBean2::hello()");
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml
index 011ba45..fe24bab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb32-ejblite tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb32-ejblite tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties
index 95d5f27..182c7a7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-ejblite-timer"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="contextroot" value="${module}"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml
index d8c7d47..88c76d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/build.xml
@@ -34,11 +34,11 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="war"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
@@ -48,9 +48,9 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,9 +58,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java
index c298a4b..c18cde3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/client/Client.java
@@ -26,7 +26,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
@@ -34,46 +34,46 @@
private String port;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {
- host = args[1];
+ host = args[1];
port = args[2];
}
public void doTest() {
- try {
+ try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/" + appName + "/HelloServlet";
System.out.println("invoking webclient servlet at " + url);
- URL u = new URL(url);
-
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while((line = input.readLine()) != null)
- System.out.println(line);
- if(code != 200) {
- throw new RuntimeException("Incorrect return code: " + code);
- }
-
- stat.addStatus("local main", stat.PASS);
+ URL u = new URL(url);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+ int code = c1.getResponseCode();
+ InputStream is = c1.getInputStream();
+ BufferedReader input = new BufferedReader (new InputStreamReader(is));
+ String line = null;
+ while((line = input.readLine()) != null)
+ System.out.println(line);
+ if(code != 200) {
+ throw new RuntimeException("Incorrect return code: " + code);
+ }
+
+ stat.addStatus("local main", stat.PASS);
+
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java
index 0e7864c..da31643 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/AppInfo.java
@@ -28,6 +28,6 @@
public String toString()
{
- return foo;
+ return foo;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
index 5f12bff..08d5e09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
@@ -31,7 +31,7 @@
try {
System.out.println("In FooBMT::Timeout --> " + t.getInfo());
if (t.isPersistent())
- throw new RuntimeException("FooBMT::Timeout -> "
+ throw new RuntimeException("FooBMT::Timeout -> "
+ t.getInfo() + " is PERSISTENT!!!");
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -51,7 +51,7 @@
@PostConstruct
private void init() throws EJBException {
- System.out.println("In ejblite.timer.Foo::init !!");
+ System.out.println("In ejblite.timer.Foo::init !!");
isBMT = true;
setContext(sc);
getTimerService("init", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
index cf9437e..0357a2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
@@ -30,7 +30,7 @@
try {
System.out.println("In FooCMT::Timeout --> " + t.getInfo());
if (t.isPersistent())
- throw new RuntimeException("FooCMT::Timeout -> "
+ throw new RuntimeException("FooCMT::Timeout -> "
+ t.getInfo() + " is PERSISTENT!!!");
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -50,7 +50,7 @@
@PostConstruct
private void init() throws EJBException {
- System.out.println("In ejblite.timer.Foo::init !!");
+ System.out.println("In ejblite.timer.Foo::init !!");
setContext(sc);
getTimerService("init", true);
doTimerStuff("init", false);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
index 51c2da9..de09b43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
@@ -36,46 +36,46 @@
@WebServlet(urlPatterns="/HelloServlet", loadOnStartup=1)
public class HelloServlet extends HttpServlet {
- @EJB
+ @EJB
private StatefulWrapper wrapper;
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("In HelloServlet::init");
+ System.out.println("In HelloServlet::init");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
- System.out.println("In HelloServlet::doGet");
+ System.out.println("In HelloServlet::doGet");
- try {
+ try {
boolean result = wrapper.doFooTest(true);
- if (!result)
+ if (!result)
throw new RuntimeException("BMT failed");
else
System.out.println("In HelloServlet::BMT passed");
result = wrapper.doFooTest(false);
- if (!result)
+ if (!result)
throw new RuntimeException("CMT failed");
else
System.out.println("In HelloServlet::CMT passed");
-
- } catch(RuntimeException e) {
- throw e;
- } catch(Exception e) {
- throw new RuntimeException(e);
- } finally {
+
+ } catch(RuntimeException e) {
+ throw e;
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ } finally {
try {
wrapper.removeFoo();
} catch(Exception e) {
@@ -84,11 +84,11 @@
}
- out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
+ out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
index d83116a..83d30c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
@@ -57,37 +57,37 @@
System.out.println("doTest(): creating the timer");
Timer timer = timerStuff.createTimer(1, 1);
-
+
//
System.out.println("doTest(): creating the timer2");
Timer timer2 = timerStuff.createTimer(10000, 10000);
-
+
//
System.out.println("doTest(): creating the timer3");
Timer timer3 = timerStuff.createTimer(new Date());
-
+
//
System.out.println("doTest(): creating the timer4");
Timer timer4 = timerStuff.createTimer(new Date(new Date().getTime() + 2000));
-
+
//
System.out.println("doTest(): creating the timer5");
Timer timer5 = timerStuff.createTimer(new Date(new Date().getTime() + 20000), 10000);
System.out.println("doTest(): creating the createTimerAndRollback");
timerStuff.createTimerAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancel");
timerStuff.createTimerAndCancel(20000);
-
+
// @@@ reevaluate double cancel logic
//timerStuff.createTimerAndCancelAndCancel(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancelAndRollback");
timerStuff.createTimerAndCancelAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the cancelTimer(timer2)");
timerStuff.cancelTimer(timer2);
@@ -98,18 +98,18 @@
timerStuff.cancelTimerAndRollback(timer5);
// @@@ reevaluate double cancel logic
//timerStuff.cancelTimerAndCancelAndRollback(timer6);
-
- Timer timer7 =
+
+ Timer timer7 =
timerStuff.createTimer(1, 1, "cancelTimer");
- Timer timer8 =
+ Timer timer8 =
timerStuff.createTimer(1, 1, "cancelTimerAndRollback");
- Timer timer9 =
+ Timer timer9 =
timerStuff.createTimer(1, "cancelTimerAndRollback");
Timer timer11 = timerStuff.getTimeRemainingTest1(20);
timerStuff.getTimeRemainingTest2(20, timer11);
timerStuff.getTimeRemainingTest2(20, timer);
-
+
Timer timer12 = timerStuff.getNextTimeoutTest1(20);
timerStuff.getNextTimeoutTest2(20, timer12);
timerStuff.getNextTimeoutTest2(20, timer);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
index 9d75068..0722bc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
@@ -26,12 +26,12 @@
import jakarta.ejb.*;
public class TimerStuffImpl implements TimerStuff {
-
+
private EJBContext context_;
protected boolean isBMT = false;
protected boolean cancelAutomaticTimer = false;
-
+
public TimerStuffImpl() {}
protected void setContext(EJBContext context) {
@@ -40,7 +40,7 @@
// XXX - TODO
protected boolean isTxUnspecified() { return false; }
-
+
public Timer createTimer(long duration, String info) throws Exception {
TimerService ts = context_.getTimerService();
Timer t = ts.createSingleActionTimer(duration, new TimerConfig(info, false));
@@ -51,30 +51,30 @@
return createTimer(duration, "createTimer<long>" + duration);
}
- public Timer createTimer(long initialDuration, long interval)
+ public Timer createTimer(long initialDuration, long interval)
throws Exception {
- return createTimer(initialDuration, interval,
+ return createTimer(initialDuration, interval,
"createTimer<long, long>" + initialDuration +
"," + interval);
}
- public Timer createTimer(long initialDuration, long interval,
- String info)
+ public Timer createTimer(long initialDuration, long interval,
+ String info)
throws Exception {
if( isBMT ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(initialDuration, interval,
+ Timer t = ts.createIntervalTimer(initialDuration, interval,
new TimerConfig(new AppInfo(info), false));
-
+
if( isBMT ) {
context_.getUserTransaction().commit();
}
return t;
}
- public Timer createTimer(Date expirationTime)
+ public Timer createTimer(Date expirationTime)
throws Exception {
TimerService ts = context_.getTimerService();
if( isBMT ) {
@@ -85,7 +85,7 @@
// This should happen very rarely since container puts the brakes
// on a bit by adding a few seconds if, upon creation, the expiration
// time has already passed.
- Timer t = ts.createSingleActionTimer(expirationTime,
+ Timer t = ts.createSingleActionTimer(expirationTime,
new TimerConfig("createTimer<Date>" + expirationTime, false));
if( isBMT ) {
context_.getUserTransaction().commit();
@@ -93,14 +93,14 @@
return t;
}
- public Timer createTimer(Date expirationTime, long interval)
+ public Timer createTimer(Date expirationTime, long interval)
throws Exception {
if( isBMT ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(expirationTime, interval,
+ Timer t = ts.createIntervalTimer(expirationTime, interval,
new TimerConfig("createTimer<Date, long>" + expirationTime +
"," + interval, false));
if( isBMT ) {
@@ -116,7 +116,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndRollback" + duration, false));
if( isBMT ) {
context_.getUserTransaction().rollback();
@@ -130,7 +130,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancel" + duration, false));
t.cancel();
if( isBMT ) {
@@ -140,12 +140,12 @@
public void createTimerAndCancelAndCancel(long duration) throws Exception {
if( isTxUnspecified() ) {
- return;
+ return;
} else if( isBMT ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndCancel"+ duration, false));
t.cancel();
t.cancel();
@@ -154,7 +154,7 @@
}
}
- public void createTimerAndCancelAndRollback(long duration)
+ public void createTimerAndCancelAndRollback(long duration)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -162,7 +162,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createSingleActionTimer(duration,
+ Timer t = ts.createSingleActionTimer(duration,
new TimerConfig("createTimerAndCancelAndRollback" + duration, false));
t.cancel();
if( isBMT ) {
@@ -212,8 +212,8 @@
context_.getUserTransaction().commit();
}
}
-
- public void cancelTimerAndRollback(Timer timer)
+
+ public void cancelTimerAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -228,7 +228,7 @@
}
}
- public void cancelTimerAndCancelAndRollback(Timer timer)
+ public void cancelTimerAndCancelAndRollback(Timer timer)
throws Exception {
if( isTxUnspecified() ) {
return;
@@ -278,7 +278,7 @@
// success
} else {
throw new RemoteException("getTimers failure");
- }
+ }
}
public Timer getTimeRemainingTest1(int numIterations) throws Exception {
@@ -286,7 +286,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getTimeRemainingTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -315,7 +315,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("getNextTimeoutTest1", false));
System.out.println("Remaining times for " + t.getInfo());
for(int i = 0; i < numIterations; i++) {
@@ -339,7 +339,7 @@
}
}
- // Make sure there are no active timers.
+ // Make sure there are no active timers.
public void assertNoTimers() throws Exception {
TimerService ts = context_.getTimerService();
Collection timers= ts.getTimers();
@@ -348,11 +348,11 @@
}
}
- public void assertTimerNotActive(Timer timer)
+ public void assertTimerNotActive(Timer timer)
throws RemoteException {
try {
timer.getTimeRemaining();
- throw
+ throw
new Exception("assertTimerNotActive called with active timer");
} catch(NoSuchObjectLocalException nsole) {
// caught expected exception
@@ -361,10 +361,10 @@
}
}
- public Serializable getInfoNoError(Timer timer)
+ public Serializable getInfoNoError(Timer timer)
throws Exception {
return getInfo(timer, false);
-
+
}
public Serializable getInfo(Timer timer) throws Exception {
@@ -452,7 +452,7 @@
context_.getUserTransaction().begin();
txStarted = true;
}
- Timer t = ts.createIntervalTimer(1, 1,
+ Timer t = ts.createIntervalTimer(1, 1,
new TimerConfig("doTimerStuff_" + method, false));
t.cancel();
if( !allowed ) {
@@ -521,7 +521,7 @@
} catch(IllegalStateException e) { }
getTimerService("Timeout", true);
doTimerStuff("Timeout", true);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties
index f814f44..d0caa3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-embedded-autoclose"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml
index 9667a02..659af97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,21 +49,21 @@
<target name="build" depends="compile">
<!-- package ourselves to include persistence.xml -->
<mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
+ <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
update="true"
includes ="**/S*.class">
</jar>
<delete dir="${build.classes.dir}/org"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
<echo message="Running with ${embedded.classpath} in classpath"/>
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${assemble.dir}/${appname}-ejb.jar:${embedded.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
index 221f72e..563e605 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
@@ -35,5 +35,5 @@
private void onDestroy() {
x.add("=====destroyed=====");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml
index 6f6aa31..920f6b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/build.xml
@@ -89,9 +89,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-ejb31-embedded tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-ejb31-embedded tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties
index 4cb3eec..ea54b9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-around-construct-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml
index 0806155..c4e4d7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
index 11d3292..e4dab56 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
@@ -34,7 +34,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -44,7 +44,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
index 7176402..cf0329a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
@@ -33,12 +33,12 @@
System.out.println("In SingletonBean::init()");
sful.hello();
}
-
+
public String hello() {
verify("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
index 09e3afa..7d91291 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
@@ -33,18 +33,18 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
index dde1c43..fdb04c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
@@ -32,17 +32,17 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean2::init() " + this);
+ System.out.println("In SomeManagedBean2::init() " + this);
}
-
+
public void foo() {
- System.out.println("In SomeManagedBean2::foo() ");
+ System.out.println("In SomeManagedBean2::foo() ");
if (orb == null) throw new RuntimeException("SomeManagedBean2: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean2::destroy() ");
+ System.out.println("In SomeManagedBean2::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
index dfe08fa..6bb1c90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
@@ -31,7 +31,7 @@
@Resource ORB orb;
public void foo() {
- System.out.println("In SomeManagedBean3::foo() ");
+ System.out.println("In SomeManagedBean3::foo() ");
if (orb == null) throw new RuntimeException("SomeManagedBean3: ORB is null");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml
index 307f65e..adc2d42 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-aroundconstruct tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-aroundconstruct tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties
index a729a7d..0a479c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-around-construct-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml
index 92865e8..916340f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,11 +48,11 @@
<antcall target="ejb-jar-common">
<param name="ejbjar.classes"
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
- <param name="beans.xml" value="descriptors/beans.xml"/>
+ <param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
index 7be7138..0686cc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
@@ -33,7 +33,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -43,7 +43,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
index 35a2893..bcce20c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
@@ -32,12 +32,12 @@
System.out.println("In SingletonBean::init()");
sful.hello();
}
-
+
public String hello() {
verify("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
index 58fe2a6..3c97ed7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
@@ -29,18 +29,18 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
}
-
+
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- // verify("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ // verify("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml
index cf32028..53c33a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/build.xml
@@ -53,9 +53,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-interceptors tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-interceptors tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties
index e35bfea..b4bf7b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-constructor-level-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml
index 6a412dd..a73fbc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
index 6fb1cf9..1d0984e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
@@ -39,7 +39,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
index 582421f..208e61d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
@@ -38,7 +38,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Interceptors(InterceptorA.class)
@@ -49,7 +49,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
index 364227b..f0ab00b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
@@ -38,13 +38,13 @@
verifyMethod("init");
sful.hello();
}
-
+
@Interceptors(InterceptorC.class)
public String hello() {
verifyAB_AC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
index 0138d72..18dfe4b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
@@ -35,14 +35,14 @@
@Interceptors(InterceptorA.class)
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
index db8a8c7..b09bf0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -35,13 +35,13 @@
@Interceptors(InterceptorA.class)
public void foo2() {
- System.out.println("In SomeManagedBean2::foo2() ");
- verifyAC_AC("SomeManagedBean2");
+ System.out.println("In SomeManagedBean2::foo2() ");
+ verifyAC_AC("SomeManagedBean2");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean2::destroy() ");
+ System.out.println("In SomeManagedBean2::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
index 4622352..b1ec38a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -36,18 +36,18 @@
@PostConstruct
private void init3() {
- System.out.println("In SomeManagedBean3::init3() " + this);
+ System.out.println("In SomeManagedBean3::init3() " + this);
}
-
+
@Interceptors(InterceptorA.class)
public void foo3() {
- System.out.println("In SomeManagedBean3::foo3() ");
- verifyA("SomeManagedBean3");
+ System.out.println("In SomeManagedBean3::foo3() ");
+ verifyA("SomeManagedBean3");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean3::destroy() ");
+ System.out.println("In SomeManagedBean3::destroy() ");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml
index a667e6b..1c1a974 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-method-constructor-level tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-method-constructor-level tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties
index a521657..bff9920 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-constructor-level-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml
index 96031eb..2820fba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,8 +51,8 @@
<param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
index 5cfd62e..4ad4d9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
@@ -39,7 +39,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
index ffb584d..0b77c11 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
@@ -35,7 +35,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -45,7 +45,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
index c19d4a9..3773738 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
@@ -36,12 +36,12 @@
verifyMethod("init");
sful.hello();
}
-
+
public String hello() {
verifyAB_AC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties
index 9c3398f..ad9e2e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-get-method-lc-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml
index 3e0bcae..c3e7912 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
index 003b416..9f8462b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
@@ -45,7 +45,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
index 6ef028e..e9b5d73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
@@ -39,7 +39,7 @@
System.out.println("In SfulEJB:hello()");
verifyAB_AC("SfulEJB");
verifyB_PC("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Interceptors(InterceptorA.class)
@@ -50,7 +50,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
index 9b15694..c223a64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
@@ -38,14 +38,14 @@
verifyMethod("init");
sful.hello();
}
-
+
@Interceptors(InterceptorC.class)
public String hello() {
verifyAB_AC("SingletonBean");
verifyA_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
index 562d8db..67d35fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
@@ -31,23 +31,23 @@
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
verifyMethod(null);
}
-
+
@Interceptors(InterceptorA.class)
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA_AC("SomeManagedBean");
- verifyA_AI("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA_AC("SomeManagedBean");
+ verifyA_AI("SomeManagedBean");
ai = false;
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
verifyMethod(null);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml
index 32f9538..00f18e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-get_method_lc tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-get_method_lc tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties
index 0045747..bdcf7fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-get-method-lc-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml
index f1a87e6..240e381 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,8 +51,8 @@
<param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
index 65fb797..19d1e2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
@@ -42,7 +42,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
index 6f181b0..71e0b29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
@@ -36,7 +36,7 @@
System.out.println("In SfulEJB:hello()");
verifyB_AC("SfulEJB");
verifyB_PC("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -46,7 +46,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod(null);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
index a6b10c7..ffd2f95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
@@ -34,14 +34,14 @@
verifyMethod("init");
sful.hello();
}
-
+
public String hello() {
verifyA_AC("SingletonBean");
//verifyAB_AC("SingletonBean");
verifyA_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties
index c0f0c4b..a148737 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-interceptors-inheritance"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml
index ea36dc5..f363302 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
index b5bdc40..1b18f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
index ca7ab45..33ead8d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
@@ -29,20 +29,20 @@
@AroundInvoke
private Object interceptCall(InvocationContext ctx) throws Exception {
- System.out.println("**BaseBean AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ System.out.println("**BaseBean AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
ai = true;
return ctx.proceed();
}
@PostConstruct
private void init() {
- System.out.println("**BaseBean PostConstruct");
+ System.out.println("**BaseBean PostConstruct");
pc = true;
}
@PreDestroy
private void destroy() {
- System.out.println("**BaseBean PreDestroy");
+ System.out.println("**BaseBean PreDestroy");
pd = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
index 171dea1..f47977d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
@@ -33,7 +33,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -43,7 +43,7 @@
@AroundInvoke
private Object interceptCall0(InvocationContext ctx) throws Exception {
- System.out.println("**SfulEJB AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
+ System.out.println("**SfulEJB AROUND-INVOKE++ [@AroundInvoke]: " + ctx.getMethod());
if (!ai) throw new RuntimeException("BaseBean was not called");
ai = false; //reset
return ctx.proceed();
@@ -51,14 +51,14 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
if (!pc) throw new RuntimeException("BaseBean was not called");
pc = false; //reset
}
@PreDestroy
private void destroy0() {
- System.out.println("**SfulEJB PreDestroy");
+ System.out.println("**SfulEJB PreDestroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
index 8a53360..2efe724 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
@@ -33,11 +33,11 @@
System.out.println("In SingletonBean::init()");
sful.hello();
}
-
+
public String hello() {
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
index 168ebc2..7023666 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
@@ -24,7 +24,7 @@
@Interceptors(InterceptorA.class)
public class SlessEJB extends BaseBean implements Sless {
public String sayHello() {
- return "Hello";
+ return "Hello";
}
@AroundInvoke
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties
index 4c1d80b..9a065c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-method-constructor-level-ann"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml
index dacd393..3568d17 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,8 +50,8 @@
value="**/Interceptor*.class,**/S*.class,**/B*.class"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
index 83fd073..d28ce5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
index f77514b..69e5bac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
@@ -42,7 +42,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
index 45ac3b0..ea3b7be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
@@ -38,7 +38,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Interceptors(InterceptorA.class)
@@ -50,7 +50,7 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod("init0");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
index 9e1b454..fa74919 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
@@ -39,14 +39,14 @@
verifyMethod("init");
sful.hello();
}
-
+
@Interceptors(InterceptorC.class)
public String hello() {
verifyAB_AC("SingletonBean");
verifyAC_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@Interceptors(InterceptorB.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
index d5c061b..c5dbf3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
@@ -36,22 +36,22 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init() {
- System.out.println("In SomeManagedBean::init() " + this);
+ System.out.println("In SomeManagedBean::init() " + this);
verifyMethod("init");
}
-
+
@Interceptors(InterceptorA.class)
public void foo() {
- System.out.println("In SomeManagedBean::foo() ");
- verifyA("SomeManagedBean");
+ System.out.println("In SomeManagedBean::foo() ");
+ verifyA("SomeManagedBean");
if (orb == null) throw new RuntimeException("SomeManagedBean: ORB is null");
}
@Interceptors(InterceptorA.class)
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean::destroy() ");
+ System.out.println("In SomeManagedBean::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
index 14bee20..bd0cc69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -37,21 +37,21 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init2() {
- System.out.println("In SomeManagedBean2::init2() " + this);
+ System.out.println("In SomeManagedBean2::init2() " + this);
verifyMethod("init2");
}
-
+
@Interceptors(InterceptorA.class)
public void foo2() {
- System.out.println("In SomeManagedBean2::foo2() ");
- verifyAC_AC("SomeManagedBean2");
- verifyA_PC("SomeManagedBean2");
+ System.out.println("In SomeManagedBean2::foo2() ");
+ verifyAC_AC("SomeManagedBean2");
+ verifyA_PC("SomeManagedBean2");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean2::destroy() ");
+ System.out.println("In SomeManagedBean2::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
index 52d307c..505e653 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -37,21 +37,21 @@
@Interceptors(InterceptorA.class)
@PostConstruct
private void init3() {
- System.out.println("In SomeManagedBean3::init3() " + this);
+ System.out.println("In SomeManagedBean3::init3() " + this);
verifyMethod("init3");
}
-
+
@Interceptors(InterceptorA.class)
public void foo3() {
- System.out.println("In SomeManagedBean3::foo3() ");
- verifyA_AC("SomeManagedBean3");
- verifyAC_PC("SomeManagedBean3");
+ System.out.println("In SomeManagedBean3::foo3() ");
+ verifyA_AC("SomeManagedBean3");
+ verifyAC_PC("SomeManagedBean3");
}
@PreDestroy
private void destroy() {
- System.out.println("In SomeManagedBean3::destroy() ");
+ System.out.println("In SomeManagedBean3::destroy() ");
verifyMethod("destroy");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml
index a667e6b..1c1a974 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-method-constructor-level tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-method-constructor-level tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties
index 09ee581..f5d6caa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-method-constructor-level-descr"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb-jar.xml" value="descriptors/ejb-jar.xml"/>
<property name="se.client" value="com.acme.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml
index 02fa25b..6cf2855 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,8 +51,8 @@
<param name="beans.xml" value="descriptors/beans.xml"/>
</antcall>
</target>
-
- <target name="deploy"
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -66,10 +66,10 @@
<arg line="${appname}-ejb"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
index 83fd073..d28ce5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
@@ -24,21 +24,21 @@
public class Client {
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat =
+ new SimpleReporterAdapter("appserv-tests");
- private static String appName;
+ private static String appName;
public static void main (String[] args) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
Client client = new Client(args);
- client.doTest();
+ client.doTest();
stat.printSummary(appName + "ID");
- }
-
+ }
+
public Client (String[] args) {
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
index 65fb797..19d1e2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
@@ -42,7 +42,7 @@
if (method == null) {
if (name != null) throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got null");
} else {
- if (!method.getName().equals(name))
+ if (!method.getName().equals(name))
throw new RuntimeException("In " + getClass().getName() + " expected method name: " + name + " got: " + method.getName());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
index 0154a3a..06dc47a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
@@ -35,7 +35,7 @@
public String hello() {
System.out.println("In SfulEJB:hello()");
verify("SfulEJB");
- return sless.sayHello();
+ return sless.sayHello();
}
@Remove
@@ -45,7 +45,7 @@
@PostConstruct
private void init0() {
- System.out.println("**SfulEJB PostConstruct");
+ System.out.println("**SfulEJB PostConstruct");
verifyMethod("init0");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
index c1e655b..1a9a1ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
@@ -36,13 +36,13 @@
verifyMethod("init");
sful.hello();
}
-
+
public String hello() {
verifyAB_AC("SingletonBean");
verifyAC_PC("SingletonBean");
- System.out.println("In SingletonBean::hello()");
+ System.out.println("In SingletonBean::hello()");
sful.remove();
- return "hello, world!\n";
+ return "hello, world!\n";
}
@PreDestroy
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties
index 33d721b..82cf694 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb32-intrfaces"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="client.intrfaces.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml
index 8e14c8d..8b6d944 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/build.xml
@@ -34,12 +34,12 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean,precompile">
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
- <javac fork="true" includeAntRuntime="false"
+ <javac fork="true" includeAntRuntime="false"
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar:${s1as.classpath}"
destdir="${build.classes.dir}" debug="true" srcdir="client" includes="**/*.java">
<classpath path="${classpath}"/>
@@ -73,7 +73,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -85,7 +85,7 @@
</antcall>
<antcall target="run">
<param name="client.type" value="deploy-fail" />
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
<param name="index" value="1" />
</antcall>
<antcall target="build-neg">
@@ -94,7 +94,7 @@
</antcall>
<antcall target="run">
<param name="client.type" value="deploy-fail" />
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
<param name="index" value="2" />
</antcall>
</target>
@@ -110,10 +110,10 @@
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties
index 231faf3..393fda4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb32-methodintf"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="client.methodintf.Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml
index 661e787..dc898ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
</antcall>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -65,10 +65,10 @@
<arg line="${jndiroot}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
index 0f62d41..1af2b1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
@@ -25,12 +25,12 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb32-methodintf");
try {
@@ -40,7 +40,7 @@
stful.test();
System.out.println("Waiting timer to expire to verify the results");
Thread.sleep(3000);
- boolean pass = stles.verify() && stful.verify();
+ boolean pass = stles.verify() && stful.verify();
stat.addStatus("ejb32-methodintf: ", ((pass)? stat.PASS : stat.FAIL) );
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
index 813872c..a6a4618 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
@@ -42,7 +42,7 @@
}
public boolean verifyResult() {
- return _pc && _intf;
+ return _pc && _intf;
}
@AroundInvoke
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml
index cad3814..26a3394 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/build.xml
@@ -39,9 +39,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-persistence tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-persistence tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml
index a6829c2..5062c5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/build.xml
@@ -74,9 +74,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-persistence-unsynchronizedPC tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-persistence-unsynchronizedPC tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties
index affb576..7da2c1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_disallowed_methods"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml
index 60272e2..06e9f83 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
index e3a0692..b5245c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
@@ -40,7 +40,7 @@
public void doTest() {
System.out.println("I am in client");
-
+
try {
Map<String, Boolean> resultMap = slessBean.doTest();
for (Entry<String, Boolean> entry : resultMap.entrySet()) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
index 83470e3..6423c1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
@@ -24,7 +24,7 @@
@Id
private int id;
-
+
private String name;
public Person() {
@@ -33,7 +33,7 @@
public Person(String name) {
this.name = name;
}
-
+
public Person(int id) {
this.id = id;
}
@@ -42,7 +42,7 @@
public String toString() {
return "Person: {" + "(name = " + name + ")}";
}
-
+
public int getId() {
return this.id;
}
@@ -50,7 +50,7 @@
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
index 82e1b6b..e51d4c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
@@ -32,15 +32,15 @@
@PersistenceContext(unitName="lib/unsynchpc_disallowed_methods-par.jar#em",
synchronization=SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
@Override
public Map<String, Boolean> doTest() {
Map<String, Boolean> resultMap = new HashMap<String, Boolean>();
-
+
/*
* SPEC: The application's use of queries with pessimistic locks,
- * bulk update or delete queries, etc. result in the provider
- * throwing the TransactionRequiredException.
+ * bulk update or delete queries, etc. result in the provider
+ * throwing the TransactionRequiredException.
*/
//Query with pessimistic locks
Query query = em.createQuery("SELECT OBJECT(p) FROM Person p WHERE p.name='Tom'");
@@ -56,7 +56,7 @@
e.printStackTrace();
resultMap.put("TestPessimisticLockQuery", false);
}
-
+
//Bulk update
Query updateQuery = em.createQuery("UPDATE Person p SET p.name='Jim' WHERE p.id > 100");
try {
@@ -70,7 +70,7 @@
e.printStackTrace();
resultMap.put("TestBulkUpdate", false);
}
-
+
//Bulk delete
Query deleteQuery = em.createQuery("DELETE FROM Person p WHERE p.name = 'Jim'");
try {
@@ -84,12 +84,12 @@
e.printStackTrace();
resultMap.put("TestBulkDelete", false);
}
-
-
+
+
/*
- * SPEC: The application is permitted to invoke the persist, merge, remove,
- * and refresh entity lifecycle operations on an entity manager of type
- * SynchronizationType.UNSYNCHRONIZED independent of whether the
+ * SPEC: The application is permitted to invoke the persist, merge, remove,
+ * and refresh entity lifecycle operations on an entity manager of type
+ * SynchronizationType.UNSYNCHRONIZED independent of whether the
* persistence context is joined to the current transaction.
*/
Person person2 = new Person("Jack");
@@ -100,7 +100,7 @@
e.printStackTrace();
resultMap.put("TestPersist", false);
}
-
+
try {
em.merge(new Person("Lily"));
resultMap.put("TestMerge", true);
@@ -108,7 +108,7 @@
e.printStackTrace();
resultMap.put("TestMerge", false);
}
-
+
Person person3 = em.find(Person.class, 2);
person3.setName("Lucy2");
try {
@@ -118,7 +118,7 @@
e.printStackTrace();
resultMap.put("TestRefresh", false);
}
-
+
try {
em.remove(person2);
resultMap.put("TestRemove", true);
@@ -126,7 +126,7 @@
e.printStackTrace();
resultMap.put("TestRemove", false);
}
-
+
return resultMap;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties
index abae114..d90de98 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsyncpc_extendedscope_cross_sfsb"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml
index f0fac76..1e7df0f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Finder*.class,**/*ynchPC*.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
index 65a2abc..a0ce6ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
@@ -27,7 +27,7 @@
"appserv-tests");
@EJB(beanName = "TC1SfsbWithUnsynchPC")
private static Tester tC1SfsbWithUnsynchPC;
-
+
@EJB(beanName = "TC2SfsbWithSynchPC")
private static Tester tC2SfsbWithSynchPC;
@@ -41,13 +41,13 @@
public void doTest() {
try {
System.out.println("I am in client");
-
+
System.out.println("Calling SFSBWithUnsynchPC.doTest");
stat.addStatus("TestCase1_extendedScopeSfsbWithUnsyncPCInvokeSfsbWithSynchPC", tC1SfsbWithUnsynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling TC2_SFSBWithSynchPC.doTest");
stat.addStatus("TestCase2_extendedScopeSfsbWithSyncPCInvokeSfsbWithUnsynchPC", tC2SfsbWithSynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("DoTest method ends");
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
index c855092..25ee00e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
@@ -34,17 +34,17 @@
synchronization = SynchronizationType.SYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
//@Override
public Person findPerson(String name) {
Person p = em.find(Person.class, name);
System.out.print("Find persion " + p);
return p;
}
-
+
@Init
public void createFinder() {
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
index 6c48c90..fca1ca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
@@ -30,10 +30,10 @@
synchronization = SynchronizationType.UNSYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
@EJB private TC1FinderHome finderHome;
private TC1Finder finderLocalObject;
-
+
public boolean doTest() {
try {
// Should throw EJBException here
@@ -51,6 +51,6 @@
// Unexpected exception
return false;
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
index 9628065..abe2ed7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
@@ -30,10 +30,10 @@
synchronization = SynchronizationType.SYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
@EJB private TC2FinderHome finderHome;
private TC2Finder finderLocalObject;
-
+
public boolean doTest() {
try {
// Should throw EJBException here
@@ -51,6 +51,6 @@
// Unexpected exception
return false;
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
index 05decb4..3136fb1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
@@ -31,16 +31,16 @@
synchronization = SynchronizationType.UNSYNCHRONIZED,
type = PersistenceContextType.EXTENDED)
EntityManager em;
-
+
//@Override
public Person findPerson(String name) {
Person p = em.find(Person.class, name);
System.out.print("Find persion " + p);
return p;
}
-
+
@Init
public void createFinder() {
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties
index 10bb2ee..273101d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_rollback_notclear_unsynchPC"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml
index 1ad30fb..7201c17 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
index 0af4cff..c5fd2a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
@@ -37,7 +37,7 @@
public void doTest() {
System.out.println("I am in client");
-
+
try {
stat.addStatus("TestUnsynchPCIsCLearedAfterRollback", slessBean.doTest() ? stat.PASS : stat.FAIL);
} catch (Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
index 49cecc3..ca12de1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
@@ -36,11 +36,11 @@
public String toString() {
return "Person: {" + "(name = " + name + ")}";
}
-
+
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
index 138d1cb..fcadaef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
@@ -30,26 +30,26 @@
@PersistenceContext(unitName="lib/unsynchpc_rollback_notclear_unsynchPC-par.jar#em",
synchronization=SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
@Override
public boolean doTest() {
System.out.println("I am in SlessBean.doTest");
-
+
UserTransaction utx = null;
try {
utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
utx.begin();
-
+
Person person = new Person("Tom");
em.persist(person);
-
+
//Let unsynchronized PC join the transaction;
em.joinTransaction();
-
+
System.out.println("Does PC contain person before rollback: " + em.contains(person));
utx.rollback();
System.out.println("Does PC contain person after rollback: " + em.contains(person));
-
+
return !(em.contains(person));
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties
index 5be6399..d8bac62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsyncpc_txscope_synctype_mismatch"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml
index 1296c69..04ef98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Finder.class,**/*ynchPC*.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
index 0cc3be9..82dc35f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
@@ -27,13 +27,13 @@
"appserv-tests");
@EJB(beanName = "TC1SfsbWithUnsynchPC")
private static Tester tC1SfsbWithUnsynchPC;
-
+
@EJB(beanName = "TC2SlsbWithUnsynchPC")
private static Tester tC2SlsbWithUnsynchPC;
-
+
@EJB(beanName = "TC3SlsbWithSynchPC")
private static Tester tC3SlsbWithSynchPC;
-
+
@EJB(beanName = "TC4SlsbWithSynchPC")
private static Tester tC4SlsbWithSynchPC;
@@ -47,19 +47,19 @@
public void doTest() {
try {
System.out.println("I am in client");
-
+
System.out.println("Calling tC1_SFSBWithUnsynchPC.doTest");
stat.addStatus("TestCase1_sfsbWithUnsyncPCInvokeSlsbWithSynchPC", tC1SfsbWithUnsynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling tC2_SLSBWithUnsynchPC.doTest");
stat.addStatus("TestCase2_slsbWithUnsyncPCInvokeSlsbWithSynchPC", tC2SlsbWithUnsynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling tC3_SLSBWithSynchPC.doTest");
stat.addStatus("TestCase3_slsbWithSyncPCInvokeSlsbWithUnsynchPC", tC3SlsbWithSynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("Calling tC4_SLSBWithSynchPC.doTest");
stat.addStatus("TestCase4_slsbWithSyncPCInvokeSfsbWithUnsynchPC", tC4SlsbWithSynchPC.doTest() ? stat.PASS : stat.FAIL);
-
+
System.out.println("DoTest method ends");
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
index cce2504..84a3377 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
@@ -29,17 +29,17 @@
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
@EJB(beanName = "SlsbWithSynchPC")
Finder finder;
@Override
public boolean doTest() {
try {
- //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
+ //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
//so that the current PC will be associated with the current TX.
em.find(Person.class, "Tom");
-
+
System.out.println("I am in TC1SfsbWithUnsynchPC.doTest");
//expect exception thrown from finder.findPerson
finder.findPerson("Tom");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
index 5d844df..720c0f3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
@@ -29,17 +29,17 @@
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
- @EJB(beanName = "SlsbWithSynchPC")
+
+ @EJB(beanName = "SlsbWithSynchPC")
Finder finder;
-
+
@Override
public boolean doTest() {
try {
- //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
+ //FIXME: a workaround to initiate JavaEETransactionImpl.txEntityManagerMap,
//so that the current PC will be associated with the current TX.
em.find(Person.class, "Tom");
-
+
System.out.println("I am in TC2SlsbWithUnsynchPC.doTest");
//expect exception thrown from finder.findPerson
finder.findPerson("Tom");
@@ -56,6 +56,6 @@
return false;
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
index 3a74e1e..d419f59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
@@ -24,14 +24,14 @@
@Stateless
public class TC3SlsbWithSynchPC implements Tester{
-
+
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.SYNCHRONIZED)
EntityManager em;
-
- @EJB(beanName = "TC3SlsbWithUnSynchPC")
+
+ @EJB(beanName = "TC3SlsbWithUnSynchPC")
Finder finder;
-
+
@Override
public boolean doTest() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
index 9085481..4254ddf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
@@ -23,7 +23,7 @@
@Stateless
public class TC3SlsbWithUnSynchPC implements Finder{
-
+
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
index 2084d7d..29d04c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
@@ -23,7 +23,7 @@
@Stateful
public class TC4SfsbWithUnsynchPC implements Finder{
-
+
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
index d50c70d..326507f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
@@ -28,10 +28,10 @@
@PersistenceContext(unitName="lib/unsyncpc_txscope_synctype_mismatch-par.jar#em",
synchronization = SynchronizationType.SYNCHRONIZED)
EntityManager em;
-
+
@EJB(beanName = "TC4SfsbWithUnsynchPC")
Finder finder;
-
+
@Override
public boolean doTest() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties
index 80d0948..422163f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_flush"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml
index 77e288c..05be76f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*ynchPC*.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
index 6ed9ff8..200669f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
@@ -40,22 +40,22 @@
System.out.println("I am in client");
System.out.println("Calling SLSBWithUnsynchPC.flushBeforeJoin");
- stat.addStatus("FlushUnsyncPCBeforeJoin", sLSBWithUnsynchPC.flushBeforeJoin() ?
+ stat.addStatus("FlushUnsyncPCBeforeJoin", sLSBWithUnsynchPC.flushBeforeJoin() ?
stat.PASS : stat.FAIL);
-
+
System.out.println("Calling SLSBWithUnsynchPC.flushAfterJoin");
- stat.addStatus("FlushUnsyncPCAfterJoin", sLSBWithUnsynchPC.flushAfterJoin() ?
+ stat.addStatus("FlushUnsyncPCAfterJoin", sLSBWithUnsynchPC.flushAfterJoin() ?
stat.PASS : stat.FAIL);
-
- /* SPEC: If the flush method is not explicitly invoked, the persistence provider
- * may defer flushing until commit time depending on the operations invoked and
+
+ /* SPEC: If the flush method is not explicitly invoked, the persistence provider
+ * may defer flushing until commit time depending on the operations invoked and
* the flush mode setting in effect.
*/
System.out.println("Calling SLSBWithUnsynchPC.AutoFlushByProvider");
sLSBWithUnsynchPC.autoFlushByProvider("Tom3");
- stat.addStatus("AutoFlushByProvider", sLSBWithUnsynchPC.isPersonFound("Tom3") ?
+ stat.addStatus("AutoFlushByProvider", sLSBWithUnsynchPC.isPersonFound("Tom3") ?
stat.PASS : stat.FAIL);
-
+
System.out.println("DoTest method ends");
} catch (Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
index b80cc3c..eb50e89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
@@ -32,10 +32,10 @@
@Override
public boolean flushBeforeJoin() {
System.out.println("I am in flushBeforeJoin");
-
+
Person p = new Person("Tom");
em.persist(p);
-
+
try {
System.out.println("is jonined before flush: " + em.isJoinedToTransaction());
//flush before the unsynchronized PC join transaction
@@ -43,7 +43,7 @@
System.out.println("flushed with no exceptions thrown");
return false;
} catch (TransactionRequiredException tre) {
- /* SPEC: A persistence context of type SynchronizationType.UNSYNCHRONIZED must
+ /* SPEC: A persistence context of type SynchronizationType.UNSYNCHRONIZED must
* not be flushed to the database unless it is joined to a transaction
*/
//Expected exception thrown
@@ -54,7 +54,7 @@
return false;
}
}
-
+
@Override
public boolean flushAfterJoin() {
System.out.println("I am in flushAfterJoin");
@@ -67,8 +67,8 @@
em.joinTransaction();
try {
System.out.println("is jonined before flush: " + em.isJoinedToTransaction());
- /* SPEC: After the persistence context has been joined to a transaction,
- * changes in a persistence context can be flushed to the database explicitly
+ /* SPEC: After the persistence context has been joined to a transaction,
+ * changes in a persistence context can be flushed to the database explicitly
* by the application
*/
em.flush();
@@ -79,19 +79,19 @@
return false;
}
}
-
+
@Override
public void autoFlushByProvider(String name) {
System.out.println("I am in autoFlushByProvider");
-
+
Person p = new Person(name);
em.persist(p);
-
+
System.out.println("is jonined before joinTransaction: " + em.isJoinedToTransaction());
//Join transaction
em.joinTransaction();
}
-
+
@Override
public boolean isPersonFound(String name) {
System.out.println("I am in isPersonFound");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
index c3a048b..6c76c47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
@@ -21,10 +21,10 @@
@Remote
public interface Tester {
public boolean flushBeforeJoin();
-
+
public boolean flushAfterJoin();
-
+
public void autoFlushByProvider(String name);
-
+
public boolean isPersonFound(String name);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties
index 08fbf2c..3253ce4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="unsynchpc_use_nonjtadatasource"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml
index c4da180..e29a505 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/build.xml
@@ -46,17 +46,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean.class,**/Tester.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Tester.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
index aba6a34..c6fe1ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
@@ -24,7 +24,7 @@
@Id
private int id;
-
+
private String name;
public Person() {
@@ -38,7 +38,7 @@
public String toString() {
return "Person: {" + "(name = " + name + ")}";
}
-
+
public int getId() {
return this.id;
}
@@ -46,7 +46,7 @@
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
index 5b455b1..b92ae2e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
@@ -28,18 +28,18 @@
@Stateful
public class SfulBean {
@PersistenceContext(unitName="lib/unsynchpc_use_nonjtadatasource-par.jar#em",
- type=PersistenceContextType.EXTENDED,
+ type=PersistenceContextType.EXTENDED,
synchronization=SynchronizationType.UNSYNCHRONIZED)
EntityManager em;
-
+
public Person testUsingNonJTADataSource(Map<String, Boolean> resultMap) {
Person p = em.find(Person.class, 1);
System.out.println("I am in testUsingNonJTADataSource, and person name is " + p.getName());
resultMap.put("equalsCurrentName", p.getName().equals("currentName"));
return p;
}
-
+
public boolean testRollBackDoesNotClearUnsynchPC(Person person) {
- return (em.contains(person) && person.getName() != "newName");
+ return (em.contains(person) && person.getName() != "newName");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
index eb6578b..cf361c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
@@ -31,14 +31,14 @@
import jakarta.transaction.UserTransaction;
@Stateless
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.use_nonjtadatasource.ejb.SfulBean.class)
@TransactionManagement(TransactionManagementType.BEAN)
public class SlessBean implements Tester{
-
+
public Map<String, Boolean> doTest() {
Map<String, Boolean> resultMap = new HashMap<String, Boolean>();
-
+
DataSource ds = null;
Connection conn = null;
PreparedStatement ps = null;
@@ -48,23 +48,23 @@
utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
ds = (DataSource)(new javax.naming.InitialContext()).lookup("java:comp/DefaultDataSource");
-
+
utx.begin();
conn = ds.getConnection();
ps = conn.prepareStatement("Update EJB32_PERSISTENCE_CONTEXT_PERSON set name = 'newName' where id = 1");
-
+
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
SfulBean sfulBean = (SfulBean) initCtx.lookup(lookupName);
-
+
Person person = sfulBean.testUsingNonJTADataSource(resultMap);
-
+
utx.rollback();
utx = null;
resultMap.put("testRollBackDoesNotClearUnsynchPC", sfulBean.testRollBackDoesNotClearUnsynchPC(person));
-
+
System.out.println("DoTest method ends");
return resultMap;
} catch (Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties
index 95b5cd3..232412c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.properties
@@ -15,13 +15,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-sfsb-basic"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml
index cfb926f..4e4e6e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Hell*.class,**/S*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
index e75bfb7..48d0368 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -47,26 +47,26 @@
public void doTest() {
- try {
+ try {
- Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
- System.out.println("SFSB test : " + bean.test("BAR", 1));
+ Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
+ System.out.println("SFSB test : " + bean.test("BAR", 1));
bean.testRemove();
- bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
- System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
- System.out.println("SFSB test again: " + bean.test("BAR", 2));
+ bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB!com.acme.Hello");
+ System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
+ System.out.println("SFSB test again: " + bean.test("BAR", 2));
- Hello2 bean2 = (Hello2) new InitialContext().lookup("java:global/" + appName + "/SLSB");
+ Hello2 bean2 = (Hello2) new InitialContext().lookup("java:global/" + appName + "/SLSB");
bean2.testRemove();
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
index 2bdd2ab..8f44c96 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
@@ -24,8 +24,8 @@
@Entity
public class FooEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -33,10 +33,10 @@
public FooEntity(String name) {
setName(name);
}
-
+
public FooEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
index a996a05..e75325b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
@@ -39,16 +39,16 @@
em.persist(fe);
System.out.println("Done SFSB::init()");
}
-
+
public String test(String value, int count) throws EJBException {
- System.out.println("In SFSB::test()");
+ System.out.println("In SFSB::test()");
Query q = em.createQuery("SELECT f FROM FooEntity f WHERE f.name=:name");
q.setParameter("name", value);
- java.util.List result = q.getResultList();
- if (result.size() != count)
+ java.util.List result = q.getResultList();
+ if (result.size() != count)
throw new EJBException("ERROR: Found " + result.size() + " FooEntity named " + value + ", not expected " + count);
- return "Found " + result.size() + " FooEntity named " + value;
+ return "Found " + result.size() + " FooEntity named " + value;
}
@Remove
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
index 9df1d86..65bfe3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
@@ -26,13 +26,13 @@
public void testRemove() {
System.out.println("In SLSB::testRemove()");
- bean.test("XYZ", 0);
+ bean.test("XYZ", 0);
bean.testRemove();
try {
- bean.foo();
- throw new RuntimeException("Removed bean got invoked!");
+ bean.foo();
+ throw new RuntimeException("Removed bean got invoked!");
} catch(NoSuchEJBException nse) {
- System.out.println("SFSB has been removed, subsequent invocation got exception");
+ System.out.println("SFSB has been removed, subsequent invocation got exception");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java
index 65d6703..6758a79 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SuperSFSB.java
@@ -17,7 +17,7 @@
package com.acme;
public class SuperSFSB {
- public void foo() {
- return;
- }
+ public void foo() {
+ return;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml
index 0f7b1ce..ebb6f20 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/build.xml
@@ -53,9 +53,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes set of ejb-ejb32-sfsb tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes set of ejb-ejb32-sfsb tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties
index f31d1d5..970ef84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-sfsb-descr"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml
index 0bf662d..97e57bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Foo*.class,**/Hello.class,**/SFSB.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
index b09b63f..128e3f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
@@ -47,22 +47,22 @@
public void doTest() {
- try {
+ try {
- Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
- System.out.println("SFSB test : " + bean.test("BAR", 1));
+ Hello bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
+ System.out.println("SFSB test : " + bean.test("BAR", 1));
bean.testRemove();
- bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
- System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
- System.out.println("SFSB test again: " + bean.test("BAR", 2));
+ bean = (Hello) new InitialContext().lookup("java:global/" + appName + "/SFSB");
+ System.out.println("SFSB test destroyed: " + bean.test("FOO", 1));
+ System.out.println("SFSB test again: " + bean.test("BAR", 2));
- stat.addStatus("local main", stat.PASS);
+ stat.addStatus("local main", stat.PASS);
- } catch(Exception e) {
- stat.addStatus("local main", stat.FAIL);
- e.printStackTrace();
- }
+ } catch(Exception e) {
+ stat.addStatus("local main", stat.FAIL);
+ e.printStackTrace();
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
index 2bdd2ab..8f44c96 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
@@ -24,8 +24,8 @@
@Entity
public class FooEntity {
-
- @Id
+
+ @Id
@GeneratedValue
private int id;
private String name;
@@ -33,10 +33,10 @@
public FooEntity(String name) {
setName(name);
}
-
+
public FooEntity() {
}
-
+
public String getName() {
return name;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
index a74ef21..3d4c3cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
@@ -34,16 +34,16 @@
em.persist(fe);
System.out.println("Done SFSB::init()");
}
-
+
public String test(String value, int count) throws EJBException {
- System.out.println("In SFSB::test()");
+ System.out.println("In SFSB::test()");
Query q = em.createQuery("SELECT f FROM FooEntity f WHERE f.name=:name");
q.setParameter("name", value);
- java.util.List result = q.getResultList();
- if (result.size() != count)
+ java.util.List result = q.getResultList();
+ if (result.size() != count)
throw new EJBException("ERROR: Found " + result.size() + " FooEntity named " + value + ", not expected " + count);
- return "Found " + result.size() + " FooEntity named " + value;
+ return "Found " + result.size() + " FooEntity named " + value;
}
public void testRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties
index b5ac995..eda4a85 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb32-sfsb-lifecycle_cb_txattr"/>
-<property name="appname" value="${module}"/>
-<property name="jndiroot" value="${appname}-ejb"/>
+<property name="appname" value="${module}"/>\u0020
+<property name="jndiroot" value="${appname}-ejb"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="se.client" value="com.acme.Client"/>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml
index 0930eec..6c87af9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,12 +46,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/H*.class,**/S*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -59,9 +59,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
index 5bfa4db..18b14ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
@@ -29,17 +29,17 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
+ appName = args[0];
stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
index 1bcf730..ec45175 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
@@ -34,9 +34,9 @@
System.out.println("In SFSB::init()");
(new Exception("init")).printStackTrace();
}
-
+
public String test() throws EJBException {
- System.out.println("In SFSB::test()");
+ System.out.println("In SFSB::test()");
return "SFSB";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
index 68b543d..6fbe6ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
@@ -33,9 +33,9 @@
public void init() {
System.out.println("In SFSB1::init()");
}
-
+
public String test() throws EJBException {
- System.out.println("In SFSB1::test()");
+ System.out.println("In SFSB1::test()");
return "SFSB1";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
index e7b9e7d..80522a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
@@ -33,9 +33,9 @@
public void init() {
System.out.println("In SFSB2::init()");
}
-
+
public String test() throws EJBException {
- System.out.println("In SFSB2::test()");
+ System.out.println("In SFSB2::test()");
return "SFSB2";
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml
index 19f2bed..6762b46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/build.xml
@@ -48,13 +48,13 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-timer tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-timer tests)
- ant getalltimers (Executes the getAllTimers ejb-timer test)
- ant opallowed (Executes the operation allowed ejb-timer test)
+ ant getalltimers (Executes the getAllTimers ejb-timer test)
+ ant opallowed (Executes the operation allowed ejb-timer test)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties
index c0f5946..c9e87df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-getalltimers"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml
index e7fb279..242130a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -60,9 +60,9 @@
<param name="appclientjar.classes" value="**/Client.class,**/*Timeout.class" />
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -70,10 +70,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
index e39c707..61b0f0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
@@ -23,7 +23,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
InitialContext context;
@@ -33,7 +33,7 @@
@EJB(lookup = "java:app/ejb-timer-getalltimers-ejb2/StlesNonTimeoutEJB")
private static StlesNonTimeout stlesNonTimeout;
- public static void main(String args[]) {
+ public static void main(String args[]) {
stat.addDescription("ejb32-timer-getalltimers");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
index a0f64f0..5caa0dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
@@ -65,7 +65,7 @@
errors.add(info);
}
}
-
+
if (ts.size() != expected_infos.size()) {
printTimerInfos(ts);
throw new EJBException("timerSvc.getAllTimers().size() = "
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties
index 75a0679..df41644 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.properties
@@ -15,15 +15,15 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-opallowed"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="com.acme.ejb32.timer.opallowed.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="appclient"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml
index db50247..07bf7ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/build.xml
@@ -34,19 +34,19 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<!--this is tricky since webclient-war-common simply package all classes under ${war.classes}
and we need remote/local interface in the war-->
- <copy todir="war">
- <fileset dir="ejb" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
- </copy>
+ <copy todir="war">
+ <fileset dir="ejb" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
+ </copy>
<antcall target="compile-common">
<param name="src" value="war"/>
</antcall>
<delete>
- <fileset dir="war" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
- </delete>
+ <fileset dir="war" includes="**/*Timeout.java,**/*TimeoutLocal.java"/>
+ </delete>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
@@ -69,58 +69,58 @@
<param name="appclientjar.classes" value="**/Client.class,**/*Timeout.class" />
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
- <!--run-appclient & run-jseclient are blocked by JIRA19546-->
+ <!--run-appclient & run-jseclient are blocked by JIRA19546-->
<target name="run" depends="run-pojo, run-webapp, run-managedbean"/>
- <target name="run-appclient" depends="init-common">
- <antcall target="runclient-common"/>
- </target>
-
- <target name="run-jseclient" depends="init-common">
+ <target name="run-appclient" depends="init-common">
+ <antcall target="runclient-common"/>
+ </target>
+
+ <target name="run-jseclient" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="jseClient" />
</antcall>
- </target>
+ </target>
- <target name="run-client">
- <java fork="on"
+ <target name="run-client">
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${test.client}">
- <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
+ <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
<arg line="${client.type}"/>
<arg line="${http.port}"/>
</java>
- </target>
+ </target>
- <target name="run-pojo" depends="init-common">
+ <target name="run-pojo" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="pojo" />
</antcall>
- </target>
+ </target>
- <target name="run-webapp" depends="init-common">
+ <target name="run-webapp" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="webapp" />
</antcall>
- </target>
+ </target>
- <target name="run-managedbean" depends="init-common">
+ <target name="run-managedbean" depends="init-common">
<antcall target="run-client">
<param name="client.type" value="managedbean" />
</antcall>
- </target>
+ </target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
index 045234c..0089ff2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
@@ -31,9 +31,9 @@
public class SingletonTimeoutEJB implements SingletonTimeoutLocal, SingletonTimeout {
@Resource
TimerService ts;
-
+
Timer t;
-
+
public TimerHandle createTimer(String info) {
boolean created = false;
for(Timer timer:ts.getTimers()) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
index 4b5894b..ed51514 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
@@ -42,7 +42,7 @@
String type = req.getQueryString();
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
out.println("<html>");
out.println("<head>");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml
index 2c3af5b..0f87e0f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/build.xml
@@ -53,13 +53,13 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant equals (Executes the ejb-ejbc equals test)
- ant redef (Executes the ejb-ejbc redef test)
- ant sameimpl (Executes the ejb-ejbc sameimpl
+ <echo>
+ Usage:
+ ant equals (Executes the ejb-ejbc equals test)
+ ant redef (Executes the ejb-ejbc redef test)
+ ant sameimpl (Executes the ejb-ejbc sameimpl
test)
- ant all (Executes all the ejb-ejbc tests)
- </echo>
+ ant all (Executes all the ejb-ejbc tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties
index 5b233db..33e1fcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejbc-equals"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml
index ab750aa..c06099a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/Hello.class,**/HelloHome.class,**/*Foo*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,17 +61,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="redeploy" depends="init-common">
<antcall target="deploy-common"/>
<antcall target="deploy-common"/>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
index 397a553..454e93e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
@@ -32,7 +32,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -41,22 +41,22 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejbc-equalsID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
@@ -65,13 +65,13 @@
// make sure stubs for super class are available to client
FooHomeSuper homeSuper = (FooHomeSuper)
PortableRemoteObject.narrow(objref, FooHomeSuper.class);
-
+
System.err.println("Narrowed FooHomeSuper!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
- f.callHello();
+ f.callHello();
FooSuper f2 = home.create();
f2.louie();
@@ -82,10 +82,10 @@
stat.addStatus("ejbclient main" , stat.FAIL);
}
- try {
+ try {
Context ic = new InitialContext();
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
@@ -93,30 +93,30 @@
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
String said = hr.sayHello();
String result = hr.assertValidRemoteObject();
if (result == null) {
- stat.addStatus("ejbclient assertValidRemoteObject", stat.PASS);
- } else {
- System.out.println("assertValidRemoteObject: " + result);
- stat.addStatus("ejbclient assertValidRemoteObject", stat.FAIL);
- }
+ stat.addStatus("ejbclient assertValidRemoteObject", stat.PASS);
+ } else {
+ System.out.println("assertValidRemoteObject: " + result);
+ stat.addStatus("ejbclient assertValidRemoteObject", stat.FAIL);
+ }
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("ejbclient assertValidRemoteObject" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
index 8f1c9d2..44b6f06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
@@ -24,7 +24,7 @@
public interface Foo extends EJBObject, FooSuper, java.rmi.Remote {
void callHello() throws RemoteException;
String sayHello() throws RemoteException;
-
+
public boolean assertValidRemoteObject(String msg)
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
index 555fe48..0646997 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void louie() { System.out.println("luigi luigi"); }
@@ -69,22 +69,22 @@
FooLocalHome fooLocalHome = (FooLocalHome)
ic.lookup("java:comp/env/ejb/melocal");
FooLocal meLocal = fooLocalHome.create();
-
+
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hr.sayHello();
@@ -98,10 +98,10 @@
HelloLocalHome localHome = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal");
System.err.println("Looked up home!!");
-
+
HelloLocal hl = localHome.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hl.sayHello();
@@ -112,7 +112,7 @@
//
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
objref = ic.lookup("java:comp/env/ejb/hello2");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
@@ -120,12 +120,12 @@
HelloHome home2 = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr2 = home2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
String said = hr2.sayHello();
@@ -137,10 +137,10 @@
HelloLocalHome localHome2 = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal2");
System.err.println("Looked up home!!");
-
+
HelloLocal hl2 = localHome2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello2 ejb");
String saidLocal = hl2.sayHello();
@@ -155,7 +155,7 @@
}
- com.sun.ejb.Container cont =
+ com.sun.ejb.Container cont =
((com.sun.ejb.containers.EJBContextImpl) sc).getContainer();
//
@@ -281,22 +281,22 @@
Context ic = new InitialContext();
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
Hello hr = home.create();
- return (hr.assertValidRemoteObject() == null)
- ? true: false;
- } catch (Exception ex) {
- throw new EJBException(ex);
- }
+ return (hr.assertValidRemoteObject() == null)
+ ? true: false;
+ } catch (Exception ex) {
+ throw new EJBException(ex);
+ }
}
public String assertValidRemoteObject() {
@@ -306,10 +306,10 @@
Context ic = new InitialContext();
Object objref = ic.lookup("java:comp/env/ejb/hello2");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
Hello hr2 = home.create();
hr2.sayHello();
@@ -317,7 +317,7 @@
System.out.println("successfully invoked sayHello() ejb2");
//
- com.sun.ejb.Container cont =
+ com.sun.ejb.Container cont =
((com.sun.ejb.containers.EJBContextImpl) sc).getContainer();
//
@@ -336,8 +336,8 @@
try {
cont.assertValidRemoteObject(home);
String str = "Comparison of (ejbo and home) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -345,8 +345,8 @@
try {
cont.assertValidRemoteObject(null);
String str = "Comparison of (ejbo and null) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -354,8 +354,8 @@
try {
cont.assertValidRemoteObject(this);
String str = "Comparison of (ejbo and bean) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
@@ -363,18 +363,18 @@
try {
cont.assertValidRemoteObject(hr2);
String str = "Comparison of (ejbo and ejbo_from_diff_container) should have failed";
- System.out.println(str);
- return str;
+ System.out.println(str);
+ return str;
} catch(jakarta.ejb.EJBException e) {
System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
}
- return null;
- } catch (Exception ex) {
- ex.printStackTrace();
- return "Caught unexpected exception: " + ex.toString();
- }
+ return null;
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ return "Caught unexpected exception: " + ex.toString();
+ }
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java
index abb4dd5..4152e62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuper.java
@@ -20,5 +20,5 @@
import java.rmi.RemoteException;
public interface FooHomeSuper extends java.rmi.Remote {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
index b4eb94f..ceda6d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
@@ -27,6 +27,6 @@
String sayHello() throws RemoteException;
String assertValidRemoteObject()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties
index faa6943..30ddd37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejbc-redef"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml
index 2055da0..04c272d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
index 4a8ce18..e88e5a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejbc-redefID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -75,8 +75,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
index 71580c9..28b565a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public String sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
index eb0530c..642bd9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
@@ -23,6 +23,6 @@
public interface FooHomeSuper extends Remote {
-
+
Foo create() throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties
index fdce939..043bb24 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejbc-sameimpl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml
index 6e73fd8..8ca7e4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
index 9b5f3e8..6cdc44a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-ejbc-sameimplID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
index 4b705ee..b61b739 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,11 +33,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public String sayHello() {
@@ -62,21 +62,21 @@
Context ic = new InitialContext();
//
-
+
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hr.sayHello();
@@ -90,10 +90,10 @@
HelloLocalHome localHome = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal");
System.err.println("Looked up home!!");
-
+
HelloLocal hl = localHome.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
hl.sayHello();
@@ -104,19 +104,19 @@
//
System.out.println("Looking up ejb ref hello ");
- // create EJB using factory from container
+ // create EJB using factory from container
objref = ic.lookup("java:comp/env/ejb/hello2");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home2 = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr2 = home2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello ejb");
String said = hr2.sayHello();
@@ -128,10 +128,10 @@
HelloLocalHome localHome2 = (HelloLocalHome)
ic.lookup("java:comp/env/ejb/hellolocal2");
System.err.println("Looked up home!!");
-
+
HelloLocal hl2 = localHome2.create();
System.err.println("Got the EJB!!");
-
+
System.out.println("invoking hello2 ejb");
String saidLocal = hl2.sayHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml
index 6c1ea32..46abcd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/build.xml
@@ -45,11 +45,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant jmsejb (Executes the ejb-jms jmsejb test)
- ant jmsejb2 (Executes the ejb-jms jmsejb2 test)
- ant all (Executes all the ejb-jms tests)
- </echo>
+ <echo>
+ Usage:
+ ant jmsejb (Executes the ejb-jms jmsejb test)
+ ant jmsejb2 (Executes the ejb-jms jmsejb2 test)
+ ant all (Executes all the ejb-jms tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties
index 62739da..a2fa85b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-jms-jmsejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml
index 0cdc6a6..85a3c38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/HelloHome.class,**/Hello.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
index 589c4f3..8cc21ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,11 +33,11 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-mdb-jmsejbID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
String ejbNames[] = { "ejbs/hellobmt", "ejbs/hellocmt" };
@@ -45,56 +45,56 @@
try {
for(int i = 0; i < ejbNames.length; i++ ) {
ejbName = ejbNames[i];
-
+
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
- // create EJB using factory from container
+ // create EJB using factory from container
// java.lang.Object objref = ic.lookup("helloApp/Hello");
java.lang.Object objref = ic.lookup("java:comp/env/"+ejbName);
System.out.println("---ejb stub---" + objref.getClass().getClassLoader());
System.out.println("---ejb classname---" + objref.getClass().getName());
System.out.println("---HelloHome---" + HelloHome.class.getClassLoader());
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow(
objref, HelloHome.class);
System.err.println("Narrowed home!!");
-
-
+
+
Hello hr = home.create(helloStr);
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("Asking ejb to send a message");
String msgText = "Look ma, I received a JMS message!!!";
-
+
//
String result = hr.sendMessage1(msgText);
System.out.println("Result from sendMessage = " + result);
System.out.println("Asking ejb to receive a message");
hr.receiveMessage1();
-
+
//
result = hr.sendMessage2(msgText);
System.out.println("Result from sendMessage = " + result);
System.out.println("Asking ejb to receive a message");
hr.receiveMessage2();
-
+
//
result = hr.sendMessage3(msgText);
System.out.println("Result from sendMessage = " + result);
System.out.println("Asking ejb to receive a message");
hr.receiveMessage3();
-
- /* comment out
+
+ /* comment out
hr.sendMessage4Part1(msgText);
hr.sendMessage4Part2(msgText);
hr.receiveMessage4Part1();
hr.receiveMessage4Part2();
*/
-
+
hr.sendAndReceiveMessage();
hr.sendAndReceiveRollback();
@@ -103,15 +103,15 @@
hr.sendMessageRollback(msgText + "rollback");
hr.receiveMessageRollback();
- stat.addStatus("jmsejb " + ejbName,
+ stat.addStatus("jmsejb " + ejbName,
stat.PASS);
}
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("jmsejb " + ejbName, stat.FAIL);
}
-
- return;
+
+ return;
}
final static String helloStr = "Hello World!";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
index 7e7f4d6..9d039a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.jms.jmsejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -35,7 +35,7 @@
public HelloBean() {}
public void ejbCreate(String str) throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
this.str = str;
try {
Context context = new InitialContext();
@@ -47,13 +47,13 @@
System.out.println("HelloEJB has CONTAINER MANAGED TX");
}
- String name = (String) context.lookup("java:comp/env/user");
- Double d = (Double) context.lookup("java:comp/env/number");
- System.out.println("Hello EJB - saying hello to " + name +
- ",number is " + d);
+ String name = (String) context.lookup("java:comp/env/user");
+ Double d = (Double) context.lookup("java:comp/env/number");
+ System.out.println("Hello EJB - saying hello to " + name +
+ ",number is " + d);
queue = (Queue) context.lookup("java:comp/env/jms/QueueName");
- qcFactory =
+ qcFactory =
(QueueConnectionFactory) context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
} catch(Exception e) {
@@ -100,7 +100,7 @@
sc.getUserTransaction().commit();
}
- // Now make sure that even though the global transaction
+ // Now make sure that even though the global transaction
// is over, calling commit results in an exception.
// since we're in an ejb.
try {
@@ -152,7 +152,7 @@
} catch(jakarta.jms.JMSException j2) {
throw new JMSException("Got wrong jmsexception");
}
-
+
try {
session.getMessageListener();
throw new JMSException
@@ -186,7 +186,7 @@
QueueSession session = connection.createQueueSession(true, 0);
sendMessageInternal(session, msg);
-
+
session.close();
if( beanManagedTx ) {
@@ -213,7 +213,7 @@
}
/**
- * Create a session and store it as part of
+ * Create a session and store it as part of
* the ejb's state. Then send a message.
* Corresponding recv method will close the session.
*/
@@ -247,7 +247,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -259,7 +259,7 @@
QueueConnection connection = null;
try {
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
if( beanManagedTx ) {
@@ -302,7 +302,7 @@
}
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
connection.start();
@@ -374,7 +374,7 @@
/**
* Send a message but don't commit. sendMessagePart2
* will commit. This method will only work with
- * when bean has bean managed tx.
+ * when bean has bean managed tx.
*/
public String sendMessage4Part1(String msg) throws EJBException {
try {
@@ -386,7 +386,7 @@
}
savedConnection = qcFactory.createQueueConnection();
-
+
savedSession = savedConnection.createQueueSession(true, 0);
sendMessageInternal(savedSession, msg);
@@ -404,7 +404,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -434,7 +434,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -447,9 +447,9 @@
System.out.println("In sendMessageRollback");
if( beanManagedTx ) {
sc.getUserTransaction().begin();
- }
+ }
savedConnection = qcFactory.createQueueConnection();
-
+
savedSession = savedConnection.createQueueSession(true, 0);
sendMessageInternal(savedSession, msg);
@@ -473,7 +473,7 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
return msg;
}
@@ -489,7 +489,7 @@
Message message = receiver.receiveNoWait();
if( message != null ) {
- throw new Exception("Shouldn't have gotten msg " +
+ throw new Exception("Shouldn't have gotten msg " +
message);
} else {
System.out.println("Successfully DIDN'T receive msg");
@@ -510,7 +510,7 @@
/**
* Receive a message but don't commit. recvMessagePart2
* will commit. This method will only work with
- * when bean has bean managed tx.
+ * when bean has bean managed tx.
*/
public void receiveMessage4Part1() throws EJBException {
try {
@@ -520,7 +520,7 @@
System.out.println("skipping recvMessage4Part1 b/c of CMT");
return;
}
-
+
savedConnection.start();
Message message = recvMessageInternal(savedSession);
@@ -538,9 +538,9 @@
}
} catch(Exception ne) {}
throw new EJBException(e);
- }
+ }
}
-
+
/**
* Commit the receive that was done in recvMessagePart1
*/
@@ -586,21 +586,21 @@
}
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
String msgText = "sendandreceive";
sendMessageInternal(session, msgText);
sc.getUserTransaction().commit();
System.out.println("Sent message " + msgText);
-
+
//
connection.start();
sc.getUserTransaction().begin();
recvMessageInternal(session);
sc.getUserTransaction().commit();
-
+
} catch(Exception e) {
e.printStackTrace();
try {
@@ -631,7 +631,7 @@
}
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, 0);
String msgText = "sendandreceiverollback";
@@ -685,7 +685,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties
index 922932e..1451275 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-jms-jmsejb2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml
index f22c24f..33fbb0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/HelloHome.class,**/Hello.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
index d298129..2d7fdff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -33,43 +33,43 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-mdb-jmsejb2ID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
String ejbName = "ejbs/hellobmt";
try {
-
+
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
- // create EJB using factory from container
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("java:comp/env/"+ejbName);
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---HelloHome---" +
+ System.out.println("---HelloHome---" +
HelloHome.class.getClassLoader());
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create(helloStr);
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("Asking ejb to send a message");
String msgText = "this is the ejb-jms-jmsejb2 test";
-
+
String result = hr.sendMessageNoCommitPart1(msgText);
System.out.println("Result from sendMessage = " + result);
@@ -82,8 +82,8 @@
e.printStackTrace();
stat.addStatus("jmsejb2 " + ejbName, stat.FAIL);
}
-
- return;
+
+ return;
}
final static String helloStr = "Hello World!";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
index 20aeeeb..ec477c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.jms.jmsejb2;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,7 +34,7 @@
public HelloBean() {}
public void ejbCreate(String str) throws RemoteException {
- System.out.println("In ejbCreate !!");
+ System.out.println("In ejbCreate !!");
this.str = str;
try {
Context context = new InitialContext();
@@ -43,7 +43,7 @@
queue = (Queue) context.lookup("java:comp/env/jms/QueueName");
- qcFactory = (QueueConnectionFactory)
+ qcFactory = (QueueConnectionFactory)
context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
} catch(Exception e) {
@@ -75,7 +75,7 @@
throw new EJBException(e);
}
- // NOTE : leave connection and session open. they will be
+ // NOTE : leave connection and session open. they will be
// re-enlisted when the next business method is called since
// the transaction is still active.
@@ -122,7 +122,7 @@
}
}
- private void sendMessageInternal(QueueSession session, String msg)
+ private void sendMessageInternal(QueueSession session, String msg)
throws JMSException {
// Create a message producer.
QueueSender sender = session.createSender(queue);
@@ -133,7 +133,7 @@
sender.send(message);
}
- private Message recvMessageInternal(QueueSession session)
+ private Message recvMessageInternal(QueueSession session)
throws JMSException {
// Create a message consumer
QueueReceiver receiver = session.createReceiver(queue);
@@ -143,7 +143,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml
index 4fda9e4..4b14b14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/build.xml
@@ -30,9 +30,9 @@
<target name="all">
- <antcall target="cmt"/>
- <antcall target="msgbean"/>
- <antcall target="singleton"/>
+ <antcall target="cmt"/>
+ <antcall target="msgbean"/>
+ <antcall target="singleton"/>
</target>
@@ -55,12 +55,12 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant cmt (Executes the ejb-mdb cmt test)
- ant msgbean (Executes the ejb-mdb msgbean test)
- ant singleton (Executes the ejb-mdb singleton test)
- ant all (Executes all the ejb-mdb tests)
- </echo>
+ <echo>
+ Usage:
+ ant cmt (Executes the ejb-mdb cmt test)
+ ant msgbean (Executes the ejb-mdb msgbean test)
+ ant singleton (Executes the ejb-mdb singleton test)
+ ant all (Executes all the ejb-mdb tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties
index 2bb43b9..caa8942 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-mdb-cmt"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml
index 5b9b207..dffff28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
index ec031e0..cbb8d09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
@@ -51,7 +51,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -60,9 +60,9 @@
public void doTest() {
try {
setup();
- doTest("jms/ejb_mdb_cmt_InQueue", numMessages);
- // @@@ message-destination-ref support
- // oTest("java:comp/env/jms/MsgBeanQueue", numMessages);
+ doTest("jms/ejb_mdb_cmt_InQueue", numMessages);
+ // @@@ message-destination-ref support
+ // oTest("java:comp/env/jms/MsgBeanQueue", numMessages);
stat.addStatus("cmt main", stat.PASS);
} catch(Throwable t) {
stat.addStatus("cmt main", stat.FAIL);
@@ -74,31 +74,31 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/FooCF");
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueCon.start();
/*
- TopicConnectionFactory topicConFactory =
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("jms/TopicConnectionFactory");
-
+
topicCon = topicConFactory.createTopicConnection();
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
*/
@@ -114,18 +114,18 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- System.out.println("Sending message " + i + " to " + queue +
+ System.out.println("Sending message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- System.out.println("Sent message " + i + " to " + queue +
+ System.out.println("Sent message " + i + " to " + queue +
" at time " + System.currentTimeMillis());
}
}
- public void sendMsgs(Topic topic, Message msg, int num)
+ public void sendMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
// System.out.println("Publishing message " + i + " to " + queue);
@@ -134,11 +134,11 @@
}
}
- public void doTest(String destName, int num)
+ public void doTest(String destName, int num)
throws Exception {
Destination dest = (Destination) context.lookup(destName);
-
+
Message message = queueSession.createTextMessage(destName);
// Message message = topicSession.createTextMessage(destName);
message.setBooleanProperty("flag", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
index 0154e22..61ea3c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
@@ -21,7 +21,7 @@
import jakarta.ejb.*;
import javax.naming.*;
-public class MessageBean
+public class MessageBean
implements MessageDrivenBean, MessageListener {
private MessageDrivenContext mdc;
@@ -66,16 +66,16 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
- System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
+ this.mdc = mdc;
+ System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
}
public void ejbCreate() throws RemoteException {
- System.out.println("In MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In MessageDrivenEJB::ejbCreate !!");
}
public void ejbRemove() {
- System.out.println("In MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In MessageDrivenEJB::ejbRemove !!");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties
index d2d90fe..02dd789 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-mdb-msgbean"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml
index 322153c..e85a56f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -76,17 +76,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
index 1052069..9b404cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/client/HelloClient.java
@@ -68,7 +68,7 @@
BFALSE, // jdbc
BFALSE } }; // rollback
- Object[][] onePhaseCommitTests = {
+ Object[][] onePhaseCommitTests = {
{ "jms/queue_cmt", BFALSE, BFALSE, BFALSE },
{ "jms/topic_cmt", BFALSE, BFALSE, BFALSE },
@@ -79,7 +79,7 @@
{ "jms/topic_bmt", BFALSE, BTRUE, BFALSE },
};
- Object[][] twoPhaseCommitTests = {
+ Object[][] twoPhaseCommitTests = {
{ "jms/queue_cmt", BFALSE, BTRUE, BFALSE },
{ "jms/topic_cmt", BFALSE, BTRUE, BFALSE },
@@ -92,21 +92,21 @@
{ "jms/queue_cmt", BTRUE, BTRUE, BFALSE },
{ "jms/topic_cmt", BTRUE, BTRUE, BFALSE },
};
-
- Object[][] rollbackTests = {
+
+ Object[][] rollbackTests = {
{ "jms/queue_cmt", BTRUE, BFALSE, BTRUE },
{ "jms/topic_cmt", BTRUE, BFALSE, BTRUE },
-
+
{ "jms/queue_cmt", BTRUE, BTRUE, BTRUE },
{ "jms/topic_cmt", BTRUE, BTRUE, BTRUE },
-
+
{ "jms/queue_cmt", BFALSE, BFALSE, BTRUE },
{ "jms/topic_cmt", BFALSE, BFALSE, BTRUE },
-
+
{ "jms/queue_cmt", BTRUE, BFALSE, BTRUE },
- { "jms/topic_cmt", BTRUE, BFALSE, BTRUE },
-
+ { "jms/topic_cmt", BTRUE, BFALSE, BTRUE },
+
};
@@ -119,10 +119,10 @@
public void doTest() {
int numIter = 10;
- if(args.length == 0 || (args.length > 0 &&
+ if(args.length == 0 || (args.length > 0 &&
args[0].equals("1pc" )) ) {
System.out.println("Running 1 phase commit msgbean tests");
- numIter = (args.length >= 2) ?
+ numIter = (args.length >= 2) ?
Integer.parseInt(args[1]) : numIter;
doTests(onePhaseCommitTests, numIter);
} else if( args[0].equals("2pc") ) {
@@ -143,22 +143,22 @@
doTests(onePhaseCommitTests, numIter);
doTests(twoPhaseCommitTests, numIter);
doTests(localTxTests, numIter);
- doTests(rollbackTests, numIter);
+ doTests(rollbackTests, numIter);
} else {
userSpecifiedTxTest[0][0] = args[0];
numIter = Integer.parseInt(args[1]);
System.out.println("Running " + userSpecifiedTxTest[0][0]);
System.out.println("Num iterations = " + numIter);
if( args.length == 3 ) {
- userSpecifiedTxTest[0][1] =
+ userSpecifiedTxTest[0][1] =
new Boolean(args[2].indexOf("reply") != -1);
- userSpecifiedTxTest[0][2] =
+ userSpecifiedTxTest[0][2] =
new Boolean((args[2].indexOf("jdbc") != -1));
- userSpecifiedTxTest[0][3] =
+ userSpecifiedTxTest[0][3] =
new Boolean((args[2].indexOf("rollback") != -1));
}
doTests(userSpecifiedTxTest, numIter);
- }
+ }
return;
}
@@ -167,7 +167,7 @@
if (numIter > 20) {
TIMEOUT = TIMEOUT * (int)(numIter / 10);
}
-
+
for(int i = 0; i < tests.length; i++) {
String destName = "java:comp/env/" + (String) tests[i][0];
boolean expectReply = ((Boolean)tests[i][1]).booleanValue();
@@ -178,11 +178,11 @@
try {
setup();
doTest(destName, numIter, expectReply, jdbc, rollback);
- stat.addStatus(test, stat.PASS);
+ stat.addStatus(test, stat.PASS);
} catch(Throwable t) {
System.out.println("Caught unexpected exception " + t);
t.printStackTrace();
- stat.addStatus(test, stat.FAIL);
+ stat.addStatus(test, stat.FAIL);
break;
} finally {
cleanup();
@@ -193,37 +193,37 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/jms/QCF");
-
+
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
- clientQueue = (jakarta.jms.Queue)
+ clientQueue = (jakarta.jms.Queue)
context.lookup("java:comp/env/jms/client_queue");
queueReceiver = queueSession.createReceiver(clientQueue);
- TopicConnectionFactory topicConFactory =
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("java:comp/env/jms/TCF");
-
+
topicCon = topicConFactory.createTopicConnection();
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
- clientTopic = (Topic)
+ clientTopic = (Topic)
context.lookup("java:comp/env/jms/client_topic");
topicSubscriber = topicSession.createSubscriber(clientTopic);
@@ -249,7 +249,7 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Sending message " + i + " to " + queue);
@@ -257,7 +257,7 @@
}
}
- public void publishMsgs(Topic topic, Message msg, int num)
+ public void publishMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + topic);
@@ -270,7 +270,7 @@
System.out.println("Waiting for queue message " + (i+1) + " of " + num);
Message recvdmessage = queueReceiver.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
@@ -284,7 +284,7 @@
System.out.println("Waiting for topic message " + (i+1) + " of " + num);
Message recvdmessage = topicSubscriber.receive(TIMEOUT);
if( recvdmessage != null ) {
- System.out.println("Received message : " +
+ System.out.println("Received message : " +
((TextMessage)recvdmessage).getText());
} else {
System.out.println("timeout after " + TIMEOUT + " seconds");
@@ -293,11 +293,11 @@
}
}
- /**
+ /**
* Generate testname. (Try to keep synched with target names in Makefile.)
*/
- private String generateTestName(String destName, boolean doJdbc,
- boolean expectReply, boolean rollbackEnabled)
+ private String generateTestName(String destName, boolean doJdbc,
+ boolean expectReply, boolean rollbackEnabled)
{
String testName = destName.toLowerCase();
if (doJdbc) {
@@ -317,27 +317,27 @@
}
public void doTest(String destName, int numIter, boolean expectReply,
- boolean doJdbc, boolean rollbackEnabled)
-
- throws Exception
+ boolean doJdbc, boolean rollbackEnabled)
+
+ throws Exception
{
- String testName =
+ String testName =
generateTestName(destName, doJdbc, expectReply, rollbackEnabled);
try {
Destination dest = (Destination) context.lookup(destName);
-
+
boolean pointToPoint = dest instanceof jakarta.jms.Queue;
-
+
System.out.println("Beginning test : " + testName);
-
+
Timer.start();
-
+
if( pointToPoint ) {
- Message message =
+ Message message =
queueSession.createTextMessage(destName);
message.setBooleanProperty("doJdbc", doJdbc);
message.setBooleanProperty("rollbackEnabled", rollbackEnabled);
-
+
/* aid identifying what test message is associated with on JMS server side.
* (JMS RI Message Implementation toString() will print this property if it
* is set.)
@@ -348,11 +348,11 @@
}
sendMsgs((jakarta.jms.Queue) dest, message, numIter);
} else {
- Message message =
+ Message message =
topicSession.createTextMessage(destName);
message.setBooleanProperty("doJdbc", doJdbc);
message.setBooleanProperty("rollbackEnabled", rollbackEnabled);
-
+
/* aid identifying what test message is associated with on JMS server side.
* (JMS RI Message Implementation toString() will print this property if it
* is set.)
@@ -363,7 +363,7 @@
}
publishMsgs((Topic) dest, message, numIter);
}
-
+
if( expectReply ) {
if( pointToPoint ) {
recvQueueMsgs(numIter);
@@ -371,38 +371,38 @@
recvTopicMsgs(numIter);
}
}
-
+
long time = Timer.stop();
-
+
System.out.println("End test : " + testName + ". Time = " +
Timer.format(time) + " -> " + (time/numIter) +
" msec/msg (" + numIter + " msgs)");
} catch (Exception e) {
- System.out.println("Unexpected exception " + e + " in test " +
+ System.out.println("Unexpected exception " + e + " in test " +
testName);
throw e;
}
}
-
+
// helper class for timing the tests
private static class Timer {
static long startTime;
-
+
public static void start() {
startTime = System.currentTimeMillis();
}
-
+
public static long stop() {
return System.currentTimeMillis() - startTime;
}
-
+
/**
* Returns a string that outputs time in an
* easily readable format.
*/
public static String format(long timeIn) {
double foo = ((double)timeIn)/1000;
- long time = Math.round(foo);
+ long time = Math.round(foo);
String ret = null;
if (time < 60) {
ret = time + " seconds";
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
index 59da90d..5c02f21 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
@@ -62,20 +62,20 @@
context = new InitialContext();
beanManagedTx = ((Boolean) context.lookup
("java:comp/env/beanManagedTx")).booleanValue();
-
+
if( beanManagedTx ) {
System.out.println("BEAN MANAGED TRANSACTIONS");
} else {
System.out.println("CONTAINER MANAGED TRANSACTIONS");
}
-
- dataSource = (DataSource)
+
+ dataSource = (DataSource)
context.lookup("java:comp/env/jdbc/AccountDB");
-
+
// Create a Queue Session.
- queueConFactory = (QueueConnectionFactory)
+ queueConFactory = (QueueConnectionFactory)
context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
-
+
topicConFactory = (TopicConnectionFactory)
context.lookup("java:comp/env/jms/MyTopicConnectionFactory");
} catch(Exception e) {
@@ -91,16 +91,16 @@
String messageID = recvMsg.getJMSMessageID();
boolean doJms = (recvMsg.getJMSReplyTo() != null);
- boolean doJdbc =
+ boolean doJdbc =
recvMsg.getBooleanProperty("doJdbc");
- boolean rollbackEnabled =
+ boolean rollbackEnabled =
recvMsg.getBooleanProperty("rollbackEnabled");
System.out.println("In MsgBean::onMessage() : " + messageID);
System.out.println("jdbc enabled : " + doJdbc + " , " +
"jms reply enabled : " + doJms + " , " +
"rollback enabled : " + rollbackEnabled);
-
+
if( beanManagedTx ) {
mdc.getUserTransaction().begin();
} else if( rollbackEnabled ) {
@@ -111,7 +111,7 @@
"but redelivered flag not set" +
" : " + recvMsg);
} else {
- System.out.println("Got redelivered message " +
+ System.out.println("Got redelivered message " +
messageID);
}
}
@@ -123,12 +123,12 @@
mdc.getUserTransaction().commit();
} else if( rollbackEnabled ) {
if( recvMsg.getJMSRedelivered() ) {
- System.out.println("Got redelivered message " +
+ System.out.println("Got redelivered message " +
messageID);
// no more rollbacks -- container will commit tx
} else {
rollbackMessages.add(recvMsg);
- System.out.println("Rolling back message " +
+ System.out.println("Rolling back message " +
messageID);
mdc.setRollbackOnly();
}
@@ -140,13 +140,13 @@
}
protected void doStuff(boolean doJdbc, Message recvMsg) throws Exception {
-
+
Destination replyTo = recvMsg.getJMSReplyTo();
-
+
if( replyTo != null ) {
doJmsStuff(replyTo, recvMsg);
}
-
+
if( doJdbc) {
doJdbcStuff();
}
@@ -178,41 +178,41 @@
QueueConnection queueCon = null;
TopicConnection topicCon = null;
-
+
try {
-
+
if( replyTo instanceof Queue ) {
queueCon = queueConFactory.createQueueConnection();
-
+
// parameters to createQueueSession are ignored when there
// is a tx context. If there's a CMT unspecified tx context,
- // e.g. CMT NotSupported, jms activity must be coded
+ // e.g. CMT NotSupported, jms activity must be coded
// in a defensive way since the container has a lot of leeway
- // in how it performs the work.
+ // in how it performs the work.
QueueSession queueSession = queueCon.
createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
QueueSender sender = queueSession.
createSender((Queue)replyTo);
-
+
TextMessage sendMsg = queueSession.createTextMessage();
sendMsg.setText("Reply for " + ((TextMessage)recvMsg).getText() + " " + recvMsg.getJMSMessageID());
sender.send(sendMsg);
- System.out.println("Sent reply " + sendMsg +
+ System.out.println("Sent reply " + sendMsg +
" to " + replyTo);
} else {
topicCon = topicConFactory.createTopicConnection();
-
+
TopicSession topicSession = topicCon.
createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
TopicPublisher publisher =
topicSession.createPublisher((Topic)replyTo);
-
+
TextMessage sendMsg = topicSession.createTextMessage();
sendMsg.setText("Reply for " + ((TextMessage)recvMsg).getText() + " " + recvMsg.getJMSMessageID());
publisher.publish(sendMsg);
- System.out.println("Published reply " + sendMsg +
+ System.out.println("Published reply " + sendMsg +
" to " + replyTo);
}
} catch(JMSException jmse) {
@@ -230,10 +230,10 @@
}
}
}
-
+
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println("In MsgBean::setMessageDrivenContext()!!");
- this.mdc = mdc;
+ this.mdc = mdc;
}
public void ejbRemove() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
index 13ad328..34872e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
@@ -23,7 +23,7 @@
/**
* Tests matrix of operations callable from the different
- * methods in a message-driven bean.
+ * methods in a message-driven bean.
*/
public class OperationTest {
@@ -38,18 +38,18 @@
public static final int IS_CALLER_IN_ROLE = 5;
public static final int GET_EJB_HOME = 6;
public static final int USER_TX_BEGIN = 7;
- public static final int USER_TX_COMMIT = 8;
+ public static final int USER_TX_COMMIT = 8;
public static final int USER_TX_ROLLBACK = 9;
public static final int NUM_OPERATIONS = 10;
-
+
// OPERATION SETS (Table 9, Section 13.5.1 EJB 2.0)
- private static boolean[][] OPERATION_SETS =
+ private static boolean[][] OPERATION_SETS =
{
- { false, false, false, false, false, false, false, false, false, false },
+ { false, false, false, false, false, false, false, false, false, false },
{ true, false, false, false, false, false, false, false, false, false },
{ true, true, false, false, false, false, false, true, true, true },
{ true, false, false, true, true, false, false, false, false, false },
- { true, true, false, false, false, false, false, true, true, true }
+ { true, true, false, false, false, false, false, true, true, true }
};
// Transaction types
@@ -62,8 +62,8 @@
public static final int EJB_CREATE = 2;
public static final int EJB_REMOVE = 3;
public static final int ON_MESSAGE = 4;
-
- //
+
+ //
private static final int OPERATION_SET_MATRIX[][] =
{
{ 0, 1, 1, 1, 3 },
@@ -82,11 +82,11 @@
boolean[] testResults = new boolean[NUM_OPERATIONS];
- for(int operation = 0; operation < NUM_OPERATIONS; operation++) {
+ for(int operation = 0; operation < NUM_OPERATIONS; operation++) {
boolean result = false;
try {
switch(operation) {
- case ENV_ACCESS :
+ case ENV_ACCESS :
result = doEnvAccess(); break;
case USER_TX_ACCESS :
result = doUserTxAccess(); break;
@@ -127,7 +127,7 @@
System.out.println("Actual result : " + result);
}
- }
+ }
}
private boolean doEnvAccess() throws Throwable {
@@ -135,7 +135,7 @@
Context env = (Context) context.lookup("java:comp/env");
String envVar = (String) context.lookup("java:comp/env/EnvVar");
return true;
- }
+ }
private boolean doUserTxAccess() throws Throwable {
UserTransaction userTx = mdc.getUserTransaction();
@@ -146,7 +146,7 @@
mdc.getCallerPrincipal();
return true;
}
-
+
private boolean doGetRollbackOnly() throws Throwable {
mdc.getRollbackOnly();
return true;
@@ -187,6 +187,6 @@
userTx.begin();
userTx.rollback();
return true;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
index 9ddef0e..731d6ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
@@ -22,7 +22,7 @@
import jakarta.jms.MessageListener;
import javax.naming.*;
-public class OperationTestMsgBean implements MessageDrivenBean,
+public class OperationTestMsgBean implements MessageDrivenBean,
MessageListener {
private MessageDrivenContext mdc = null;
@@ -39,7 +39,7 @@
System.out.println("In OperationTestMsgBean::ejbCreate() !!");
try {
Context context = new InitialContext();
- beanManagedTx =
+ beanManagedTx =
((Boolean) context.lookup("java:comp/env/beanManagedTx")).booleanValue();
if( beanManagedTx ) {
@@ -55,7 +55,7 @@
}
public void onMessage(Message recvMsg) {
- System.out.println("In OperationTestMsgBean::onMessage() : "
+ System.out.println("In OperationTestMsgBean::onMessage() : "
+ recvMsg);
runTest(OperationTest.ON_MESSAGE);
@@ -64,7 +64,7 @@
public void setMessageDrivenContext(MessageDrivenContext mdc) {
System.out.println
("In OperationTestMsgBean::setMessageDrivenContext()!!");
- this.mdc = mdc;
+ this.mdc = mdc;
runTest(OperationTest.SET_CONTEXT);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties
index 69733bd..b06d416 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-mdb-singleton"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="glassfish-application.xml" value="descriptor/glassfish-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="glassfish-application-client.xml"
- value="descriptor/glassfish-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="glassfish-application-client.xml"\u0020
+ value="descriptor/glassfish-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml
index 1612c40..1f16636 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class, **/*IF.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*IF.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
index c918e9b..ca22dd6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
@@ -26,7 +26,7 @@
/**
* Tests for http://java.net/jira/browse/GLASSFISH-13004 (Support MDB singleton).
- * The test ejb jar is configured with property singleton-bean-pool=true in
+ * The test ejb jar is configured with property singleton-bean-pool=true in
* sun-ejb-jar.xml. This test client calls fooTest and doTest(...):
* fooTest: verify the stateless bean FooBean is single instance;
* doTest(..): verify the mdb MessageBean is single instance.
@@ -59,7 +59,7 @@
private static FooRemoteIF foo;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -68,7 +68,7 @@
public void doTest() {
try {
setup();
- doTest("jms/ejb_mdb_singleton_InQueue", numMessages);
+ doTest("jms/ejb_mdb_singleton_InQueue", numMessages);
fooTest();
stat.addStatus("singleton main", stat.PASS);
} catch(Throwable t) {
@@ -104,8 +104,8 @@
context = new InitialContext();
QueueConnectionFactory queueConFactory = (QueueConnectionFactory) context.lookup ("java:comp/env/FooCF");
queueCon = queueConFactory.createQueueConnection();
- queueSession = queueCon.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- queueSender = queueSession.createSender(null);
+ queueSession = queueCon.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ queueSender = queueSession.createSender(null);
queueCon.start();
}
@@ -119,20 +119,20 @@
}
}
- public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
+ public void sendMsgs(jakarta.jms.Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
- //System.out.println("Sending message " + i + " to " + queue +
+ //System.out.println("Sending message " + i + " to " + queue +
// " at time " + System.currentTimeMillis());
queueSender.send(queue, msg);
- // System.out.println("Sent message " + i + " to " + queue +
+ // System.out.println("Sent message " + i + " to " + queue +
// " at time " + System.currentTimeMillis());
}
}
public void doTest(String destName, int num) throws Exception {
Destination dest = (Destination) context.lookup(destName);
-
+
for(int i = 0; i < numOfCalls; i++) {
Message message = queueSession.createTextMessage(destName);
// Message message = topicSession.createTextMessage(destName);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties
index 8d4938d..d33ce9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-perf-local"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml
index a97e83a..373c08a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/**.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
index 46ada94..fadc629 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,32 +36,32 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-perf-localID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref =
+ // create EJB using factory from container
+ java.lang.Object objref =
ic.lookup("java:comp/env/ejb/PerformanceApp");
- System.out.println("Looked up home!!");
+ System.out.println("Looked up home!!");
- HelloHome home = (HelloHome)
+ HelloHome home = (HelloHome)
PortableRemoteObject.narrow(objref, HelloHome.class);
- System.out.println("Narrowed home!!");
+ System.out.println("Narrowed home!!");
- Hello hr = home.create();
- System.out.println("Got the EJB!!");
+ Hello hr = home.create();
+ System.out.println("Got the EJB!!");
- // invoke method on the EJB
- doPerfTest(hr, true);
+ // invoke method on the EJB
+ doPerfTest(hr, true);
doPerfTest(hr, false);
stat.addStatus("local main", stat.PASS);
@@ -70,66 +70,66 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
- private void doPerfTest(Hello hr, boolean local)
- throws Exception
+ private void doPerfTest(Hello hr, boolean local)
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL, local);
- runTests(Common.STATEFUL, hr, local);
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL, local);
+ runTests(Common.STATEFUL, hr, local);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL, local);
- runTests(Common.STATELESS, hr, local);
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL, local);
+ runTests(Common.STATELESS, hr, local);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
- hr.warmup(Common.BMP, local);
- runTests(Common.BMP, hr, local);
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ hr.warmup(Common.BMP, local);
+ runTests(Common.BMP, hr, local);
}
-
+
private void runTests(int type, Hello hr, boolean local)
- throws Exception
+ throws Exception
{
- System.out.println("Testing " + (local ? " Local " :
+ System.out.println("Testing " + (local ? " Local " :
" Collocated Remote ") +
"performance...");
if( local ) {
- System.out.println("notSupported : \t\t\t\t"
+ System.out.println("notSupported : \t\t\t\t"
+ hr.notSupported(type, true) + "\t\t" +
+ hr.notSupported(type, false) );
- System.out.println("supports : \t\t\t\t"
+ System.out.println("supports : \t\t\t\t"
+ hr.supports(type, true) + "\t\t" +
+ hr.supports(type, false) );
- System.out.println("required : \t\t\t\t"
+ System.out.println("required : \t\t\t\t"
+ hr.required(type, true) + "\t\t" +
+ hr.required(type, false) );
- System.out.println("requiresNew : \t\t\t\t"
+ System.out.println("requiresNew : \t\t\t\t"
+ hr.requiresNew(type, true) + "\t\t" +
+ hr.requiresNew(type, false) );
- System.out.println("mandatory : \t\t\t\t"
+ System.out.println("mandatory : \t\t\t\t"
+ hr.mandatory(type, true));
- System.out.println("never : \t\t\t\t\t\t"
+ System.out.println("never : \t\t\t\t\t\t"
+ hr.never(type, false) );
} else {
- System.out.println("notSupported : \t\t\t\t"
+ System.out.println("notSupported : \t\t\t\t"
+ hr.notSupportedRemote(type, true) + "\t\t" +
+ hr.notSupportedRemote(type, false) );
- System.out.println("supports : \t\t\t\t"
+ System.out.println("supports : \t\t\t\t"
+ hr.supportsRemote(type, true) + "\t\t" +
+ hr.supportsRemote(type, false) );
- System.out.println("required : \t\t\t\t"
+ System.out.println("required : \t\t\t\t"
+ hr.requiredRemote(type, true) + "\t\t" +
+ hr.requiredRemote(type, false) );
- System.out.println("requiresNew : \t\t\t\t"
+ System.out.println("requiresNew : \t\t\t\t"
+ hr.requiresNewRemote(type, true) + "\t\t" +
+ hr.requiresNewRemote(type, false) );
- System.out.println("mandatory : \t\t\t\t"
+ System.out.println("mandatory : \t\t\t\t"
+ hr.mandatoryRemote(type, true));
- System.out.println("never : \t\t\t\t\t\t"
+ System.out.println("never : \t\t\t\t\t\t"
+ hr.neverRemote(type, false) );
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
index cbc28cc..baabe4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
@@ -23,7 +23,7 @@
public BmpEJB(){}
public String ejbCreate(String s) {
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -41,10 +41,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -57,6 +57,6 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
index 5dec60c..76dbcb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
@@ -22,5 +22,5 @@
public interface BmpRemoteHome extends EJBHome
{
BmpRemote create(String s) throws RemoteException, CreateException;
- BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
+ BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
index 28b022a..fc8f13f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
@@ -46,10 +46,10 @@
public void ejbCreate() {
- try {
+ try {
System.out.println("Num iterations set to " + ITERATIONS);
Context ic = new InitialContext();
- SfulHome sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
+ SfulHome sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
sful = sfulHome.create();
@@ -57,19 +57,19 @@
sfulRemoteHome = (SfulRemoteHome)
PortableRemoteObject.narrow(obj, SfulRemoteHome.class);
sfulRemote = sfulRemoteHome.create();
- System.out.println("Created Stateful bean.");
+ System.out.println("Created Stateful bean.");
-
- SlessHome slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
+
+ SlessHome slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
sless = slessHome.create();
obj = ic.lookup("java:comp/env/ejb/SlessRemote");
slessRemoteHome = (SlessRemoteHome)
PortableRemoteObject.narrow(obj, SlessRemoteHome.class);
slessRemote = slessRemoteHome.create();
- System.out.println("Created Stateless bean.");
+ System.out.println("Created Stateless bean.");
- BmpHome bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
+ BmpHome bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
String pkey = "A BMP Bean";
bmp = bmpHome.create(pkey);
obj = ic.lookup("java:comp/env/ejb/BmpRemote");
@@ -77,14 +77,14 @@
PortableRemoteObject.narrow(obj, BmpRemoteHome.class);
bmpRemote = (BmpRemote)
bmpRemoteHome.findByPrimaryKey(pkey);
- System.out.println("Created BMP bean.");
-
- ut = context.getUserTransaction();
+ System.out.println("Created BMP bean.");
- } catch (Exception ex) {
- System.out.println("couldn't get sful bean");
- ex.printStackTrace();
- }
+ ut = context.getUserTransaction();
+
+ } catch (Exception ex) {
+ System.out.println("couldn't get sful bean");
+ ex.printStackTrace();
+ }
}
@@ -97,224 +97,224 @@
warmupRemote(type, false);
}
- // Measure looping and timing overhead
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- }
- long end = System.currentTimeMillis();
- overhead = end - begin;
+ // Measure looping and timing overhead
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ }
+ long end = System.currentTimeMillis();
+ overhead = end - begin;
}
private void warmupLocal(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- Common bean = preLocal(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ // get Hotspot warmed up
+ Common bean = preLocal(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
}
private void warmupRemote(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- CommonRemote bean = preRemote(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ // get Hotspot warmed up
+ CommonRemote bean = preRemote(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
}
- private Common preLocal(int type, boolean tx)
+ private Common preLocal(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- if ( type == Common.STATELESS )
- return sless;
- else if ( type == Common.STATEFUL )
- return sful;
- else
- return bmp;
+ if ( type == Common.STATELESS )
+ return sless;
+ else if ( type == Common.STATEFUL )
+ return sful;
+ else
+ return bmp;
}
- private CommonRemote preRemote(int type, boolean tx)
+ private CommonRemote preRemote(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- if ( type == Common.STATELESS )
- return slessRemote;
- else if ( type == Common.STATEFUL )
- return sfulRemote;
- else
- return bmpRemote;
+ if ( type == Common.STATELESS )
+ return slessRemote;
+ else if ( type == Common.STATEFUL )
+ return sfulRemote;
+ else
+ return bmpRemote;
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float never(int type, boolean tx)
+ public float never(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float requiresNewRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float notSupportedRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float requiredRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float mandatoryRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float neverRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float supportsRemote(int type, boolean tx) throws Exception
{
- CommonRemote bean = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ CommonRemote bean = preRemote(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public void setSessionContext(SessionContext sc) {
- context = sc;
+ context = sc;
}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
index bdb44b1..34cd506 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
index cf5b7d0..84e584a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java
index a89d369..e6c7b0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/Compare.java
@@ -28,7 +28,7 @@
File file1 = new File(file1Name);
File file2 = new File(file2Name);
-
+
float allResults = 0;
int totalResults = 0;
@@ -39,16 +39,16 @@
LineNumberReader reader2 = new LineNumberReader
(new FileReader(file2));
-
+
String nextLine1 = reader1.readLine();
while(nextLine1 != null) {
String nextLine2 = reader2.readLine();
-
- StringTokenizer tokenizer1 =
+
+ StringTokenizer tokenizer1 =
new StringTokenizer(nextLine1);
- StringTokenizer tokenizer2 =
- new StringTokenizer(nextLine2);
+ StringTokenizer tokenizer2 =
+ new StringTokenizer(nextLine2);
StringBuffer category = new StringBuffer();
boolean tx = true;
int numResults = 0;
@@ -82,7 +82,7 @@
nextLine1 = reader1.readLine();
System.out.println();
- }
+ }
System.out.println("total results = " + totalResults);
System.out.println("avg pcg dif = " + allResults / totalResults);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties
index 9390a51..ec2d015 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-perf-local2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml
index a780b75..e85c14f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/**.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,10 +63,10 @@
<param name="appclient.application.args" value="50000 10"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
index 3805e03..d5d20a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private int numIterations = 500000;
@@ -41,16 +41,16 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-perf-local2ID");
- }
-
+ }
+
public Client (String[] args) {
if (args.length > 0) {
numIterations = Integer.parseInt(args[0]);
numThreads = Integer.parseInt(args[1]);
}
-
+
}
-
+
public void doTest() {
try {
@@ -58,26 +58,26 @@
System.out.println("Num iterations set to " + numIterations);
System.out.println("Num threads set to " + numThreads);
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref =
+ // create EJB using factory from container
+ java.lang.Object objref =
ic.lookup("java:comp/env/ejb/PerformanceApp");
- System.out.println("Looked up home!!");
+ System.out.println("Looked up home!!");
- HelloHome home = (HelloHome)
+ HelloHome home = (HelloHome)
PortableRemoteObject.narrow(objref, HelloHome.class);
- System.out.println("Narrowed home!!");
+ System.out.println("Narrowed home!!");
hellos = new Hello[numThreads];
for(int i = 0; i < numThreads; i++) {
hellos[i] = home.create(numIterations);
}
- System.out.println("Got the EJB!!");
+ System.out.println("Got the EJB!!");
- // invoke method on the EJB
- doPerfTest();
+ // invoke method on the EJB
+ doPerfTest();
stat.addStatus("local2 main", stat.PASS);
@@ -85,61 +85,61 @@
e.printStackTrace();
stat.addStatus("local2 main" , stat.FAIL);
}
-
- return;
+
+ return;
}
- private void doPerfTest()
- throws Exception
+ private void doPerfTest()
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
hellos[0].warmup(Common.STATEFUL);
-
- runTests(Common.STATEFUL);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ runTests(Common.STATEFUL);
+
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
hellos[0].warmup(Common.STATELESS);
- runTests(Common.STATELESS);
+ runTests(Common.STATELESS);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
hellos[0].warmup(Common.BMP);
- runTests(Common.BMP);
+ runTests(Common.BMP);
}
-
+
private void runTests(int type)
- throws Exception
+ throws Exception
{
- System.out.println("car no tx : \t\t\t\t"
+ System.out.println("car no tx : \t\t\t\t"
+ runTest(type, InvokeType.CAR, false));
- System.out.println("notSupported : \t\t\t\t"
+ System.out.println("notSupported : \t\t\t\t"
+ runTest(type, InvokeType.NOT_SUPPORTED,
true) + "\t\t" +
+ runTest(type, InvokeType.NOT_SUPPORTED,
false));
- System.out.println("supports : \t\t\t\t"
+ System.out.println("supports : \t\t\t\t"
+ runTest(type, InvokeType.SUPPORTS, true) + "\t\t" +
+ runTest(type, InvokeType.SUPPORTS, false) );
- System.out.println("required : \t\t\t\t"
+ System.out.println("required : \t\t\t\t"
+ runTest(type, InvokeType.REQUIRED,true) + "\t\t" +
+ runTest(type, InvokeType.REQUIRED, false) );
- System.out.println("requiresNew : \t\t\t\t"
+ System.out.println("requiresNew : \t\t\t\t"
+ runTest(type, InvokeType.REQUIRES_NEW, true) + "\t\t" +
+ runTest(type, InvokeType.REQUIRES_NEW, false) );
- System.out.println("mandatory : \t\t\t\t"
+ System.out.println("mandatory : \t\t\t\t"
+ runTest(type, InvokeType.MANDATORY, true));
- System.out.println("never : \t\t\t\t\t\t"
+ System.out.println("never : \t\t\t\t\t\t"
+ runTest(type, InvokeType.NEVER, false) );
}
private float runTest(int type, InvokeType invokeType,
boolean tx) throws Exception {
-
+
InvokeThread[] threads = new InvokeThread[numThreads];
for(int i = 0; i < numThreads; i++) {
threads[i] = new InvokeThread(invokeType, type, hellos[i], tx);
@@ -157,7 +157,7 @@
}
return total / numThreads;
-
+
}
enum InvokeType {
@@ -192,50 +192,50 @@
try {
switch(invokeType) {
-
+
case CAR :
resultTime = invokeTarget.createAccessRemove
(invokeBeanType, invokeTx);
-
+
break;
-
+
case NOT_SUPPORTED :
resultTime = invokeTarget.notSupported
(invokeBeanType, invokeTx);
-
+
break;
-
+
case SUPPORTS :
resultTime = invokeTarget.supports
(invokeBeanType, invokeTx);
-
+
break;
-
+
case REQUIRED :
resultTime = invokeTarget.required
(invokeBeanType, invokeTx);
-
+
break;
-
-
+
+
case REQUIRES_NEW :
resultTime = invokeTarget.requiresNew
(invokeBeanType, invokeTx);
-
+
break;
-
-
+
+
case MANDATORY :
resultTime = invokeTarget.mandatory
(invokeBeanType, invokeTx);
-
+
break;
-
-
+
+
case NEVER :
resultTime = invokeTarget.never
(invokeBeanType, invokeTx);
-
+
break;
}
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
index 2183b29..5e80e0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
@@ -23,7 +23,7 @@
public BmpEJB(){}
public String ejbCreate(String s) {
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -41,10 +41,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -57,6 +57,6 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
index 993be3c..b731349 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
@@ -43,46 +43,46 @@
public void ejbCreate(int numIterations) {
- try {
+ try {
iterations = numIterations;
System.out.println("Num iterations set to " + iterations);
Context ic = new InitialContext();
- sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
+ sfulHome = (SfulHome) ic.lookup("java:comp/env/ejb/Sful");
sful = sfulHome.create();
- System.out.println("Created Stateful bean.");
+ System.out.println("Created Stateful bean.");
-
- slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
+
+ slessHome = (SlessHome) ic.lookup("java:comp/env/ejb/Sless");
sless = slessHome.create();
- System.out.println("Created Stateless bean.");
+ System.out.println("Created Stateless bean.");
- bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
-
+ bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
+
bmp = bmpHome.create(pkey);
- System.out.println("Created BMP bean.");
-
- ut = context.getUserTransaction();
+ System.out.println("Created BMP bean.");
- } catch (Exception ex) {
- System.out.println("couldn't get sful bean");
- ex.printStackTrace();
- }
+ ut = context.getUserTransaction();
+
+ } catch (Exception ex) {
+ System.out.println("couldn't get sful bean");
+ ex.printStackTrace();
+ }
}
- public float createAccessRemove(int type, boolean tx)
+ public float createAccessRemove(int type, boolean tx)
throws Exception {
- long begin = System.currentTimeMillis();
+ long begin = System.currentTimeMillis();
for ( int i=0; i<iterations; i++ ) {
Common bean = preLocal(type, tx, true);
bean.required();
bean.remove();
}
-
+
long end = System.currentTimeMillis();
return post(begin, end, false);
}
@@ -91,42 +91,42 @@
warmupLocal(type, true);
warmupLocal(type, false);
- // Measure looping and timing overhead
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- }
- long end = System.currentTimeMillis();
- overhead = end - begin;
+ // Measure looping and timing overhead
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ }
+ long end = System.currentTimeMillis();
+ overhead = end - begin;
}
private void warmupLocal(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- Common bean = preLocal(type, tx);
- for ( int i=0; i<iterations; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<iterations; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ // get Hotspot warmed up
+ Common bean = preLocal(type, tx);
+ for ( int i=0; i<iterations; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<iterations; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
}
- private Common preLocal(int type, boolean tx)
+ private Common preLocal(int type, boolean tx)
{
return preLocal(type, tx, false);
}
- private Common preLocal(int type, boolean tx, boolean createNew)
+ private Common preLocal(int type, boolean tx, boolean createNew)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {
ex.printStackTrace();
}
try {
@@ -144,82 +144,82 @@
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {
ex.printStackTrace();
}
- return (float)( ((double)(end-begin-overhead))/((double)iterations) * 1000.0 );
+ return (float)( ((double)(end-begin-overhead))/((double)iterations) * 1000.0 );
}
- public float requiresNew(int type, boolean tx)
+ public float requiresNew(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float notSupported(int type, boolean tx)
+ public float notSupported(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float required(int type, boolean tx)
+ public float required(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.required();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.required();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float mandatory(int type, boolean tx)
+ public float mandatory(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float never(int type, boolean tx)
+ public float never(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
- public float supports(int type, boolean tx)
+ public float supports(int type, boolean tx)
{
- Common bean = preLocal(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<iterations; i++ ) {
- bean.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ Common bean = preLocal(type, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<iterations; i++ ) {
+ bean.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public void setSessionContext(SessionContext sc) {
- context = sc;
+ context = sc;
}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
index 3648c86..8f267f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
index 92328cb..b8199d9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
@@ -34,10 +34,10 @@
public void setSessionContext(SessionContext sc)
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties
index 7db9a53..cb26779 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-perf-timer1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml
index 1a80cc0..f08e90d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1 1000"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
index f89ef88..343091b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
@@ -27,9 +27,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static @EJB TimerSession timerSession;
@@ -37,7 +37,7 @@
private static @Resource(mappedName="jms/ejb_perf_timer1_TQCF")
QueueConnectionFactory qcFactory;
- private static @Resource(mappedName="jms/ejb_perf_timer1_TQueue")
+ private static @Resource(mappedName="jms/ejb_perf_timer1_TQueue")
Queue queue;
public static void main(String args[]) {
@@ -56,30 +56,30 @@
public String doTest(int interval, int maxTimeouts) {
String result = kTestPassed;
- QueueConnection connection = null;
+ QueueConnection connection = null;
timerSession.createTimer(interval, maxTimeouts);
System.out.println("Creating periodic timer with interval of " +
interval + " milliseconds.");
System.out.println("Max timeouts = " + maxTimeouts);
-
+
try {
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueReceiver receiver = session.createReceiver(queue);
connection.start();
System.out.println("Waiting for message");
Message message = receiver.receive();
TextMessage textMsg = (TextMessage)message;
-
- if ( (message == null) ||
+
+ if ( (message == null) ||
(! textMsg.getText().equals("ejbTimeout() invoked")))
throw new Exception("Received a null message ... TimeOut failed!!");
System.out.println("Message : " + message);
-
-
+
+
stat.addStatus("timer1 ", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
index 1ae84cc..ee420e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
@@ -22,6 +22,6 @@
public interface TimerSession {
public void createTimer(int intervalInMillis, int numTimeouts);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
index b4b01d0..b31e31c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
@@ -37,7 +37,7 @@
private QueueConnection connection;
private QueueSession session;
-
+
@Resource(mappedName="jms/ejb_perf_timer1_TQueue")
private Queue queue;
@@ -58,7 +58,7 @@
public void ejbTimeout(Timer timer) {
timeoutCount++;
-
+
if( timeoutCount <= maxTimeouts ) {
return;
}
@@ -74,7 +74,7 @@
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
sender = session.createSender(queue);
@@ -96,7 +96,7 @@
} catch(Exception e) {
e.printStackTrace();
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/pom.xml b/appserver/tests/appserv-tests/devtests/ejb/pom.xml
index bb59501..cd7940c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.glassfish.main.tests</groupId>
<artifactId>tests</artifactId>
<packaging>pom</packaging>
- <name>GlassFish devtests ejb</name>
+ <name>GlassFish devtests ejb</name>
<modules>
<!-- module>quicklook</module -->
</modules>
@@ -44,13 +44,13 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
<version>1.8.0</version>
- <scope>system</scope>
- <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
- </dependency>
+ <scope>system</scope>
+ <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -58,8 +58,8 @@
<phase>test</phase>
<configuration>
<target name="antTests">
- <property name="testMods" value="all"/>
- <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
+ <property name="testMods" value="all"/>
+ <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
<ant antfile="build.xml" target="antTests"/>
</target>
</configuration>
@@ -72,7 +72,7 @@
<phase>clean</phase>
<configuration>
<target name="clean-result">
- <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
+ <property name="ant-contrib-path" value="${maven.dependency.ant-contrib.ant-contrib.jar.path}"/>
<ant antfile="build.xml" target="clean-result"/>
</target>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
index 5951e84..fc61efc 100755
--- a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
@@ -17,284 +17,284 @@
test_run_ejb(){
- rm -rf ${S1AS_HOME}/domains/domain1
- cd ${APS_HOME}
- echo "AS_ADMIN_PASSWORD=" > temppwd
- cat ${APS_HOME}/temppwd
+ rm -rf ${S1AS_HOME}/domains/domain1
+ cd ${APS_HOME}
+ echo "AS_ADMIN_PASSWORD=" > temppwd
+ cat ${APS_HOME}/temppwd
- ADMIN_PORT=45707
- JMS_PORT=45708
- JMX_PORT=45709
- ORB_PORT=45710
- SSL_PORT=45711
- INSTANCE_PORT=45712
- ALTERNATE_PORT=45713
- ORB_SSL_PORT=45714
- ORB_SSL_MUTUALAUTH_PORT=45715
- DB_PORT=45716
- DB_PORT_2=45717
+ ADMIN_PORT=45707
+ JMS_PORT=45708
+ JMX_PORT=45709
+ ORB_PORT=45710
+ SSL_PORT=45711
+ INSTANCE_PORT=45712
+ ALTERNATE_PORT=45713
+ ORB_SSL_PORT=45714
+ ORB_SSL_MUTUALAUTH_PORT=45715
+ DB_PORT=45716
+ DB_PORT_2=45717
- ${S1AS_HOME}/bin/asadmin \
- --user anonymous \
- --passwordfile ${APS_HOME}/temppwd \
- create-domain \
- --adminport ${ADMIN_PORT} \
- --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
- --instanceport ${INSTANCE_PORT} \
- domain1
+ ${S1AS_HOME}/bin/asadmin \
+ --user anonymous \
+ --passwordfile ${APS_HOME}/temppwd \
+ create-domain \
+ --adminport ${ADMIN_PORT} \
+ --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
+ --instanceport ${INSTANCE_PORT} \
+ domain1
- # Create
- echo "admin.domain=domain1
- admin.domain.dir=\${env.S1AS_HOME}/domains
- admin.port=${ADMIN_PORT}
- admin.user=anonymous
- admin.host=localhost
- http.port=${INSTANCE_PORT}
- https.port=${SSL_PORT}
- http.host=localhost
- http.address=127.0.0.1
- http.alternate.port=${ALTERNATE_PORT}
- orb.port=${ORB_PORT}
- admin.password=
- ssl.password=changeit
- master.password=changeit
- admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
- appserver.instance.name=server
- config.dottedname.prefix=server
- resources.dottedname.prefix=domain.resources
- results.mailhost=localhost
- results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
- results.mailee=yourname@sun.com
- autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
- precompilejsp=true
- jvm.maxpermsize=192m
- appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
+ # Create
+ echo "admin.domain=domain1
+ admin.domain.dir=\${env.S1AS_HOME}/domains
+ admin.port=${ADMIN_PORT}
+ admin.user=anonymous
+ admin.host=localhost
+ http.port=${INSTANCE_PORT}
+ https.port=${SSL_PORT}
+ http.host=localhost
+ http.address=127.0.0.1
+ http.alternate.port=${ALTERNATE_PORT}
+ orb.port=${ORB_PORT}
+ admin.password=
+ ssl.password=changeit
+ master.password=changeit
+ admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
+ appserver.instance.name=server
+ config.dottedname.prefix=server
+ resources.dottedname.prefix=domain.resources
+ results.mailhost=localhost
+ results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
+ results.mailee=yourname@sun.com
+ autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
+ precompilejsp=true
+ jvm.maxpermsize=192m
+ appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
- (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
+ (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
- cd ${S1AS_HOME}/domains/domain1/config/
- sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
- mv domain.xml.replaced domain.xml
- grep PortNumber domain.xml
+ cd ${S1AS_HOME}/domains/domain1/config/
+ sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
+ mv domain.xml.replaced domain.xml
+ grep PortNumber domain.xml
- cd ${APS_HOME}/config
- (rm derby.properties.replaced > /dev/null 2>&1) || true
- sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
- rm derby.properties
- sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
- cat derby.properties
- rm -rf ${APS_HOME}/test_results*
- cd ${APS_HOME}/devtests/ejb
- rm count.txt || true
+ cd ${APS_HOME}/config
+ (rm derby.properties.replaced > /dev/null 2>&1) || true
+ sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
+ rm derby.properties
+ sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
+ cat derby.properties
+ rm -rf ${APS_HOME}/test_results*
+ cd ${APS_HOME}/devtests/ejb
+ rm count.txt || true
- ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
+ ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
}
test_run_ejb_web(){
- rm -rf $S1AS_HOME/domains/domain1
+ rm -rf $S1AS_HOME/domains/domain1
- export ADMIN_PORT=45707 \
- JMS_PORT=45708 \
- JMX_PORT=45709 \
- ORB_PORT=45710 \
- SSL_PORT=45711 \
- INSTANCE_PORT=45712 \
- INSTANCE_HTTPS_PORT=45718 \
- INSTANCE_PORT_2=45719 \
- INSTANCE_PORT_3=45720 \
- ALTERNATE_PORT=45713 \
- ORB_SSL_PORT=45714 \
- ORB_SSL_MUTUALAUTH_PORT=45715 \
- DB_PORT=45716 \
- DB_PORT_2=45717
- env
+ export ADMIN_PORT=45707 \
+ JMS_PORT=45708 \
+ JMX_PORT=45709 \
+ ORB_PORT=45710 \
+ SSL_PORT=45711 \
+ INSTANCE_PORT=45712 \
+ INSTANCE_HTTPS_PORT=45718 \
+ INSTANCE_PORT_2=45719 \
+ INSTANCE_PORT_3=45720 \
+ ALTERNATE_PORT=45713 \
+ ORB_SSL_PORT=45714 \
+ ORB_SSL_MUTUALAUTH_PORT=45715 \
+ DB_PORT=45716 \
+ DB_PORT_2=45717
+ env
- cd ${APS_HOME}
+ cd ${APS_HOME}
- echo "AS_ADMIN_PASSWORD=" > temppwd
- cat ${APS_HOME}/temppwd
- ${S1AS_HOME}/bin/asadmin \
- --user anonymous \
- --passwordfile ${APS_HOME}/temppwd \
- create-domain \
- --adminport ${ADMIN_PORT} \
- --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
- --instanceport ${INSTANCE_PORT} \
- domain1
+ echo "AS_ADMIN_PASSWORD=" > temppwd
+ cat ${APS_HOME}/temppwd
+ ${S1AS_HOME}/bin/asadmin \
+ --user anonymous \
+ --passwordfile ${APS_HOME}/temppwd \
+ create-domain \
+ --adminport ${ADMIN_PORT} \
+ --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
+ --instanceport ${INSTANCE_PORT} \
+ domain1
- # Create
- echo "admin.domain=domain1
- admin.domain.dir=\${env.S1AS_HOME}/domains
- admin.port=${ADMIN_PORT}
- admin.user=anonymous
- admin.host=localhost
- http.port=${INSTANCE_PORT}
- https.port=${SSL_PORT}
- http.host=localhost
- http.address=127.0.0.1
- http.alternate.port=${ALTERNATE_PORT}
- orb.port=${ORB_PORT}
- admin.password=
- ssl.password=changeit
- master.password=changeit
- admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
- appserver.instance.name=server
- config.dottedname.prefix=server
- resources.dottedname.prefix=domain.resources
- results.mailhost=localhost
- results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
- results.mailee=yourname@sun.com
- autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
- precompilejsp=true
- jvm.maxpermsize=192m
- appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
+ # Create
+ echo "admin.domain=domain1
+ admin.domain.dir=\${env.S1AS_HOME}/domains
+ admin.port=${ADMIN_PORT}
+ admin.user=anonymous
+ admin.host=localhost
+ http.port=${INSTANCE_PORT}
+ https.port=${SSL_PORT}
+ http.host=localhost
+ http.address=127.0.0.1
+ http.alternate.port=${ALTERNATE_PORT}
+ orb.port=${ORB_PORT}
+ admin.password=
+ ssl.password=changeit
+ master.password=changeit
+ admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
+ appserver.instance.name=server
+ config.dottedname.prefix=server
+ resources.dottedname.prefix=domain.resources
+ results.mailhost=localhost
+ results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
+ results.mailee=yourname@sun.com
+ autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
+ precompilejsp=true
+ jvm.maxpermsize=192m
+ appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
- (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
+ (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
- cd ${S1AS_HOME}/domains/domain1/config/
- sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
- mv domain.xml.replaced domain.xml
- grep PortNumber domain.xml
+ cd ${S1AS_HOME}/domains/domain1/config/
+ sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
+ mv domain.xml.replaced domain.xml
+ grep PortNumber domain.xml
- cd ${APS_HOME}/config
- (rm derby.properties.replaced > /dev/null 2>&1) || true
- sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
- rm derby.properties
- sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
- cat derby.properties
- cd ${APS_HOME}/devtests/ejb
- rm count.txt || true
- ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
- cat ${S1AS_HOME}/databases/derby.log
- egrep 'DID NOT RUN= *0' count.txt || true
+ cd ${APS_HOME}/config
+ (rm derby.properties.replaced > /dev/null 2>&1) || true
+ sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
+ rm derby.properties
+ sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
+ cat derby.properties
+ cd ${APS_HOME}/devtests/ejb
+ rm count.txt || true
+ ant ${TARGET} report-result -Ddb.port=${DB_PORT} -Ddb.port.2=${DB_PORT_2} |tee $TEST_RUN_LOG
+ cat ${S1AS_HOME}/databases/derby.log
+ egrep 'DID NOT RUN= *0' count.txt || true
}
test_run_ejb_timer_cluster(){
- rm -rf ${S1AS_HOME}/domains/domain1
+ rm -rf ${S1AS_HOME}/domains/domain1
- export ADMIN_PORT=45707 \
- JMS_PORT=45708 \
- JMX_PORT=45709 \
- ORB_PORT=45710 \
- SSL_PORT=45711 \
- INSTANCE_PORT=45712 \
- INSTANCE_HTTP_PORT=45721 \
- INSTANCE_HTTPS_PORT=45718 \
- INSTANCE_PORT_2=45719 \
- INSTANCE_PORT_3=45720 \
- ALTERNATE_PORT=45713 \
- ORB_SSL_PORT=45714 \
- ORB_SSL_MUTUALAUTH_PORT=45715 \
- DB_PORT=45716 \
- DB_PORT_2=45717
- env
+ export ADMIN_PORT=45707 \
+ JMS_PORT=45708 \
+ JMX_PORT=45709 \
+ ORB_PORT=45710 \
+ SSL_PORT=45711 \
+ INSTANCE_PORT=45712 \
+ INSTANCE_HTTP_PORT=45721 \
+ INSTANCE_HTTPS_PORT=45718 \
+ INSTANCE_PORT_2=45719 \
+ INSTANCE_PORT_3=45720 \
+ ALTERNATE_PORT=45713 \
+ ORB_SSL_PORT=45714 \
+ ORB_SSL_MUTUALAUTH_PORT=45715 \
+ DB_PORT=45716 \
+ DB_PORT_2=45717
+ env
- cd ${APS_HOME}
+ cd ${APS_HOME}
- echo "AS_ADMIN_PASSWORD=" > temppwd
- cat ${APS_HOME}/temppwd
- ${S1AS_HOME}/bin/asadmin \
- --user anonymous \
- --passwordfile ${APS_HOME}/temppwd \
- create-domain \
- --adminport ${ADMIN_PORT} \
- --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
- --instanceport ${INSTANCE_PORT} \
- domain1
+ echo "AS_ADMIN_PASSWORD=" > temppwd
+ cat ${APS_HOME}/temppwd
+ ${S1AS_HOME}/bin/asadmin \
+ --user anonymous \
+ --passwordfile ${APS_HOME}/temppwd \
+ create-domain \
+ --adminport ${ADMIN_PORT} \
+ --domainproperties jms.port=${JMS_PORT}:domain.jmxPort=${JMX_PORT}:orb.listener.port=${ORB_PORT}:http.ssl.port=${SSL_PORT}:orb.ssl.port=${ORB_SSL_PORT}:orb.mutualauth.port=${ORB_SSL_MUTUALAUTH_PORT} \
+ --instanceport ${INSTANCE_PORT} \
+ domain1
- # Create
- echo "admin.domain=domain1
- admin.domain.dir=\${env.S1AS_HOME}/domains
- admin.port=${ADMIN_PORT}
- admin.user=anonymous
- admin.host=localhost
- http.port=${INSTANCE_PORT}
- https.port=${SSL_PORT}
- instance.http.port=${INSTANCE_HTTP_PORT}
- instance.https.port=${INSTANCE_HTTPS_PORT}
- http.host=localhost
- http.address=127.0.0.1
- http.alternate.port=${ALTERNATE_PORT}
- orb.port=${ORB_PORT}
- admin.password=
- ssl.password=changeit
- master.password=changeit
- admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
- appserver.instance.name=server
- config.dottedname.prefix=server
- resources.dottedname.prefix=domain.resources
- results.mailhost=localhost
- results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
- results.mailee=yourname@sun.com
- autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
- precompilejsp=true
- jvm.maxpermsize=192m
- appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
+ # Create
+ echo "admin.domain=domain1
+ admin.domain.dir=\${env.S1AS_HOME}/domains
+ admin.port=${ADMIN_PORT}
+ admin.user=anonymous
+ admin.host=localhost
+ http.port=${INSTANCE_PORT}
+ https.port=${SSL_PORT}
+ instance.http.port=${INSTANCE_HTTP_PORT}
+ instance.https.port=${INSTANCE_HTTPS_PORT}
+ http.host=localhost
+ http.address=127.0.0.1
+ http.alternate.port=${ALTERNATE_PORT}
+ orb.port=${ORB_PORT}
+ admin.password=
+ ssl.password=changeit
+ master.password=changeit
+ admin.password.file=\${env.APS_HOME}/config/adminpassword.txt
+ appserver.instance.name=server
+ config.dottedname.prefix=server
+ resources.dottedname.prefix=domain.resources
+ results.mailhost=localhost
+ results.mailer=QLTestsForPEInstallOrDASInEEInstall@sun.com
+ results.mailee=yourname@sun.com
+ autodeploy.dir=\${env.S1AS_HOME}/domains/\${admin.domain}/autodeploy
+ precompilejsp=true
+ jvm.maxpermsize=192m
+ appserver.instance.dir=\${admin.domain.dir}/\${admin.domain}" > config.properties
- (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
+ (jps |grep Main |cut -f1 -d" " | xargs kill -9 > /dev/null 2>&1) || true
- cd ${S1AS_HOME}/domains/domain1/config/
- sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
- mv domain.xml.replaced domain.xml
- grep PortNumber domain.xml
+ cd ${S1AS_HOME}/domains/domain1/config/
+ sed "s/1527/${DB_PORT}/g" domain.xml > domain.xml.replaced
+ mv domain.xml.replaced domain.xml
+ grep PortNumber domain.xml
- cd ${APS_HOME}/config
- (rm derby.properties.replaced > /dev/null 2>&1) || true
- sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
- rm derby.properties
- sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
- cat derby.properties
+ cd ${APS_HOME}/config
+ (rm derby.properties.replaced > /dev/null 2>&1) || true
+ sed "s/1527/${DB_PORT}/g" derby.properties > derby.properties.replaced
+ rm derby.properties
+ sed "s/1528/${DB_PORT_2}/g" derby.properties.replaced > derby.properties
+ cat derby.properties
- pushd ${APS_HOME}/devtests/ejb/ee/timer
+ pushd ${APS_HOME}/devtests/ejb/ee/timer
- ant ${TARGET} |tee ${TEST_RUN_LOG}
- antStatus=${?}
- ant dev-report
+ ant ${TARGET} |tee ${TEST_RUN_LOG}
+ antStatus=${?}
+ ant dev-report
}
get_test_target(){
- case $1 in
- ejb_all|ejb_timer_cluster_all )
- TARGET=all ;;
- ejb_web_all)
- TARGET=lite ;;
+ case $1 in
+ ejb_all|ejb_timer_cluster_all )
+ TARGET=all ;;
+ ejb_web_all)
+ TARGET=lite ;;
* )
TARGET=$1 ;;
- esac
- export TARGET
+ esac
+ export TARGET
}
run_test_id(){
- if [[ ${1} = "ejb_web_all" ]]; then
- unzip_test_resources ${WORKSPACE}/bundles/web.zip
- else
- unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
- fi
- dname=`pwd`
- cd `dirname ${0}`
- test_init
- get_test_target ${1}
- if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then
- test_run_ejb
- elif [[ ${1} = "ejb_timer_cluster_all" ]]; then
- test_run_ejb_timer_cluster
- elif [[ ${1} = "ejb_web_all" ]]; then
- test_run_ejb_web
- else
- echo "Invalid Test ID"
- exit 1
- fi
- check_successful_run
+ if [[ ${1} = "ejb_web_all" ]]; then
+ unzip_test_resources ${WORKSPACE}/bundles/web.zip
+ else
+ unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
+ fi
+ dname=`pwd`
+ cd `dirname ${0}`
+ test_init
+ get_test_target ${1}
+ if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then
+ test_run_ejb
+ elif [[ ${1} = "ejb_timer_cluster_all" ]]; then
+ test_run_ejb_timer_cluster
+ elif [[ ${1} = "ejb_web_all" ]]; then
+ test_run_ejb_web
+ else
+ echo "Invalid Test ID"
+ exit 1
+ fi
+ check_successful_run
generate_junit_report ${1}
change_junit_report_class_names
}
list_test_ids(){
- echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3
+ echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3
}
OPT=${1}
@@ -302,9 +302,9 @@
source `dirname ${0}`/../../../common_test.sh
case ${OPT} in
- list_test_ids )
- list_test_ids;;
- run_test_id )
- trap "copy_test_artifacts ${TEST_ID}" EXIT
- run_test_id ${TEST_ID} ;;
+ list_test_ids )
+ list_test_ids;;
+ run_test_id )
+ trap "copy_test_artifacts ${TEST_ID}" EXIT
+ run_test_id ${TEST_ID} ;;
esac
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml
index ec74550..974f667 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/build.xml
@@ -47,11 +47,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-sfsb tests)
- ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
- ant cacheNPE (Executes the ejb-sfsb-cacheNPE test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-sfsb tests)
+ ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
+ ant cacheNPE (Executes the ejb-sfsb-cacheNPE test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties
index a8845e4..6cad404 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-cacheNPE"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml
index 971f9c6..5fd9a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<!--
<antcall target="execute-ejb-sql-common">
@@ -71,7 +71,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -89,18 +89,18 @@
</antcall>
<antcall target="runclient-common"/>
</target>
-
-
+
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
index 7cf5e8e..5b6948d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private ArrayList sfsbList = new ArrayList();
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[cacheNPEClient] DONE doTest()...");
stat.printSummary("cacheNPE");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(0,4); //create SFSBs
+ initSFSBList(0,4); //create SFSBs
for( int j = 0; j < 400; j++) {
accessSFSB(0,3,5);
@@ -67,13 +67,13 @@
} catch (Exception ex ) {
System.out.println ( "Exception caught : " + ex );
ex.printStackTrace();
- }
+ }
removeSFSB(3);
removeSFSB(2);
accessSFSB(1,4,5);
- initSFSBList(5,20); //create SFSBs
+ initSFSBList(5,20); //create SFSBs
}
@@ -109,7 +109,7 @@
for (; i < MAXSFSBS; i=i+step) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = sfsb.getName();
-
+
boolean sessionCtxTest = sfsb.checkSessionContext();
boolean initialCtxTest = sfsb.checkInitialContext();
boolean entityHomeTest = sfsb.checkEntityHome();
@@ -120,11 +120,11 @@
boolean handleTest = sfsb.checkHandle();
boolean utTest = sfsb.checkUserTransaction();
- System.out.println("In accessSFSB: for bean -> " + sfsbName
+ System.out.println("In accessSFSB: for bean -> " + sfsbName
+ "; " + sessionCtxTest + "; " + initialCtxTest
+ "; " + entityHomeTest + "; " + entityLocalHomeTest
+ "; " + entityRemoteTest + "; " + entityLocalTest
- + "; " + homeHandleTest + "; " + handleTest
+ + "; " + homeHandleTest + "; " + handleTest
+ "; " + utTest);
passed = sessionCtxTest && initialCtxTest
@@ -136,7 +136,7 @@
break;
}
}
-
+
if (passed) {
stat.addStatus("ejbclient accessSFSBs", stat.PASS);
@@ -159,7 +159,7 @@
ex.printStackTrace();
stat.addStatus("ejbclient removeSFSBs", stat.FAIL);
return;
- }
+ }
stat.addStatus("ejbclient removeSFSBs", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
index f9de77c..42a41a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
@@ -23,35 +23,35 @@
extends EJBObject
{
- public String getName()
+ public String getName()
throws RemoteException;
- public String getMessage()
+ public String getMessage()
throws RemoteException;
public boolean checkSessionContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkInitialContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityRemoteRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHomeHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkUserTransaction()
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
index 10ce354..3c21b3f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private Context envCtx;
private Context envSubCtx;
@@ -64,7 +64,7 @@
homeHandle = entityHome.getHomeHandle();
handle = entityRemote.getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
lookup("java:comp/UserTransaction");
@@ -173,7 +173,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -205,7 +205,7 @@
}
if (ok) {
fieldName = "java:";
- ok = ( (javaCtx != null) &&
+ ok = ( (javaCtx != null) &&
javaCtx.getNameInNamespace().equals(fieldName) );
}
if (ok) {
@@ -217,7 +217,7 @@
fieldName = "java:comp/env";
ok = ( (envCtx != null) &&
envCtx.getNameInNamespace().equals(fieldName) );
-
+
}
if (ok) {
fieldName = "java:comp/env/ejb";
@@ -226,7 +226,7 @@
}
if (ok) {
fieldName = "env-entry";
-
+
String value1 = (String)
initialCtx.lookup("java:comp/env/TagValue");
String value2 = (String) envCtx.lookup("TagValue");
@@ -238,9 +238,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -268,7 +268,7 @@
public void ejbRemove() {
System.out.println ("\n\tIn SFSB.ejbRemove() for name -> " + sfsbName);
try {
- entityRemote.remove();
+ entityRemote.remove();
} catch (Exception ex) {
ex.printStackTrace();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
index 2a457eb..bb3fd4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
index b9a73d0..1251f92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (keyid, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT keyid from SimpleEntity where keyid = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,68 +125,68 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where keyid = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
System.out.println("[**SimpleEntityBean**] ejbRemove called for key = " + this.key);
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE keyid = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- System.out.println("[**SimpleEntityBean**] ejbRemove for key = "
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE keyid = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ System.out.println("[**SimpleEntityBean**] ejbRemove for key = "
+ this.key + " succeeded");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql
index b14c736..74b1686 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- keyid char(20) not null,
- name char(20)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ keyid char(20) not null,
+ name char(20)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties
index d741a6b..f84594d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-keepstate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml
index 4cd7f27..200d3ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
index 02d4cec..0e02d51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 40;
@@ -53,23 +53,23 @@
client.doTest();
System.out.println("[keepstateClient] DONE doTest()...");
stat.printSummary("keepstate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
- System.out.println("Waiting for 15 seconds before accessing...");
- for (int i=0; i<15; i++) {
- System.out.println("" + (15 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ initSFSBList(); //create SFSBs
+ System.out.println("Waiting for 15 seconds before accessing...");
+ for (int i=0; i<15; i++) {
+ System.out.println("" + (15 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -99,21 +99,21 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
+ String retrievedName = sfsb.getName();
+
boolean sessionCtxTest = sfsb.checkSessionContext();
boolean initialCtxTest = sfsb.checkInitialContext();
boolean entityHomeTest = sfsb.checkEntityHome();
@@ -123,33 +123,33 @@
boolean homeHandleTest = sfsb.checkHomeHandle();
boolean handleTest = sfsb.checkHandle();
boolean utTest = sfsb.checkUserTransaction();
- boolean activationTest = (sfsb.getActivationCount() != 0);
- boolean passivationTest = (sfsb.getPassivationCount() != 0);
+ boolean activationTest = (sfsb.getActivationCount() != 0);
+ boolean passivationTest = (sfsb.getPassivationCount() != 0);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
System.out.println("SFSB[" + i + "/" + MAX_SFSBS + "]: " + sessionCtxTest + "; " + initialCtxTest
+ "; " + entityHomeTest + "; " + entityLocalHomeTest
+ "; " + entityRemoteTest + "; " + entityLocalTest
- + "; " + homeHandleTest + "; " + handleTest
+ + "; " + homeHandleTest + "; " + handleTest
+ "; " + utTest
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = sessionCtxTest && initialCtxTest
&& entityHomeTest && entityLocalHomeTest
&& entityRemoteTest && entityLocalTest
&& homeHandleTest && handleTest && utTest
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
/*
if (! passed) {
break;
}
*/
- sfsb.sleepForSeconds(2);
+ sfsb.sleepForSeconds(2);
}
if (passed) {
@@ -163,44 +163,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -209,26 +209,26 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
- sfsb.remove();
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- }
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
+ sfsb.remove();
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml
index 478d449..1f0bbdd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/descriptor/sun-ejb-jar.xml
@@ -29,7 +29,7 @@
</ejb-ref>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
<ejb>
@@ -47,10 +47,10 @@
<res-ref-name>jdbc/DataSource</res-ref-name>
<jndi-name>jdbc/__default</jndi-name>
</resource-ref>
- <bean-pool>
- <steady-pool-size>4</steady-pool-size>
- <max-pool-size>17</max-pool-size>
- </bean-pool>
+ <bean-pool>
+ <steady-pool-size>4</steady-pool-size>
+ <max-pool-size>17</max-pool-size>
+ </bean-pool>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
index 5e697cd..32ca8ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
@@ -24,37 +24,37 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
- public void createSFSBChild()
- throws RemoteException;
+ public void createSFSBChild()
+ throws RemoteException;
public String getMessage()
- throws RemoteException;
+ throws RemoteException;
public boolean checkSessionContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkInitialContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityRemoteRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHomeHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkUserTransaction()
throws RemoteException;
@@ -63,17 +63,17 @@
throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
index 6f06dec..42f4fd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -51,7 +51,7 @@
private SimpleEntityLocalHome entityLocalHome;
private SimpleEntityLocal entityLocal;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -60,9 +60,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -75,10 +75,10 @@
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = entityHome.getHomeHandle();
handle = entityRemote.getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
lookup("java:comp/UserTransaction");
@@ -98,15 +98,15 @@
sfsbRemote = sfsbHome.create(sfsbName + " _child");
sfsbLocal = sfsbLocalHome.create(sfsbName + LOCAL_CHILD_SUFFIX);
} catch(Exception e) {
- EJBException ex = new EJBException(e.getMessage());
- ex.initCause(e);
+ EJBException ex = new EJBException(e.getMessage());
+ ex.initCause(e);
throw ex;
}
}
public boolean checkSFSBChild() {
String childName = sfsbLocal.getName();
- boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
+ boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
return status;
}
@@ -203,7 +203,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -235,7 +235,7 @@
}
if (ok) {
fieldName = "java:";
- ok = ( (javaCtx != null) &&
+ ok = ( (javaCtx != null) &&
javaCtx.getNameInNamespace().equals(fieldName) );
}
if (ok) {
@@ -247,7 +247,7 @@
fieldName = "java:comp/env";
ok = ( (envCtx != null) &&
envCtx.getNameInNamespace().equals(fieldName) );
-
+
}
if (ok) {
fieldName = "java:comp/env/ejb";
@@ -256,7 +256,7 @@
}
if (ok) {
fieldName = "env-entry";
-
+
String value1 = (String)
initialCtx.lookup("java:comp/env/TagValue");
String value2 = (String) envCtx.lookup("TagValue");
@@ -268,9 +268,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -279,22 +279,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
index fa34638..a40e68d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
index 76ce881..8defae6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
index 0502a12..477c836 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
index 4e5612c..841378b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (keyid, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT keyid from SimpleEntity where keyid = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,65 +125,65 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where keyid = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE keyid = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE keyid = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties
index d708719..41387ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-lifecycle"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml
index 9a14c5a..746ba95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
index 4f182ae..9ee7706 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
@@ -33,8 +33,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 24;
@@ -52,15 +52,15 @@
client.doTest();
System.out.println("[lfTraditional] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -90,47 +90,47 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
try {
- SFSB sfsb = (SFSB) sfsbList.get(i);
+ SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
- boolean ok = sfsb.isOK(sfsbName);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ String retrievedName = sfsb.getName();
- boolean activationTest = (actCount != 0);
- boolean passivationTest = (pasCount != 0);
+ boolean ok = sfsb.isOK(sfsbName);
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
+
+ boolean activationTest = (actCount != 0);
+ boolean passivationTest = (pasCount != 0);
System.out.println("Bean[" + i + "/" + MAX_SFSBS + "] name: " + sfsbName
- + "; retrievedName: " + retrievedName
- + "; ok: " + ok
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; retrievedName: " + retrievedName
+ + "; ok: " + ok
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = passed & sfsbName.equals(retrievedName)
&& ok
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
if (! passed) {
//break;
}
- sfsb.sleepForSeconds(1);
- } catch (Exception ex) {
- System.out.println("Bean[" + i + "] Got exception: " + ex);
- }
+ sfsb.sleepForSeconds(1);
+ } catch (Exception ex) {
+ System.out.println("Bean[" + i + "] Got exception: " + ex);
+ }
}
if (passed) {
@@ -144,44 +144,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -190,28 +190,28 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
- sfsb.remove();
- Exception excep = null;
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- excep = ex;
- }
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
+ sfsb.remove();
+ Exception excep = null;
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ excep = ex;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml
index 9ecf001..3f6e1a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_sfsb_lifecycle_SFSB</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
index 9a11488..2bf9fff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
@@ -24,23 +24,23 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public boolean isOK(String name)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
index 838a5af..8e86033 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
@@ -32,7 +32,7 @@
@CallbackListener("com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.LifecycleListener")
@Stateful
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private Context envCtx;
@@ -48,7 +48,7 @@
private String sfsbName;
private String envEntryTagValue;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -57,9 +57,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -68,13 +68,13 @@
try {
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = sfsbHome.getHomeHandle();
handle = sessionCtx.getEJBObject().getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
- lookup("java:comp/UserTransaction");
+ lookup("java:comp/UserTransaction");
} catch (Exception ex) {
ex.printStackTrace();
//TODO
@@ -133,7 +133,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -184,9 +184,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -195,22 +195,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
@@ -232,7 +232,7 @@
public void ejbRemove() {}
public void ejbActivate() {
- throw new EJBException("Container called ejbActivate?????");
+ throw new EJBException("Container called ejbActivate?????");
}
void postActivate() {
@@ -240,7 +240,7 @@
}
public void ejbPassivate() {
- throw new EJBException("Container called ejbPassivate?????");
+ throw new EJBException("Container called ejbPassivate?????");
}
@PrePassivate
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
index 87715be..b2340b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
index b88dc2d..4150ba7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql
index 1ad6187..59bf79e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- keyid char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ keyid char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties
index 2a6b8a4..9e961fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-passivateactivate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml
index 2f868ca..d3a6767 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
index 8c22956..3b3f5c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
@@ -33,8 +33,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 40;
@@ -52,15 +52,15 @@
client.doTest();
System.out.println("[passivateactivateClient] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -90,21 +90,21 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
+ String retrievedName = sfsb.getName();
+
boolean sessionCtxTest = sfsb.checkSessionContext();
boolean initialCtxTest = sfsb.checkInitialContext();
boolean entityHomeTest = sfsb.checkEntityHome();
@@ -114,32 +114,32 @@
boolean homeHandleTest = sfsb.checkHomeHandle();
boolean handleTest = sfsb.checkHandle();
boolean utTest = sfsb.checkUserTransaction();
- boolean activationTest = (sfsb.getActivationCount() != 0);
- boolean passivationTest = (sfsb.getPassivationCount() != 0);
+ boolean activationTest = (sfsb.getActivationCount() != 0);
+ boolean passivationTest = (sfsb.getPassivationCount() != 0);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
System.out.println(sessionCtxTest + "; " + initialCtxTest
+ "; " + entityHomeTest + "; " + entityLocalHomeTest
+ "; " + entityRemoteTest + "; " + entityLocalTest
- + "; " + homeHandleTest + "; " + handleTest
+ + "; " + homeHandleTest + "; " + handleTest
+ "; " + utTest
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = sessionCtxTest && initialCtxTest
&& entityHomeTest && entityLocalHomeTest
&& entityRemoteTest && entityLocalTest
&& homeHandleTest && handleTest && utTest
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
if (! passed) {
break;
}
- sfsb.sleepForSeconds(2);
+ sfsb.sleepForSeconds(2);
}
if (passed) {
@@ -153,44 +153,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -199,33 +199,33 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
// Test BMT SFSB remove called in a transaction
- jakarta.transaction.UserTransaction ut = (jakarta.transaction.UserTransaction)
+ jakarta.transaction.UserTransaction ut = (jakarta.transaction.UserTransaction)
(new InitialContext()).lookup("java:comp/UserTransaction");
ut.begin();
- sfsb.remove();
+ sfsb.remove();
ut.commit();
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- }
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
System.err.println("======> FAIL because: nameOK: " + nameOK + " gotException: " + gotException);
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml
index 31c971b..c29af31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/descriptor/sun-ejb-jar.xml
@@ -29,7 +29,7 @@
</ejb-ref>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
<ejb>
@@ -47,10 +47,10 @@
<res-ref-name>jdbc/DataSource</res-ref-name>
<jndi-name>jdbc/__default</jndi-name>
</resource-ref>
- <bean-pool>
- <steady-pool-size>4</steady-pool-size>
- <max-pool-size>17</max-pool-size>
- </bean-pool>
+ <bean-pool>
+ <steady-pool-size>4</steady-pool-size>
+ <max-pool-size>17</max-pool-size>
+ </bean-pool>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
index 2b4a211..d602aca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
@@ -24,37 +24,37 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
- public void createSFSBChild()
- throws RemoteException;
+ public void createSFSBChild()
+ throws RemoteException;
public String getMessage()
- throws RemoteException;
+ throws RemoteException;
public boolean checkSessionContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkInitialContext()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalHome()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityRemoteRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkEntityLocalRef()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHomeHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkHandle()
- throws RemoteException;
+ throws RemoteException;
public boolean checkUserTransaction()
throws RemoteException;
@@ -63,17 +63,17 @@
throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
index df1a46d..d87ed81 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private static final String LOCAL_CHILD_SUFFIX = "_childLocal";
@@ -51,7 +51,7 @@
private SimpleEntityLocalHome entityLocalHome;
private SimpleEntityLocal entityLocal;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -60,9 +60,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -75,10 +75,10 @@
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = entityHome.getHomeHandle();
handle = entityRemote.getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
lookup("java:comp/UserTransaction");
@@ -98,15 +98,15 @@
sfsbRemote = sfsbHome.create(sfsbName + " _child");
sfsbLocal = sfsbLocalHome.create(sfsbName + LOCAL_CHILD_SUFFIX);
} catch(Exception e) {
- EJBException ex = new EJBException(e.getMessage());
- ex.initCause(e);
+ EJBException ex = new EJBException(e.getMessage());
+ ex.initCause(e);
throw ex;
}
}
public boolean checkSFSBChild() {
String childName = sfsbLocal.getName();
- boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
+ boolean status = childName.equals(sfsbName + LOCAL_CHILD_SUFFIX);
return status;
}
@@ -203,7 +203,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -235,7 +235,7 @@
}
if (ok) {
fieldName = "java:";
- ok = ( (javaCtx != null) &&
+ ok = ( (javaCtx != null) &&
javaCtx.getNameInNamespace().equals(fieldName) );
}
if (ok) {
@@ -247,7 +247,7 @@
fieldName = "java:comp/env";
ok = ( (envCtx != null) &&
envCtx.getNameInNamespace().equals(fieldName) );
-
+
}
if (ok) {
fieldName = "java:comp/env/ejb";
@@ -256,7 +256,7 @@
}
if (ok) {
fieldName = "env-entry";
-
+
String value1 = (String)
initialCtx.lookup("java:comp/env/TagValue");
String value2 = (String) envCtx.lookup("TagValue");
@@ -268,9 +268,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -279,22 +279,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
index 4c636b3..4ea2ead 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
index b54aca7..ac8a749 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
index c91cb9d..4afb68a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
index c9e4eca..70bd692 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (keyid, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT keyid from SimpleEntity where keyid = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,65 +125,65 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where keyid = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE keyid = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE keyid = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE keyid = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties
index d708719..41387ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-lifecycle"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml
index 9a14c5a..746ba95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,17 +81,17 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
index 6c1c63a..058bc78 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 24;
@@ -53,15 +53,15 @@
client.doTest();
System.out.println("[lfTraditional] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
- removeTest();
+ removeTest();
}
private void initSFSBList() {
@@ -91,47 +91,47 @@
public void accessSFSB() {
try {
- System.out.println("Waiting for 10 seconds before accessing...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ System.out.println("Waiting for 10 seconds before accessing...");
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
boolean passed = true;
for (int i=0; i < MAX_SFSBS; i++) {
try {
- SFSB sfsb = (SFSB) sfsbList.get(i);
+ SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
- String retrievedName = sfsb.getName();
-
- boolean ok = sfsb.isOK(sfsbName);
- int actCount = sfsb.getActivationCount();
- int pasCount = sfsb.getPassivationCount();
+ String retrievedName = sfsb.getName();
- boolean activationTest = (actCount != 0);
- boolean passivationTest = (pasCount != 0);
+ boolean ok = sfsb.isOK(sfsbName);
+ int actCount = sfsb.getActivationCount();
+ int pasCount = sfsb.getPassivationCount();
+
+ boolean activationTest = (actCount != 0);
+ boolean passivationTest = (pasCount != 0);
System.out.println("Bean[" + i + "/" + MAX_SFSBS + "] name: " + sfsbName
- + "; retrievedName: " + retrievedName
- + "; ok: " + ok
- + "; " + activationTest + " (" + actCount + ")"
- + "; " + passivationTest + " (" + pasCount + ")"
- );
+ + "; retrievedName: " + retrievedName
+ + "; ok: " + ok
+ + "; " + activationTest + " (" + actCount + ")"
+ + "; " + passivationTest + " (" + pasCount + ")"
+ );
passed = passed & sfsbName.equals(retrievedName)
&& ok
- && activationTest && passivationTest;
+ && activationTest && passivationTest;
if (! passed) {
//break;
}
- sfsb.sleepForSeconds(1);
- } catch (Exception ex) {
- System.out.println("Bean[" + i + "] Got exception: " + ex);
- }
+ sfsb.sleepForSeconds(1);
+ } catch (Exception ex) {
+ System.out.println("Bean[" + i + "] Got exception: " + ex);
+ }
}
if (passed) {
@@ -145,44 +145,44 @@
String sfsbName = _sfsbPrefix+i;
sfsb.makeStateNonSerializable();
- }
+ }
- //Creating these many SFSBs should force passivation of the above
- // non-serializable beans
+ //Creating these many SFSBs should force passivation of the above
+ // non-serializable beans
for (int i=0; i < MAX_SFSBS; i++) {
- home.create(_sfsbPrefix + (i+1)*1000);
- }
+ home.create(_sfsbPrefix + (i+1)*1000);
+ }
- System.out.println("Waiting for 10 seconds for passivation to complete...");
+ System.out.println("Waiting for 10 seconds for passivation to complete...");
- for (int i=0; i<10; i++) {
- System.out.println("" + (10 - i) + " seconds left...");
- try {
- Thread.currentThread().sleep(1*1000);
- } catch (Exception ex) {
- }
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("" + (10 - i) + " seconds left...");
+ try {
+ Thread.currentThread().sleep(1*1000);
+ } catch (Exception ex) {
+ }
+ }
for (int i=0; i < MAX_SFSBS; i++) {
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = _sfsbPrefix+i;
try {
- System.out.print("Expecting exception for: " + sfsbName);
- String nm = sfsb.getName();
- System.out.println("ERROR. Didn't get expected exception. "
- + "Got: " + nm);
- passed = false;
- break;
- } catch (Exception ex) {
- System.out.println("[**Got Exception**]");
- }
- }
- if (passed) {
- stat.addStatus("ejbclient non-serializable-state", stat.PASS);
- } else {
- stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
- }
+ System.out.print("Expecting exception for: " + sfsbName);
+ String nm = sfsb.getName();
+ System.out.println("ERROR. Didn't get expected exception. "
+ + "Got: " + nm);
+ passed = false;
+ break;
+ } catch (Exception ex) {
+ System.out.println("[**Got Exception**]");
+ }
+ }
+ if (passed) {
+ stat.addStatus("ejbclient non-serializable-state", stat.PASS);
+ } else {
+ stat.addStatus("ejbclient non-serializable-state", stat.FAIL);
+ }
} catch (Exception ex) {
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
@@ -191,29 +191,29 @@
public void removeTest() {
- SFSB sfsb = null;
- try {
- String myName = "_2_" + _sfsbPrefix + "_2_";
- sfsb = (SFSB) home.create(myName);
- String retrievedName = sfsb.getName();
- boolean nameOK = myName.equalsIgnoreCase(retrievedName);
- boolean gotException = false;
- sfsb.remove();
- Exception excep = null;
- try {
- sfsb.getName();
- gotException = false; //Expecting an exception
- } catch (Exception ex) {
- gotException = true;
- excep = ex;
- }
+ SFSB sfsb = null;
+ try {
+ String myName = "_2_" + _sfsbPrefix + "_2_";
+ sfsb = (SFSB) home.create(myName);
+ String retrievedName = sfsb.getName();
+ boolean nameOK = myName.equalsIgnoreCase(retrievedName);
+ boolean gotException = false;
+ sfsb.remove();
+ Exception excep = null;
+ try {
+ sfsb.getName();
+ gotException = false; //Expecting an exception
+ } catch (Exception ex) {
+ gotException = true;
+ excep = ex;
+ }
- String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
+ String resultStr = "(" + nameOK + " @@@ " + gotException + ")";
if (nameOK && gotException) {
stat.addStatus("ejbclient removeTest " + resultStr, stat.PASS);
} else {
System.err.println("======> FAIL 2 because: nameOK: " + nameOK + " gotException: " + gotException);
- stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
+ stat.addStatus("ejbclient removeTest " + resultStr, stat.FAIL);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml
index 9ecf001..3f6e1a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/descriptor/sun-ejb-jar.xml
@@ -25,7 +25,7 @@
<jndi-name>ejb/ejb_sfsb_lifecycle_SFSB</jndi-name>
<bean-cache>
<max-cache-size>8</max-cache-size>
- <resize-quantity>4</resize-quantity>
+ <resize-quantity>4</resize-quantity>
</bean-cache>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
index 9a11488..2bf9fff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
@@ -24,23 +24,23 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public int getActivationCount()
- throws RemoteException;
+ throws RemoteException;
public int getPassivationCount()
- throws RemoteException;
+ throws RemoteException;
public void makeStateNonSerializable()
- throws RemoteException;
+ throws RemoteException;
public void sleepForSeconds(int sec)
- throws RemoteException;
+ throws RemoteException;
public boolean isOK(String name)
- throws RemoteException;
+ throws RemoteException;
public void unusedMethod()
- throws RemoteException;
+ throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
index 838a5af..8e86033 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
@@ -32,7 +32,7 @@
@CallbackListener("com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.LifecycleListener")
@Stateful
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
private Context envCtx;
@@ -48,7 +48,7 @@
private String sfsbName;
private String envEntryTagValue;
private SFSBHome sfsbHome;
- private SFSB sfsbRemote;
+ private SFSB sfsbRemote;
private SFSBLocalHome sfsbLocalHome;
private SFSBLocal sfsbLocal;
@@ -57,9 +57,9 @@
private UserTransaction userTransaction1;
private UserTransaction userTransaction2;
- private int activationCount;
- private int passivationCount;
- private Object nonSerializableState;
+ private int activationCount;
+ private int passivationCount;
+ private Object nonSerializableState;
public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
@@ -68,13 +68,13 @@
try {
sfsbHome = (SFSBHome) sessionCtx.getEJBHome();
sfsbLocalHome = (SFSBLocalHome) sessionCtx.getEJBLocalHome();
-
+
homeHandle = sfsbHome.getHomeHandle();
handle = sessionCtx.getEJBObject().getHandle();
-
+
userTransaction1 = sessionCtx.getUserTransaction();
userTransaction2 = (UserTransaction) new InitialContext().
- lookup("java:comp/UserTransaction");
+ lookup("java:comp/UserTransaction");
} catch (Exception ex) {
ex.printStackTrace();
//TODO
@@ -133,7 +133,7 @@
public boolean checkUserTransaction() {
boolean status =
((userTransaction1 != null) && (userTransaction2 != null));
-
+
try {
if( status ) {
userTransaction1.begin();
@@ -184,9 +184,9 @@
ex.printStackTrace();
ok = false;
}
-
+
this.message = (ok) ? null : (fieldName + " not restored properly");
-
+
return ok;
}
@@ -195,22 +195,22 @@
}
public int getActivationCount() {
- return this.activationCount;
+ return this.activationCount;
}
public int getPassivationCount() {
- return this.passivationCount;
+ return this.passivationCount;
}
public void makeStateNonSerializable() {
- nonSerializableState = new Object();
+ nonSerializableState = new Object();
}
public void sleepForSeconds(int sec) {
- try {
- Thread.currentThread().sleep(sec * 1000);
- } catch (Exception ex) {
- }
+ try {
+ Thread.currentThread().sleep(sec * 1000);
+ } catch (Exception ex) {
+ }
}
public void unusedMethod() {
@@ -232,7 +232,7 @@
public void ejbRemove() {}
public void ejbActivate() {
- throw new EJBException("Container called ejbActivate?????");
+ throw new EJBException("Container called ejbActivate?????");
}
void postActivate() {
@@ -240,7 +240,7 @@
}
public void ejbPassivate() {
- throw new EJBException("Container called ejbPassivate?????");
+ throw new EJBException("Container called ejbPassivate?????");
}
@PrePassivate
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
index 87715be..b2340b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
@@ -21,5 +21,5 @@
public interface SFSBLocal
extends EJBLocalObject
{
- public String getName();
+ public String getName();
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
index b88dc2d..4150ba7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
@@ -22,6 +22,6 @@
public interface SFSBLocalHome
extends EJBLocalHome
{
- public SFSBLocal create(String sfsbName)
+ public SFSBLocal create(String sfsbName)
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql
index 66c4b12..83fb28c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- key char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ key char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql
index 1ad6187..59bf79e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table SimpleEntity;
-
-CREATE TABLE SimpleEntity (
- keyid char(128) not null,
- name char(128)
-);
-
+Drop table SimpleEntity;
+
+CREATE TABLE SimpleEntity (
+ keyid char(128) not null,
+ name char(128)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql
index 935c4a6..3f21aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table SimpleEntity;
+Drop table SimpleEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties
index 1208446..983a545 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-sfsb-stress"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="loadgenerator.client" value="com.sun.s1asdev.ejb.sfsb.stress.client.LoadGenerator"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
index 84132d0..cede30f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*Load*.class **/*SFSB*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="build,init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,7 +69,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -81,13 +81,13 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="runloadgenerator">
<java fork="true" failonerror="true"
@@ -97,7 +97,7 @@
<arg value="ejb/ejb_sfsb_stress_StressSFSBHome"/>
<arg value="${ictx.props}"/>
</java>
- </target>
+ </target>
<target name="run_cosnaming" depends="init-common">
<antcall target="runloadgenerator">
@@ -108,7 +108,7 @@
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
index d61571b..e1fcf92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 40;
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[stressClient] DONE doTest()...");
stat.printSummary("stress");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
}
@@ -92,7 +92,7 @@
for (int i=0; i < MAX_SFSBS; i++) {
StressSFSB sfsb = (StressSFSB) sfsbList.get(i);
String sfsbName = "SFSB_"+i;
-
+
passed = sfsb.doWork((long) 2000);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
index 725d2c4..df25671 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
@@ -28,27 +28,27 @@
public class LoadGenerator {
private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
- private static String propsFileName =
- "/export/home/s1as/cts/ws/appserv-tests/devtests/ejb/sfsb/stress/client/jndi.properties";
+ new SimpleReporterAdapter("appserv-tests");
+ private static String propsFileName =
+ "/export/home/s1as/cts/ws/appserv-tests/devtests/ejb/sfsb/stress/client/jndi.properties";
private Context ctx;
private StressSFSBHome home;
public LoadGenerator(String[] args)
- throws Exception
+ throws Exception
{
- String jndiName = args[0];
- ctx = getContext(args[1]);
+ String jndiName = args[0];
+ ctx = getContext(args[1]);
- Object ref = ctx.lookup(jndiName);
- this.home = (StressSFSBHome)
- PortableRemoteObject.narrow(ref, StressSFSBHome.class);
- System.out.println("LoadGenerator got home: " + home.getClass());
+ Object ref = ctx.lookup(jndiName);
+ this.home = (StressSFSBHome)
+ PortableRemoteObject.narrow(ref, StressSFSBHome.class);
+ System.out.println("LoadGenerator got home: " + home.getClass());
}
private InitialContext getContext(String propsFileName)
- throws Exception
+ throws Exception
{
InitialContext ic;
@@ -66,21 +66,21 @@
public void doTest() {
- for (int i=0; i<10; i++) {
- System.out.println("Creating StressSFSBClient[" + i + "]");
- String clientName = "client-"+i;
- StressSFSBClient client = new StressSFSBClient(clientName,
- home, 10);
- }
+ for (int i=0; i<10; i++) {
+ System.out.println("Creating StressSFSBClient[" + i + "]");
+ String clientName = "client-"+i;
+ StressSFSBClient client = new StressSFSBClient(clientName,
+ home, 10);
+ }
}
public static void main(String[] args) {
try {
- stat.addDescription("ejb-sfsb-stress");
- LoadGenerator generator = new LoadGenerator(args);
- generator.doTest();
- stat.addStatus("ejb-sfsb-stress main", stat.PASS);
+ stat.addDescription("ejb-sfsb-stress");
+ LoadGenerator generator = new LoadGenerator(args);
+ generator.doTest();
+ stat.addStatus("ejb-sfsb-stress main", stat.PASS);
} catch(Exception e) {
e.printStackTrace();
stat.addStatus("ejb-sfsb-stress main", stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
index c635849..bbfa5d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
@@ -33,41 +33,41 @@
implements Runnable
{
- String name;
+ String name;
StressSFSBHome home;
- ArrayList list;
- int maxActiveCount;
- boolean success = true;
- int maxIter = 5;
- Thread thread;
+ ArrayList list;
+ int maxActiveCount;
+ boolean success = true;
+ int maxIter = 5;
+ Thread thread;
public StressSFSBClient(String name,
- StressSFSBHome home, int maxActiveCount)
+ StressSFSBHome home, int maxActiveCount)
{
- thread = new Thread(this, name);
- this.name = name;
- this.home = home;
- this.maxActiveCount = maxActiveCount;
- this.list = new ArrayList(maxActiveCount);
- thread.start();
+ thread = new Thread(this, name);
+ this.name = name;
+ this.home = home;
+ this.maxActiveCount = maxActiveCount;
+ this.list = new ArrayList(maxActiveCount);
+ thread.start();
}
public void run() {
- System.out.println("StressSFSBClient: " + name + " started....");
- try {
- for (int i=0; i<maxActiveCount; i++) {
- list.add(home.create(name+"-"+i));
- }
- for (int count = 0; count < maxIter; count++) {
- for (int i=0; i<maxActiveCount; i++) {
- StressSFSB sfsb = (StressSFSB) list.get(i);
- sfsb.ping();
- }
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- success = false;
- }
+ System.out.println("StressSFSBClient: " + name + " started....");
+ try {
+ for (int i=0; i<maxActiveCount; i++) {
+ list.add(home.create(name+"-"+i));
+ }
+ for (int count = 0; count < maxIter; count++) {
+ for (int i=0; i<maxActiveCount; i++) {
+ StressSFSB sfsb = (StressSFSB) list.get(i);
+ sfsb.ping();
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ success = false;
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
index fa62bbf..d2dca4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
@@ -24,7 +24,7 @@
{
public String getName()
- throws RemoteException;
+ throws RemoteException;
public boolean hasSameName(String name)
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
index 63d8721..4679e33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
@@ -30,7 +30,7 @@
import java.rmi.RemoteException;
public class StressSFSBBean
- implements SessionBean
+ implements SessionBean
{
private SessionContext sessionCtx;
private Context initialCtx;
@@ -52,7 +52,7 @@
}
public boolean doWork(long millis) {
- return true;
+ return true;
}
public void setSessionContext(SessionContext sc) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
index 758c2aa..1ff92cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
@@ -24,5 +24,5 @@
extends EJBHome
{
public StressSFSB create(String sfsbName)
- throws CreateException, RemoteException;
+ throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql
index 8504c3e..58342d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table StressEntity;
-
-CREATE TABLE StressEntity (
- key char(20) not null,
- name char(20)
-);
-
+Drop table StressEntity;
+
+CREATE TABLE StressEntity (
+ key char(20) not null,
+ name char(20)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql
index ea05487..2a1817a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table StressEntity;
+Drop table StressEntity;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml
index 4d4752d..2e051bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/build.xml
@@ -37,11 +37,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-sfsb tests)
- ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
- ant sfsbcache (Executes the ejb-sfsb-sfsbcache test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-sfsb tests)
+ ant passivateactivate (Executes the ejb-sfsb-passivateactivate test)
+ ant sfsbcache (Executes the ejb-sfsb-sfsbcache test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties
index 60ceea1..38df6ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stress-passivateactivate"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml
index aaeea60..105470f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
index 2ce8a0b..4b4218d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 600;
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[passivateactivateClient] DONE doTest()...");
stat.printSummary("passivateactivate");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
- initSFSBList(); //create SFSBs
+ initSFSBList(); //create SFSBs
accessSFSB(); //access the SFBS
}
@@ -92,7 +92,7 @@
SFSB sfsb = (SFSB) sfsbList.get(i);
String sfsbName = sfsb.getName();
System.out.println("Successfully accessed SFSB bean for: " + sfsbName);
-
+
stat.addStatus("ejbclient accessSFSB", stat.PASS);
}
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
index 35fbf08..049be86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
@@ -23,7 +23,7 @@
extends EJBObject
{
- public String getName()
+ public String getName()
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
index 8b2ec1d..c99eebe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
@@ -26,13 +26,13 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private String sfsbName;
private Context initialCtx;
- public void ejbCreate(String sfsbName) {
+ public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
this.sfsbName = sfsbName;
}
@@ -41,22 +41,22 @@
return this.sfsbName;
}
- public void setSessionContext(SessionContext sc) {
- this.context = sc;
+ public void setSessionContext(SessionContext sc) {
+ this.context = sc;
try {
this.initialCtx = new InitialContext();
} catch (Throwable th) {
th.printStackTrace();
}
- }
+ }
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {
+ public void ejbActivate() {
System.out.println ("In SFSB.ejbActivate() for name -> " + sfsbName);
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In SFSB.ejbPassivate() for name -> " + sfsbName);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
index 7ebf5c3..3acf770 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties
index 9887510..f39d9e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stress-sfsbcache"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml
index 784023b..6644477 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
index af3c018..e1454aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_SFSBS = 600;
@@ -50,13 +50,13 @@
client.doTest();
System.out.println("[sfsbcacheClient] DONE doTest()...");
stat.printSummary("sfsbcache");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
-
+
System.out.println("[sfsbcacheClient] Inside init....");
try {
Context ic = new InitialContext();
@@ -66,7 +66,7 @@
//Creating these many SFSBs will cause passivation
SFSB sfsb = (SFSB) home.create("SFSB_");
-
+
sfsb.getName();
sfsb.remove();
@@ -97,6 +97,6 @@
e.printStackTrace();
stat.addStatus("ejbclient accessSFSB", stat.FAIL);
}
- }
+ }
} //Client{}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
index 0ba4040..0a3f833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
@@ -23,7 +23,7 @@
extends EJBObject
{
- public String getName()
+ public String getName()
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
index f0f1e14..671ba68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
@@ -26,13 +26,13 @@
import java.rmi.RemoteException;
public class SFSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private String sfsbName;
private Context initialCtx;
- public void ejbCreate(String sfsbName) {
+ public void ejbCreate(String sfsbName) {
System.out.println ("In SFSB.ejbCreate() for name -> " + sfsbName);
this.sfsbName = sfsbName;
}
@@ -41,22 +41,22 @@
return this.sfsbName;
}
- public void setSessionContext(SessionContext sc) {
- this.context = sc;
+ public void setSessionContext(SessionContext sc) {
+ this.context = sc;
try {
this.initialCtx = new InitialContext();
} catch (Throwable th) {
th.printStackTrace();
}
- }
+ }
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {
+ public void ejbActivate() {
System.out.println ("In SFSB.ejbActivate() for name -> " + sfsbName);
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In SFSB.ejbPassivate() for name -> " + sfsbName);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
index 6ba094a..c459352 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
@@ -23,6 +23,6 @@
public interface SFSBHome
extends EJBHome
{
- public SFSB create(String sfsbName)
+ public SFSB create(String sfsbName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties
index 47e18db..6f21527 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-appclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml
index aa6a5cb..f863913 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -43,13 +43,13 @@
<target name="build" depends="compile">
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Hello.class,**/*HelloHome.class" />
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -57,10 +57,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
index 0eebc28..0a12045 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-appclientID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("appclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml
index d03c17f..a849501 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/build.xml
@@ -33,7 +33,7 @@
<antcall target="stubser"/>
<antcall target="ejbapp"/>
- <!-- standaloneclient must be executed right after ejbapp
+ <!-- standaloneclient must be executed right after ejbapp
to be able to use the generated stubs from the app client
-->
<antcall target="standaloneclient"/>
@@ -92,14 +92,14 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant ejbapp (Executes the ejb-stubs ejbapp test)
- ant ejbclient (Executes the ejb-stubs ejbclient test)
- ant appclient (Executes the ejb-stubs appclient test)
- ant webclient (Executes the ejb-stubs webclient test)
+ <echo>
+ Usage:
+ ant ejbapp (Executes the ejb-stubs ejbapp test)
+ ant ejbclient (Executes the ejb-stubs ejbclient test)
+ ant appclient (Executes the ejb-stubs appclient test)
+ ant webclient (Executes the ejb-stubs webclient test)
ant proxy (Executes the ejb-stubs proxy test)
- ant all (Executes all the ejb-stubs tests)
- </echo>
+ ant all (Executes all the ejb-stubs tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties
index 5d90da6..55f400e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-ejbapp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml
index 091fc8a..67fa9b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,26 +54,26 @@
<param name="ejbjar.classes" value="**/Hello*.class,**/Dummy*.class"/>
<param name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejbjar.classes" value="**/Foo*.class,**/Hello.class,**/HelloHome.class"/>
<param name="ejb-jar.xml" value="descriptor/ejb-jar.xml.ejbclient"/>
<param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml.ejbclient"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb-ejbclient.jar"/>
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb-ejbclient.jar"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class,**/*Hello.class,**/*HelloHome.class" />
</antcall>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common">
<param name="as.props" value="${as.props} --generatermistubs=true"/>
@@ -85,10 +85,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
index a9e97c4..ea6507a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
@@ -32,7 +32,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -41,38 +41,38 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-ejbappID");
- }
+ }
private String host;
private String port;
-
+
public Client (String[] args) {
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public void doTest() {
Context ic = null;
try {
ic = new InitialContext();
-
+
System.out.println("Looking up ejbapp ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -86,20 +86,20 @@
try {
System.out.println("Looking up ejbclient ejbref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello_ejbclient");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome fooHome = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo foo = fooHome.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
foo.callHello();
@@ -113,11 +113,11 @@
}
try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-stubs-ejbapp/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("ejbapp webclient", stat.FAIL);
@@ -129,14 +129,14 @@
stat.addStatus("ejbapp webclient", stat.FAIL);
ex.printStackTrace();
}
-
- return;
+
+ return;
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
index 7d38921..287b34e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.stubs.ejbapp;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,11 +34,11 @@
public DummyMEJBBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In DummyMEJBBean::ejbCreate !!");
+ System.out.println("In DummyMEJBBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public Set queryNames(ObjectName name, QueryExp query) {
@@ -51,34 +51,34 @@
public Integer getMBeanCount() {
- // Invoking this method from another app will verify that
+ // Invoking this method from another app will verify that
// the context class loader for this app is set appropriately during
// the invocation. The javax.management.j2ee apis are packaged
// as part of the server's classpath. That matches the behavior of
// Bug 6342495, which showed that the context class loader was still
// set to the calling application when the Home/Remote interfaces were
- // loaded from above the application classloader level.
+ // loaded from above the application classloader level.
//
// Calling getClassLoader tests that the context classloader is set
// appropriately because of the security requirements that J2SE
// imposes on requesting a class loader. By default application code
- // in the appserver does not have the RuntimePermission
+ // in the appserver does not have the RuntimePermission
// "getClassLoader". In that case, requesting a class loader is only
- // allowed if the returned class loader matches the requesting
- // class' class loader(or is a child of it). So, if the context
- // class loader is still incorrectly set to the calling app's
+ // allowed if the returned class loader matches the requesting
+ // class' class loader(or is a child of it). So, if the context
+ // class loader is still incorrectly set to the calling app's
// class loader, the call to getContextClassLoader() should throw
- // a security exception.
+ // a security exception.
// The advantage to writing the test using
// javax.management APIs and this behavior is it will work on an
// out-of-the-box installation of the appserver. No additions to the
// server's classpath or the default server.policy file are needed.
-
+
System.out.println("In DummyEJBBean::getMBeanCount()");
- System.out.println("My classloader = " +
+ System.out.println("My classloader = " +
DummyMEJBBean.class.getClassLoader());
// This should fail with a security exception if the caller is in
@@ -86,7 +86,7 @@
// loader is still incorrectly set to the caller app's classloader.
System.out.println("context class loader = " +
Thread.currentThread().getContextClassLoader());
-
+
return new Integer(0);
}
@@ -130,4 +130,4 @@
public void ejbPassivate() {}
}
- */
+ */
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
index 1581ec6..982283d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,13 +34,13 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
@@ -48,21 +48,21 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
index 38f037d..d0a0c4e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java
index 831886f..bc1bc74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Servlet.java
@@ -26,37 +26,37 @@
import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;
public class Servlet extends HttpServlet {
-
+
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In ejbapp::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -65,22 +65,22 @@
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties
index b73ff20..fb8cc8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-ejbclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml
index e20dcd7..e1d3e23 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,30 +46,30 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/hello_library.jar"
- basedir="${build.classes.dir}"
+ <jar destfile="${assemble.dir}/hello_library.jar"
+ basedir="${build.classes.dir}"
includes ="**/Hello*.class">
- </jar>
+ </jar>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- update="true" basedir="${build.classes.dir}"
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ update="true" basedir="${build.classes.dir}"
includes ="**/Foo*.class">
<metainf dir="./descriptor">
<include name="ejb-jar.xml"/>
<include name="sun-ejb-jar.xml"/>
</metainf>
<manifest>
- <attribute name="Class-Path"
+ <attribute name="Class-Path"
value="hello_library.jar"/>
</manifest>
- </jar>
+ </jar>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -77,10 +77,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
index 722a053..ba6fb63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-ejbclientID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
index c627064..11c3214 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,11 +34,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
@@ -46,21 +46,21 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties
index c29579e..b45bb89 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-proxy"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml
index 37f8ea8..2e72ab9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/HelloHome.class,**/Hello.class,**/*Client*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
index b6fd438..ac5c21f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
@@ -27,7 +27,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -36,34 +36,34 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-proxyID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- // create EJB using factory from container
- java.lang.Object objref =
+ // create EJB using factory from container
+ java.lang.Object objref =
ic.lookup("java:comp/env/ejb/ProxyApp");
- System.out.println("Looked up home!!");
+ System.out.println("Looked up home!!");
- HelloHome home = (HelloHome)
+ HelloHome home = (HelloHome)
PortableRemoteObject.narrow(objref, HelloHome.class);
- System.out.println("Narrowed home!!");
+ System.out.println("Narrowed home!!");
- Hello hr = home.create();
- System.out.println("Got the EJB!!");
+ Hello hr = home.create();
+ System.out.println("Got the EJB!!");
hr.testPassByRef();
- // invoke method on the EJB
- doProxyTest(hr);
+ // invoke method on the EJB
+ doProxyTest(hr);
testExceptions(hr);
@@ -75,8 +75,8 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
private void testExceptions(Hello h) throws Exception {
@@ -85,7 +85,7 @@
h.throwException();
} catch(Exception e) {
if( e.getClass() == Exception.class ) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
} else {
throw e;
@@ -96,7 +96,7 @@
h.throwAppException1();
throw new Exception("didn't get exception for testException2");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -104,7 +104,7 @@
h.throwAppException2();
throw new Exception("didn't get exception for testException3");
} catch(jakarta.ejb.FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -130,36 +130,36 @@
}
}
- private void doProxyTest(Hello hr)
- throws Exception
+ private void doProxyTest(Hello hr)
+ throws Exception
{
- System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATEFUL, hr);
+ System.out.println("\nStateful Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATEFUL, hr);
- System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
- hr.warmup(Common.STATEFUL);
- runTests(Common.STATELESS, hr);
+ System.out.println("\nStateless Session results (microsec): \twith tx \tno tx:");
+ hr.warmup(Common.STATEFUL);
+ runTests(Common.STATELESS, hr);
- System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
- hr.warmup(Common.BMP);
- runTests(Common.BMP, hr);
+ System.out.println("\nBMP Entity results (microsec): \t\twith tx \tno tx:");
+ hr.warmup(Common.BMP);
+ runTests(Common.BMP, hr);
}
private void runTests(int type, Hello hr)
- throws Exception
+ throws Exception
{
-
+
hr.notSupported(type, true);
hr.notSupported(type, false);
hr.supports(type, true);
- hr.supports(type, false);
+ hr.supports(type, false);
hr.required(type, true);
- hr.required(type, false);
+ hr.required(type, false);
hr.requiresNew(type, true);
- hr.requiresNew(type, false);
+ hr.requiresNew(type, false);
hr.mandatory(type, true);
- hr.never(type, false);
+ hr.never(type, false);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml
index 9b84e13..6389966 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/descriptor/ejb-jar.xml
@@ -101,7 +101,7 @@
</session>
<session>
<ejb-name>SfulBean</ejb-name>
- <home>com.sun.s1asdev.ejb.stubs.proxy.SfulRemoteHome</home>
+ <home>com.sun.s1asdev.ejb.stubs.proxy.SfulRemoteHome</home>
<remote>com.sun.s1asdev.ejb.stubs.proxy.SfulRemote</remote>
<local-home>com.sun.s1asdev.ejb.stubs.proxy.SfulHome</local-home>
<local>com.sun.s1asdev.ejb.stubs.proxy.Sful</local>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
index ed480b5..04ce5d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
@@ -25,7 +25,7 @@
public BmpEJB(){}
public String ejbCreate(String s) {
- return s;
+ return s;
}
public void ejbPostCreate(String s) {}
@@ -45,10 +45,10 @@
public void unsetEntityContext()
{}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -61,7 +61,7 @@
{}
public String ejbFindByPrimaryKey(String s) {
- return s;
+ return s;
}
public void testException1() throws Exception {
@@ -99,7 +99,7 @@
}
public void testPassByRef4(CommonRemote cr) {
-
+
}
public Helper1 testPassByRef5() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
index 3e4cb7d..afc952f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
@@ -22,5 +22,5 @@
public interface BmpHome extends EJBLocalHome
{
Bmp create(String s) throws CreateException;
- Bmp findByPrimaryKey(String s) throws CreateException;
+ Bmp findByPrimaryKey(String s) throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
index c3f29fc..7d94391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
@@ -22,5 +22,5 @@
public interface BmpRemoteHome extends EJBHome
{
BmpRemote create(String s) throws RemoteException, CreateException;
- BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
+ BmpRemote findByPrimaryKey(String s) throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
index 4896ffa..197dae4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
@@ -42,7 +42,7 @@
private BmpRemoteHome bmpRemoteHome;
private long overhead;
-
+
private static final String pkey = "A BMP Bean";
jakarta.transaction.UserTransaction ut;
@@ -51,7 +51,7 @@
public void ejbCreate() {
- try {
+ try {
Context ic = new InitialContext();
Context ic1 = (Context) ic.lookup("java:comp/env");
@@ -60,27 +60,27 @@
Context ic2 = (Context) ic.lookup("java:comp/env/ejb");
String ic2Name = ic2.getNameInNamespace();
- Context ic2_ = (Context) ic.lookup(ic2Name);
+ Context ic2_ = (Context) ic.lookup(ic2Name);
- sfulHome = (SfulHome) ic2_.lookup("Sful");
+ sfulHome = (SfulHome) ic2_.lookup("Sful");
sful = sfulHome.create();
Object obj = ic2_.lookup("SfulRemote");
sfulRemoteHome = (SfulRemoteHome)
PortableRemoteObject.narrow(obj, SfulRemoteHome.class);
sfulRemote = sfulRemoteHome.create();
- System.out.println("Created Stateful bean.");
-
- slessHome = (SlessHome) ic1_.lookup("ejb/Sless");
+ System.out.println("Created Stateful bean.");
+
+ slessHome = (SlessHome) ic1_.lookup("ejb/Sless");
sless = slessHome.create();
obj = ic2_.lookup("SlessRemote");
slessRemoteHome = (SlessRemoteHome)
PortableRemoteObject.narrow(obj, SlessRemoteHome.class);
slessRemote = slessRemoteHome.create();
- System.out.println("Created Stateless bean.");
+ System.out.println("Created Stateless bean.");
- bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
+ bmpHome = (BmpHome) ic.lookup("java:comp/env/ejb/Bmp");
bmp = bmpHome.create(pkey);
obj = ic2_.lookup("BmpRemote");
@@ -89,14 +89,14 @@
bmpRemote = (BmpRemote)
bmpRemoteHome.findByPrimaryKey(pkey);
- System.out.println("Created BMP bean.");
-
- ut = context.getUserTransaction();
+ System.out.println("Created BMP bean.");
- } catch (Exception ex) {
- System.out.println("couldn't get all beans");
- ex.printStackTrace();
- }
+ ut = context.getUserTransaction();
+
+ } catch (Exception ex) {
+ System.out.println("couldn't get all beans");
+ ex.printStackTrace();
+ }
}
private void testRemove() throws RemoteException {
@@ -105,7 +105,7 @@
System.out.println("Created BMP bean.");
bmpHome.remove(bmp2.getPrimaryKey());
System.out.println("Successfully removed local entity bean");
- } catch(Exception e) {
+ } catch(Exception e) {
e.printStackTrace();
throw new EJBException(e);
}
@@ -130,7 +130,7 @@
// success
}
-
+
try {
EJBObject bmpRemote2 = bmpRemoteHome.create("foobar2");
System.out.println("Created BMP bean.");
@@ -174,9 +174,9 @@
try {
sful.remove();
-
+
try {
- sful.remove();
+ sful.remove();
throw new EJBException("2nd sful remove should have caused exception");
} catch(Exception e) {
System.out.println("Successfully caught exception when attempting to "+
@@ -186,7 +186,7 @@
sless.remove();
- bmp.remove();
+ bmp.remove();
} catch(Exception e) {
e.printStackTrace();
@@ -208,29 +208,29 @@
public void throwAppException2() throws FinderException {
throw new ObjectNotFoundException("throwAppException2");
}
-
- public void warmup(int type) throws Exception {
- warmup(type, true);
- warmup(type, false);
- // Measure looping and timing overhead
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- }
- long end = System.currentTimeMillis();
- overhead = end - begin;
+ public void warmup(int type) throws Exception {
+ warmup(type, true);
+ warmup(type, false);
+
+ // Measure looping and timing overhead
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ }
+ long end = System.currentTimeMillis();
+ overhead = end - begin;
String pkey2 = (String) bmp.getPrimaryKey();
if( !pkey2.equals(pkey) ) {
throw new EJBException("pkey2 " + pkey2 + " doesn't match " + pkey);
}
-
+
ut = context.getUserTransaction();
-
+
testLocalObjects(sful, sless);
testLocalObjects(sful, bmp);
testLocalObjects(sless, bmp);
-
+
testEJBObjects(sfulRemote, slessRemote);
testEJBObjects(sfulRemote, bmpRemote);
testEJBObjects(slessRemote, bmpRemote);
@@ -259,14 +259,14 @@
testExceptions(slessRemote);
testExceptions(bmpRemote);
}
-
+
private void testExceptions(Common c) {
try {
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -274,7 +274,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(EJBException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -282,10 +282,10 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
private void testExceptions(CommonRemote c) throws RemoteException {
@@ -294,7 +294,7 @@
c.testException1();
throw new EJBException("didn't get exception for testException1");
} catch(Exception e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -302,7 +302,7 @@
c.testException2();
throw new EJBException("didn't get exception for testException2");
} catch(RemoteException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -310,7 +310,7 @@
c.testException3();
throw new EJBException("didn't get exception for testException3");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
@@ -318,10 +318,10 @@
c.testException4();
throw new EJBException("didn't get exception for testException4");
} catch(FinderException e) {
- System.out.println("Successfully caught exception " +
+ System.out.println("Successfully caught exception " +
e.getClass() + " " + e.getMessage());
}
-
+
}
public Object testPassByRef() throws Exception {
@@ -343,9 +343,9 @@
return null;
}
- private void _testPassByRef(CommonRemote c, boolean passByRef)
+ private void _testPassByRef(CommonRemote c, boolean passByRef)
throws Exception {
-
+
int intVal = 1;
String stringVal = "HelloEJB::_testPassByRef";
@@ -361,7 +361,7 @@
if( passByRef ) {
if( (h1.a == intVal) || h1.b.equals(stringVal) ) {
throw new EJBException("h1 mutations not present " + h1);
- }
+ }
} else {
if( (h1.a != intVal) || !h1.b.equals(stringVal) ) {
throw new EJBException("error : h1 was mutated " + h1);
@@ -378,23 +378,23 @@
System.out.println("After testPassByRef3 : " + h2);
if( (h2.a == intVal) || h2.b.equals(stringVal) ) {
throw new EJBException("h2 mutations not present " + h2);
- }
+ }
} else {
try {
c.testPassByRef3(h2);
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"passing non-serializable data " + h2);
-
+
/* DON'T TREAT AS FATAL ERROR WHILE WE INVESTIGATE WHETHER
* THIS WAS INTENDED BEHAVIOR FOR THE ORB
- throw new EJBException("Error : Expected exception when " +
- "passing non-serializable data " +
+ throw new EJBException("Error : Expected exception when " +
+ "passing non-serializable data " +
h2);
*/
} catch(EJBException ejbex) {
throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" passing non-serializable data" +
e.toString());
}
@@ -409,16 +409,16 @@
} else {
try {
Helper2 h6 = c.testPassByRef6();
- System.out.println("Error : Expected exception when " +
+ System.out.println("Error : Expected exception when " +
"returning non-serializable data " + h6);
- /* see comment for testPassByRef3 above
- throw new EJBException("Error : Expected exception when " +
+ /* see comment for testPassByRef3 above
+ throw new EJBException("Error : Expected exception when " +
"returning non-serializable data ");
*/
} catch(EJBException ejbex) {
- throw ejbex;
+ throw ejbex;
} catch(Exception e) {
- System.out.println("Caught expected exception when " +
+ System.out.println("Caught expected exception when " +
" returning non-serializable data" +
e.toString());
}
@@ -450,144 +450,144 @@
}
private void warmup(int type, boolean tx) throws Exception {
- // get Hotspot warmed up
- Common bean = pre(type, tx);
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- bean.notSupported();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- if ( tx )
- bean.mandatory();
- else
- bean.never();
- bean.supports();
- }
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ // get Hotspot warmed up
+ Common bean = pre(type, tx);
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ bean.notSupported();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ if ( tx )
+ bean.mandatory();
+ else
+ bean.never();
+ bean.supports();
+ }
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
}
- private Common pre(int type, boolean tx)
+ private Common pre(int type, boolean tx)
{
- if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
- if ( type == Common.STATELESS )
- return sless;
- else if ( type == Common.STATEFUL )
- return sful;
- else
- return bmp;
+ if ( tx ) try { ut.begin(); } catch ( Exception ex ) {}
+ if ( type == Common.STATELESS )
+ return sless;
+ else if ( type == Common.STATEFUL )
+ return sful;
+ else
+ return bmp;
}
- private CommonRemote preRemote(int type, boolean tx)
- {
- if ( type == Common.STATELESS )
- return slessRemote;
- else if ( type == Common.STATEFUL )
- return sfulRemote;
- else
- return bmpRemote;
+ private CommonRemote preRemote(int type, boolean tx)
+ {
+ if ( type == Common.STATELESS )
+ return slessRemote;
+ else if ( type == Common.STATEFUL )
+ return sfulRemote;
+ else
+ return bmpRemote;
}
private float post(long begin, long end, boolean tx)
{
- if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
- return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
+ if ( tx ) try { ut.commit(); } catch ( Exception ex ) {}
+ return (float)( ((double)(end-begin-overhead))/((double)ITERATIONS) * 1000.0 );
}
public float requiresNew(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.requiresNew();
- }
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.requiresNew();
+ }
for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.requiresNew();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ beanRemote.requiresNew();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float notSupported(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.notSupported();
- }
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.notSupported();
+ }
for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.notSupported();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ beanRemote.notSupported();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float required(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.required();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.required();
- }
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.required();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.required();
+ }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float mandatory(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.mandatory();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.mandatory();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.mandatory();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.mandatory();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float never(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.never();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.never();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.never();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.never();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public float supports(int type, boolean tx) throws RemoteException
{
- Common bean = pre(type, tx);
+ Common bean = pre(type, tx);
CommonRemote beanRemote = preRemote(type, tx);
- long begin = System.currentTimeMillis();
- for ( int i=0; i<ITERATIONS; i++ ) {
- bean.supports();
- }
- for ( int i=0; i<ITERATIONS; i++ ) {
- beanRemote.supports();
- }
- long end = System.currentTimeMillis();
- return post(begin, end, tx);
+ long begin = System.currentTimeMillis();
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ bean.supports();
+ }
+ for ( int i=0; i<ITERATIONS; i++ ) {
+ beanRemote.supports();
+ }
+ long end = System.currentTimeMillis();
+ return post(begin, end, tx);
}
public void setSessionContext(SessionContext sc) {
- context = sc;
+ context = sc;
}
public void ejbRemove() {}
@@ -637,11 +637,11 @@
if( o1.isIdentical(o2) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( o2.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
-
+
if( !o1.isIdentical(o1) ) {
throw new EJBException("isIdentical failed");
}
@@ -694,12 +694,12 @@
}
System.out.println("o1.hashCode() = " + o1.hashCode());
-
+
System.out.println("o2.hashCode() = " + o2.hashCode());
-
+
System.out.println("o1.toString() = " + o1.toString());
System.out.println("o2.toString() = " + o2.toString());
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
index e416915..21d9852 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
@@ -39,14 +39,14 @@
sc_ = sc;
}
- public void ejbRemove()
- {
+ public void ejbRemove()
+ {
System.out.println("In SfulEJB.ejbRemove(). about to throw exception");
throw new RuntimeException("test cleanup for case where " +
"ejbRemove throws an exception");
}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -102,7 +102,7 @@
Helper2 h2 = new Helper2();
h2.a = 1;
h2.b = "SfulEJB::testPassByRef6";
- return h2;
+ return h2;
}
public CommonRemote testPassByRef7() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
index 9be053e..ae6e0cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
@@ -40,10 +40,10 @@
sc_ = sc;
}
- public void ejbRemove()
+ public void ejbRemove()
{}
- public void ejbActivate()
+ public void ejbActivate()
{}
public void ejbPassivate()
@@ -70,7 +70,7 @@
}
public void testPassByRef1(int a) {
-
+
}
public void testPassByRef2(Helper1 helper1) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties
index a802333..d68eb1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="test.name" value="com.sun.s1asdev.ejb.stubs.standaloneclient"/>
<property name="simple.client" value="${test.name}.SimpleClient"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
index 4f9f151..b13140d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
@@ -42,11 +42,11 @@
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}:${build.classes.dir}"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
-
+
<target name="runclient_nooverride" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient/ejb-stubs-ejbapp-clientClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
@@ -55,7 +55,7 @@
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
<arg value="${ic.props}"/>
</java>
- </target>
+ </target>
<!--This target is used to test that using no-arg InitialContext and
not setting any vm params will still work, assuming the default
@@ -63,13 +63,13 @@
tests run b/c of the port change possibility. However, if the
default port of 3700 is set, this test should work. -->
<target name="runclient_setnothing" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
</java>
- </target>
+ </target>
<target name="run_default" depends="init-common">
<antcall target="runclient_nooverride">
@@ -94,7 +94,7 @@
<target name="runclient_withoverride" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
@@ -105,7 +105,7 @@
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
<arg value="jndi.properties.s1as8_default"/>
</java>
- </target>
+ </target>
<target name="run_cosnaming_override" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
index 75d0f05..ce0a85c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
@@ -35,13 +35,13 @@
public static void main(String[] args)
{
try {
- // Step 1: It is important to call initailizeSystemProperties to
- // avoid problems with switching ORBs between J2SE and AppServer.
- // These are system properties that needs to be run once or these
+ // Step 1: It is important to call initailizeSystemProperties to
+ // avoid problems with switching ORBs between J2SE and AppServer.
+ // These are system properties that needs to be run once or these
// properties can be passed through -D flags
initializeSystemProperties( );
-
- // Step 2: Now do the EJB lookup, and call the methods on the
+
+ // Step 2: Now do the EJB lookup, and call the methods on the
// Metadata Object
getContext();
@@ -49,9 +49,9 @@
EJBHome home = getHome( boundObj );
getMetaData( home );
- // Step 3: Repeat Step 2 as many times as needed. Although the
+ // Step 3: Repeat Step 2 as many times as needed. Although the
// advise is to pass "javax.naming.CORBA.ORB" property
- // to avoid huge memory footprint due to new initialContexts.
+ // to avoid huge memory footprint due to new initialContexts.
// Remember every new InitialContext will initialize a new ORB
// which is very expensive memory wise.
/*PG->
@@ -64,7 +64,7 @@
getMetaData( home );
}
*/
-
+
} catch ( Exception e ) {
e.printStackTrace( );
System.out.println( e );
@@ -73,16 +73,16 @@
// Initialize to use SUN ONE AppServer 7 ORB and UtilDelegate
- // NOTE: All these are OMG standard properties provided to plug in an ORB
+ // NOTE: All these are OMG standard properties provided to plug in an ORB
// to JDK
private static void initializeSystemProperties( ) {
System.setProperty( "org.omg.CORBA.ORBClass",
"com.sun.corba.ee.impl.orb.ORBImpl" );
- System.setProperty( "javax.rmi.CORBA.UtilClass",
+ System.setProperty( "javax.rmi.CORBA.UtilClass",
"com.sun.corba.ee.impl.javax.rmi.CORBA.Util" );
System.setProperty( "javax.rmi.CORBA.StubClass",
- "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
+ "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
System.setProperty( "javax.rmi.CORBA.PortableRemoteClass",
"com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject");
}
@@ -91,24 +91,24 @@
public static void getContext()
{
Properties _props = new Properties();
- _props.put(Context.INITIAL_CONTEXT_FACTORY,
+ _props.put(Context.INITIAL_CONTEXT_FACTORY,
"org.glassfish.jndi.cosnaming.CNCtxFactory");
_props.put(Context.PROVIDER_URL, "iiop://achumba:3700");
try {
_context = new InitialContext(_props);
} catch(NamingException ne) {
- System.out.println("test - 'new InitialContext()'" +
+ System.out.println("test - 'new InitialContext()'" +
"threw this: type(" + ne.getClass().getName() +
"), msg(" + ne.getMessage() + ")");
Throwable rootCause = ne.getRootCause();
- System.out.println("test.initialContext -" +
- "root cause of previous exception: " + "type(" +
- rootCause.getClass().getName() + "), msg(" +
+ System.out.println("test.initialContext -" +
+ "root cause of previous exception: " + "type(" +
+ rootCause.getClass().getName() + "), msg(" +
rootCause.getMessage() + ")");
}
}
-
+
//DoLookup
@@ -118,12 +118,12 @@
try {
boundObj = _context.lookup(inName);
} catch(NamingException ne) {
- System.out.println("test - 'lookup()'" + "threw this: type(" +
+ System.out.println("test - 'lookup()'" + "threw this: type(" +
ne.getClass().getName() + "), msg(" + ne.getMessage() + ")");
Throwable rootCause = ne.getRootCause();
- System.out.println("test.lookup -" +
- "root cause of previous exception: " + "type(" +
- rootCause.getClass().getName() + "), msg(" +
+ System.out.println("test.lookup -" +
+ "root cause of previous exception: " + "type(" +
+ rootCause.getClass().getName() + "), msg(" +
rootCause.getMessage() + ")");
}
return boundObj;
@@ -146,11 +146,11 @@
EJBMetaData meta=null;
try {
meta = formalboundHome.getEJBMetaData();
- System.out.println( "meta.getClass().getName() = " +
+ System.out.println( "meta.getClass().getName() = " +
meta.getClass().getName() );
} catch(Exception ne) {
ne.printStackTrace();
- System.out.println("test - 'metadata()'" + "threw this: type(" +
+ System.out.println("test - 'metadata()'" + "threw this: type(" +
ne.getClass().getName() + "), msg(" + ne.getMessage() + ")");
}
if(meta != null)
@@ -161,8 +161,8 @@
try {
tempClass = meta.getHomeInterfaceClass();
} catch(Error e) {
- System.out.println(
- "found EJB Home,meta.getHomeInterfaceClass() " +
+ System.out.println(
+ "found EJB Home,meta.getHomeInterfaceClass() " +
e.getMessage() );
tempClass = null;
}
@@ -171,6 +171,6 @@
System.out.println("HomeInteface"+tempClass);
meta = null;
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
index fd77433..65e48c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
@@ -34,56 +34,56 @@
public class Client {
private Context ic;
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
stat.addDescription("ejb-stubs-standaloneclient");
- // Step 1: It is important to call initailizeSystemProperties to
- // avoid problems with switching ORBs between J2SE and AppServer.
- // These are system properties that needs to be run once or these
+ // Step 1: It is important to call initailizeSystemProperties to
+ // avoid problems with switching ORBs between J2SE and AppServer.
+ // These are system properties that needs to be run once or these
// properties can be passed through -D flags
//PG-> initializeSystemProperties( );
-
+
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-standaloneclientID");
- }
-
+ }
+
public Client (String[] args) {
try {
- setupInitialContext( "achumba" , "3700" );
+ setupInitialContext( "achumba" , "3700" );
// ic = new InitialContext();
} catch(Exception e) {
System.out.println(
- "standaloneclient.Client(), Exception when setting " +
+ "standaloneclient.Client(), Exception when setting " +
"up the InitialContext environment");
e.printStackTrace();
- }
+ }
}
-
+
public void doTest() {
try {
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("ejb/ejb_stubs_ejbapp_HelloBean");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -108,33 +108,33 @@
e.printStackTrace();
stat.addStatus("standaloneclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
- private void setupInitialContext( String host, String port )
- throws Exception
+ private void setupInitialContext( String host, String port )
+ throws Exception
{
Properties env = new Properties();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.enterprise.naming.SerialInitContextFactory");
-
+
env.put( Context.PROVIDER_URL, "iiop://" + host + ":" + port );
ic = new InitialContext( env );
}
// Initialize to use SUN ONE AppServer 7 ORB and UtilDelegate
- // NOTE: All these are OMG standard properties provided to plug in an ORB
+ // NOTE: All these are OMG standard properties provided to plug in an ORB
// to JDK
private static void initializeSystemProperties( ) {
System.setProperty( "org.omg.CORBA.ORBClass",
"com.sun.corba.ee.impl.orb.ORBImpl" );
- System.setProperty( "javax.rmi.CORBA.UtilClass",
+ System.setProperty( "javax.rmi.CORBA.UtilClass",
"com.sun.corba.ee.impl.javax.rmi.CORBA.Util" );
System.setProperty( "javax.rmi.CORBA.StubClass",
- "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
+ "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl");
System.setProperty( "javax.rmi.CORBA.PortableRemoteClass",
"com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject");
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
index 2b3a40c..3ea07c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
@@ -27,7 +27,7 @@
public class SimpleClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -47,8 +47,8 @@
}
stat.printSummary("ejb-stubs-standaloneclient");
- }
-
+ }
+
private String jndiName;
private String propsFileName;
@@ -58,7 +58,7 @@
if( (args.length > 1) && (args[1].length() > 0) ) {
propsFileName = args[1];
- System.out.println("Using props file " + propsFileName +
+ System.out.println("Using props file " + propsFileName +
" for InitialContext");
} else {
System.out.println("Using no-arg InitialContext");
@@ -75,9 +75,9 @@
Properties props = new Properties();
FileInputStream fis = new FileInputStream(propsFileName);
props.load(fis);
- System.out.println("Using props = " + props);
+ System.out.println("Using props = " + props);
ic = new InitialContext(props);
- System.out.println("ic = " + ic);
+ System.out.println("ic = " + ic);
}
return ic;
@@ -86,47 +86,47 @@
private void doTest() throws Exception {
Context ic = getContext();
-
+
System.out.println("Looking up global jndi name = " + jndiName);
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup(jndiName);
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
System.out.println("successfully invoked ejb");
-
- EJBMetaData md = home.getEJBMetaData();
+
+ EJBMetaData md = home.getEJBMetaData();
System.out.println("Got EJB meta data = " + md);
-
- EJBMetaData md2 = home.getEJBMetaData();
+
+ EJBMetaData md2 = home.getEJBMetaData();
System.out.println("Got EJB meta data again = " + md2);
-
+
HomeHandle homeHandle = home.getHomeHandle();
System.out.println("Got Home Handle");
HelloHome home2 = (HelloHome) homeHandle.getEJBHome();
System.out.println("Converted Home Handle back to HelloHome");
- EJBMetaData md3 = home2.getEJBMetaData();
+ EJBMetaData md3 = home2.getEJBMetaData();
System.out.println("Got EJB meta data a 3rd time = " + md3);
-
+
Handle helloHandle = hr.getHandle();
System.out.println("Got hello Handle");
Hello hello2 = (Hello) helloHandle.getEJBObject();
System.out.println("Converted Hello Handle back to Hello");
hello2.sayHello();
System.out.println("successfully invoked ejb again");
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties
index b3807b9..a2aefba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-stubcount-ejb1.jar"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="app.type" value="ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml
index 51ce673..44084b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/build.xml
@@ -34,29 +34,29 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
- </antcall>
+ </antcall>
</target>
<target name="build" depends="compile">
<antcall target="mybuild">
<param name="buildnum" value="1"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="2"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="3"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="5"/>
- </antcall>
+ </antcall>
<antcall target="mybuild">
<param name="buildnum" value="10"/>
- </antcall>
+ </antcall>
</target>
<target name="mybuild" >
@@ -68,28 +68,28 @@
<param name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar${buildnum}.xml"/>
<param name="ejb.jar"
value="${assemble.dir}/ejb-stubs-stubcount${buildnum}-ejb.jar"/>
-</antcall>
- </target>
-
+</antcall>
+ </target>
+
<target name="deploy">
<antcall target="mydeploy">
<param name="buildnum" value="1"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="2"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="3"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="5"/>
- </antcall>
+ </antcall>
<antcall target="mydeploy">
<param name="buildnum" value="10"/>
- </antcall>
+ </antcall>
</target>
- <target name="mydeploy"
+ <target name="mydeploy"
depends="init-common">
<antcall target="deploy-jar-common">
<param name="appname" value="ejb-stubs-stubcount${buildnum}"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml
index d346a60..014f477 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/descriptor/ejb-jar2.xml
@@ -44,7 +44,7 @@
<security-identity>
<use-caller-identity/>
</security-identity>
- </session>
+ </session>
</enterprise-beans>
<assembly-descriptor>
</assembly-descriptor>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
index 144d448..ed2e920 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -32,14 +32,14 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
- public void sayFoo() {
+ public void sayFoo() {
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties
index f3ef441..88824a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-stubser"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="se.client" value="com.sun.s1asdev.ejb.stubs.stubser.client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml
index 3990ae8..f60244a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/build.xml
@@ -36,7 +36,7 @@
<delete file="homehandle"/>
<delete file="foohandle"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,26 +48,26 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
- <!-- temporarily comment out test that reconstitutes handle from file.
+ <!-- temporarily comment out test that reconstitutes handle from file.
<antcall target="run_handle"/>
- -->
+ -->
</target>
-
+
<target name="run_handle" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="handle"/>
@@ -80,7 +80,7 @@
</target>
<target name="run_se_nohandle" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -88,17 +88,17 @@
</target>
<target name="run_se_handle" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
- <arg line="handle"/>
+ <arg line="handle"/>
</java>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
index 157bb8d..7ba676b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
@@ -31,19 +31,19 @@
private static final String HOME_HANDLE_FILE = "homehandle";
private static final String FOO_HANDLE_FILE = "foohandle";
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
- System.out.println("cp = " + System.getProperty("java.class.path"));
+ System.out.println("cp = " + System.getProperty("java.class.path"));
Client client = new Client(args);
- System.out.println("args.length = " + args.length);
- for(int i = 0; i < args.length; i++) {
- System.out.println("arg " + i + " = " + args[0]);
- }
-
+ System.out.println("args.length = " + args.length);
+ for(int i = 0; i < args.length; i++) {
+ System.out.println("arg " + i + " = " + args[0]);
+ }
+
if( args.length == 1) {
stat.addDescription("ejb-stubs-stubser2");
@@ -54,35 +54,35 @@
client.doTest();
stat.printSummary("ejb-stubs-stubser1ID");
}
-
- }
-
+
+ }
+
public Client (String[] args) {
}
-
+
public void doRestartTest() {
try {
// when we lookup a FooHome *before* deserializing the home reference,
// everything works
- // @@@
+ // @@@
System.out.println("Adding lookup before reconstitution ...");
lookupHome();
System.out.println("Attempting to reconstruct foo handle");
- Handle fh = (Handle) readFromFile(FOO_HANDLE_FILE);
+ Handle fh = (Handle) readFromFile(FOO_HANDLE_FILE);
Foo f = (Foo) fh.getEJBObject();
- f.callHello();
-
- System.out.println("successfully invoked foo via reconsituted handle");
+ f.callHello();
+
+ System.out.println("successfully invoked foo via reconsituted handle");
System.out.println("Attempting to reconstruct home handle as first" +
" operation in client");
HomeHandle hh = (HomeHandle) readFromFile(HOME_HANDLE_FILE);
invoke((FooHome) hh.getEJBHome());
- System.out.println("successfully invoked ejb via reconsituted home");
+ System.out.println("successfully invoked ejb via reconsituted home");
-
+
stat.addStatus("ejbclient restart2", stat.PASS);
} catch(Exception e) {
@@ -98,10 +98,10 @@
FooHome home = lookupHome();
-
+
System.err.println("Narrowed home!!");
-
-
+
+
// create home handle
HomeHandle hh = home.getHomeHandle();
@@ -112,12 +112,12 @@
Foo f = invoke(home);
System.out.println("successfully invoked ejb via reconsituted home");
- // create SFSB instance handle file
+ // create SFSB instance handle file
Handle fh = f.getHandle();
serializeToFile(FOO_HANDLE_FILE, fh);
Handle fh2 = (Handle) readFromFile(FOO_HANDLE_FILE);
Foo f2 = (Foo) fh2.getEJBObject();
- f2.callHello();
+ f2.callHello();
System.out.println("successfully invoked ejb");
@@ -127,37 +127,37 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
private FooHome lookupHome() throws Exception {
Context ic = new InitialContext();
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:global/ejb-stubs-stubserApp/ejb-stubs-stubser-ejb/FooBean");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
return home;
}
-
+
private Foo invoke(FooHome fooHome) throws Exception {
Foo f = fooHome.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
- return f;
+ return f;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
index 22143f9..b70a074 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
@@ -19,7 +19,7 @@
import java.util.Date;
import java.util.Collection;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -36,20 +36,20 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
helloHome = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
hello = helloHome.create();
@@ -64,14 +64,14 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
System.out.println("in FooBean::callHello()");
try {
-
+
hello.sayHello();
System.out.println("successfully invoked ejb");
@@ -84,7 +84,7 @@
throw ise;
}
-
+
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
index 8713eba..03d6c86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties
index 8415d5e..9a28259 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-stubs-webclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml
index 2c0cdb6..cb0b8e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,16 +46,16 @@
<target name="build" depends="compile">
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
</antcall>
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -65,10 +65,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java
index 8fc3492..84c3cc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private String host;
private String port;
@@ -35,23 +35,23 @@
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
stat.addDescription("ejb-stubs-webclient");
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-stubs-webclientID");
}
-
+
public void doTest() {
-
+
String env = null;
try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/ejb-stubs-webclient/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("webclient main", stat.FAIL);
@@ -63,15 +63,15 @@
stat.addStatus("webclient main", stat.FAIL);
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -84,6 +84,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
index 7d36855..b28878f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/web.xml
@@ -36,7 +36,7 @@
<home>com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome</home>
<remote>com.sun.s1asdev.ejb.stubs.ejbapp.Hello</remote>
</ejb-ref>
-<!--
+<!--
<ejb-ref>
<ejb-ref-name>ejb/dummymejb</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
index af9ebb3..05dffeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
@@ -29,29 +29,29 @@
//import javax.management.j2ee.Management;
public class Servlet extends HttpServlet {
-
+
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In webclient::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
System.out.println("Skipping mejb test for now. NEED TO REENABLE");
- // System.out.println("Calling DummyMEJBBean");
+ // System.out.println("Calling DummyMEJBBean");
- /* TODO reenable once javax.management classes are available
+ /* TODO reenable once javax.management classes are available
Object objref = ic.lookup("java:comp/env/ejb/dummymejb");
- ManagementHome mHome = (ManagementHome)
+ ManagementHome mHome = (ManagementHome)
PortableRemoteObject.narrow(objref, ManagementHome.class);
Management dummyMejb = mHome.create();
@@ -59,22 +59,22 @@
dummyMejb.getMBeanCount();
System.out.println("dummy mejb test successful");
- */
+ */
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
- Object objref2 = ic.lookup("java:comp/env/ejb/hello");
+ // create EJB using factory from container
+ Object objref2 = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref2);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref2, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
hr.sayHello();
@@ -83,22 +83,22 @@
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java b/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java
index 506213e..790c5b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/tests/cache/Client.java
@@ -22,7 +22,7 @@
public class Client {
- String cacheName;
+ String cacheName;
int cacheSize, resizeQuantity;
long idleTimeout; // idleTimeout value in milliseconds
float loadFactor;
@@ -69,11 +69,11 @@
createObjects();
addCacheEntries();
if ( debug )
- displayCacheEntries( "Display items in cache after adding" );
+ displayCacheEntries( "Display items in cache after adding" );
removeCacheEntries();
if ( debug )
- System.out.println( "Total items in cache (" + cacheName +
+ System.out.println( "Total items in cache (" + cacheName +
") after remove call = " + getEntryCount() );
addCacheEntries();
@@ -99,7 +99,7 @@
System.out.println( "\n\nIn createCache of Cache(" + cacheName + ")" );
if ( cacheSize <= 0 && idleTimeout <= 0 ) {
if ( debug )
- System.out.println( "\t\tCreating BaseCache for cacheSize = " + cacheSize +
+ System.out.println( "\t\tCreating BaseCache for cacheSize = " + cacheSize +
" :resizeQuantity = " + resizeQuantity + " ::loadFactor = " + loadFactor );
cache = new BaseCache();
cache.init( DEFAULT_CACHE_SIZE, DEFAULT_LOAD_FACTOR, null );
@@ -108,7 +108,7 @@
LruCache lru = new LruCache( DEFAULT_CACHE_SIZE);
calculateLoadFactor();
if ( debug )
- System.out.println( "\t\tCreating LruCache for cacheSize = " + cacheSize +
+ System.out.println( "\t\tCreating LruCache for cacheSize = " + cacheSize +
" :resizeQuantity = " + resizeQuantity + " ::loadFactor = " + loadFactor );
lru.init( cacheSize, idleTimeout, loadFactor, null );
cache = lru;
@@ -125,7 +125,7 @@
for( int i = 0; i < MAX_TEST_ENTRIES; i++ ) {
dummys[i] = new DummyObject( i );
}
- } //createObjects()
+ } //createObjects()
private void addCacheEntries() {
Object obj;
@@ -176,13 +176,13 @@
}
} //DummyObject{}
- class ExpiredItemTask
+ class ExpiredItemTask
extends java.util.TimerTask {
-
+
public void run() {
- cache.trimExpiredEntries( resizeQuantity );
+ cache.trimExpiredEntries( resizeQuantity );
}
- } //ExpiredItemTask
+ } //ExpiredItemTask
@@ -265,22 +265,22 @@
}
if ( debug ) {
- System.out.println (
+ System.out.println (
"\n\nList all the items in all the caches to ensure that the idle timeout works correctly" );
-
+
System.out.println ( "\t\t Total items in cache (c0) = " + c0.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c1) = " + c1.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c2) = " + c2.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c3) = " + c3.getEntryCount() );
System.out.println ( "\t\t Total items in cache (c4) = " + c4.getEntryCount() );
- c0.displayCacheEntries( "List items in cache after timeout " );
- c1.displayCacheEntries( "List items in cache after timeout " );
- c2.displayCacheEntries( "List items in cache after timeout " );
- c3.displayCacheEntries( "List items in cache after timeout " );
- c4.displayCacheEntries( "List items in cache after timeout " );
+ c0.displayCacheEntries( "List items in cache after timeout " );
+ c1.displayCacheEntries( "List items in cache after timeout " );
+ c2.displayCacheEntries( "List items in cache after timeout " );
+ c3.displayCacheEntries( "List items in cache after timeout " );
+ c4.displayCacheEntries( "List items in cache after timeout " );
}
-
+
success = 0;
failure = 0;
@@ -318,7 +318,7 @@
System.out.println ( "\nActual failure count = " + failure );
timer.cancel();
-
+
} //main()
} //Client {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml
index 6bda49e..e881b1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/build.xml
@@ -61,16 +61,16 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-timer tests)
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-timer tests)
- ant mdbtimer (Executes the ejb-timer mdbtimer
+ ant mdbtimer (Executes the ejb-timer mdbtimer
- ant sessiontimer (Executes the ejb-timer sessiontimer test)
- ant timertests (Executes the ejb-timer timertests test)
- ant timerserialization (Executes the ejb-timer serialization test)
+ ant sessiontimer (Executes the ejb-timer sessiontimer test)
+ ant timertests (Executes the ejb-timer timertests test)
+ ant timerserialization (Executes the ejb-timer serialization test)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties
index 804c74f..31816a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-mdbtimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml
index 4d62c9c..a59a067 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
index 6def4a3..c532dc7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/client/Client.java
@@ -46,7 +46,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -67,20 +67,20 @@
public void setup() throws Exception {
context = new InitialContext();
-
- QueueConnectionFactory queueConFactory =
+
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/FooCF");
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
targetDest = (jakarta.jms.Queue) context.lookup("java:comp/env/jms/MsgBeanQueue");
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(targetDest);
+ queueSender = queueSession.createSender(targetDest);
clientDest = (jakarta.jms.Queue) context.lookup("java:comp/env/jms/ClientQueue");
@@ -101,7 +101,7 @@
}
}
- public void sendMsg(Message msg)
+ public void sendMsg(Message msg)
throws JMSException {
System.out.println("Sending message to " +
" at time " + System.currentTimeMillis());
@@ -114,7 +114,7 @@
System.out.println("Waiting for queue message ");
Message recvdmessage = queueReceiver.receive(timeout);
if( recvdmessage != null ) {
- System.out.println("Received message : " + recvdmessage +
+ System.out.println("Received message : " + recvdmessage +
" at " + new Date());
} else {
System.out.println("timeout after " + timeout + " seconds");
@@ -131,11 +131,11 @@
ObjectMessage recvMsg1 = (ObjectMessage) recvQueueMsg(20000);
Date cancellation = (Date) recvMsg1.getObject();
-
+
Date now = new Date();
-
+
// wait for message after timer is cancelled (plus some buffer time)
- long wait = now.before(cancellation) ?
+ long wait = now.before(cancellation) ?
(cancellation.getTime() - now.getTime()) + 30000 : 0;
System.out.println("Timer will be cancelled after " + cancellation);
System.out.println("Waiting for cancellation notification until " +
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
index ba895ed..14e589e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
@@ -22,7 +22,7 @@
import javax.naming.*;
import java.util.Date;
-public class MessageBean
+public class MessageBean
implements MessageDrivenBean, MessageListener,TimedObject {
private MessageDrivenContext mdc;
@@ -53,7 +53,7 @@
System.out.println("Sending message " + message);
sender.send(message);
System.out.println("message sent");
-
+
} catch(NamingException e) {
e.printStackTrace();
}
@@ -90,7 +90,7 @@
Date now = new Date();
Date expire = new Date(now.getTime() + 25000);
System.out.println("Creating periodic timer at " + now);
- Timer t = mdc.getTimerService().createTimer(10000, 10000,
+ Timer t = mdc.getTimerService().createTimer(10000, 10000,
expire);
System.out.println("Timer will be cancelled on first expiration after " +
expire);
@@ -100,7 +100,7 @@
System.out.println("Sending message " + outMessage);
sender.send(outMessage);
System.out.println("message sent");
-
+
} catch(Exception e) {
System.out.println("got exception in message bean");
e.printStackTrace();
@@ -117,16 +117,16 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
- System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
+ this.mdc = mdc;
+ System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
}
public void ejbCreate() throws RemoteException {
- System.out.println("In MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In MessageDrivenEJB::ejbCreate !!");
}
public void ejbRemove() {
- System.out.println("In MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In MessageDrivenEJB::ejbRemove !!");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties
index 88836a2..4c33a60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-restore"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml
index c6cc82c..e727798 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,14 +47,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -64,7 +64,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -78,14 +78,14 @@
<param name="appclient.application.args" value="restore"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
index fe5c5c0..f06a6bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
@@ -31,9 +31,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
String jndiName = "ejb/ejb_timer_sessiontimer_TimerSession";
@@ -55,12 +55,12 @@
if( args.length == 1) {
afterRestart = args[0].equalsIgnoreCase("restore");
- }
+ }
}
public String doTest() {
String result = kTestPassed;
- QueueConnection connection = null;
+ QueueConnection connection = null;
TimerSession remoteObj = null;
String testName = jndiName;
@@ -68,18 +68,18 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
System.out.println("Doing timer test for " + jndiName);
java.lang.Object objref = ic.lookup("java:comp/env/" + ejbName);
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---TimerSessionHome---" +
+ System.out.println("---TimerSessionHome---" +
TimerSessionHome.class.getClassLoader());
System.err.println("Looked up home!!");
@@ -87,7 +87,7 @@
TimerSessionHome home = (TimerSessionHome)
PortableRemoteObject.narrow(objref, TimerSessionHome.class);
-
+
remoteObj = home.create();
String otherServer1 = "foo";
@@ -96,59 +96,59 @@
testName = "afterRestart";
System.out.println("Migrating timers from " + otherServer1);
remoteObj.migrateTimersFrom(otherServer1);
-
+
} else {
remoteObj.createTimer(5000, 0, "timer1");
remoteObj.createTimer(30000, 0, "timer2");
remoteObj.createTimer(60000000, 0, "timer3");
remoteObj.createTimer(5000, 12000, "timer4");
remoteObj.createTimer(5000, 30000, "timer5");
- remoteObj.createTimer(5000, 100000000, "timer6");
-
+ remoteObj.createTimer(5000, 100000000, "timer6");
+
// simulate creation of timers within another server
// instance. none of these should timeout until we
// do a migration
-
+
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer7",
- 1000, 0,
+ 1000, 0,
"other_timer7");
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer8",
- 10000000000L, 0,
- "other_timer8");
-
+ 10000000000L, 0,
+ "other_timer8");
+
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer9",
- 1000, 10000000000L,
+ 1000, 10000000000L,
"other_timer9");
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer10",
- 100000000, 1000,
+ 100000000, 1000,
"other_timer10");
remoteObj.createTimerInOtherServer
(otherServer1, "other_timer11",
- 30000, 100000000,
+ 30000, 100000000,
"other_timer11");
// create a couple of timers for another simulated
// server. we will not be migrating these timers, so
// by verifying that we don't get notifications from these
// timers we test that the migration only happens for
- // the specified server.
+ // the specified server.
remoteObj.createTimerInOtherServer
("bar", "bar_timer12", 1000, 0, "bar_timer12");
remoteObj.createTimerInOtherServer
("bar", "bar_timer13", 1000, 1000, "bar_timer13");
-
+
}
-
+
QueueConnectionFactory qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
System.out.println (" qcFactory = " + qcFactory);
@@ -157,7 +157,7 @@
System.out.println (" queue = " + queue);
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueReceiver receiver = session.createReceiver(queue);
connection.start();
@@ -167,7 +167,7 @@
if( afterRestart ) {
toReceive.add("timer2");
toReceive.add("timer4");
- toReceive.add("timer5");
+ toReceive.add("timer5");
// migrated timers
toReceive.add("other_timer7");
@@ -181,37 +181,37 @@
toReceive.add("timer6");
}
- long waitTime = afterRestart ?
+ long waitTime = afterRestart ?
40000 : 10000;
-
+
while(true) {
System.out.println("Waiting for message");
Message message = receiver.receive(waitTime);
TextMessage textMsg = (TextMessage)message;
-
- if ( (message == null) ||
+
+ if ( (message == null) ||
(! toReceive.contains(textMsg.getText())) ) {
- throw new Exception("Received a invalid message " +
+ throw new Exception("Received a invalid message " +
message + " TimeOut failed!!");
- }
+ }
received.add(textMsg.getText());
- System.out.println("Received Message : " +
+ System.out.println("Received Message : " +
textMsg.getText());
- System.out.println("Messages received so far : " +
- received);
+ System.out.println("Messages received so far : " +
+ received);
if( received.equals(toReceive) ) {
System.out.println("Got all expected messages");
break;
}
}
-
+
stat.addStatus("sessiontimer " + testName, stat.PASS);
if( afterRestart ) {
remoteObj.deleteTimers();
- }
+ }
} catch(Exception e) {
System.out.println("TimerSession : " + testName + " test failed");
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
index b67ce95..165a2ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
@@ -27,7 +27,7 @@
public void migrateTimersFrom(String owner) throws RemoteException;
- public void createTimerInOtherServer(String owner, String timerId,
+ public void createTimerInOtherServer(String owner, String timerId,
long initialExpiration,
long intervalDuration, String info)
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
index 9d4b1c7..1a85612 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
@@ -38,35 +38,35 @@
import com.sun.ejb.containers.TimerBean;
-public class TimerSessionEJB implements TimedObject, SessionBean
+public class TimerSessionEJB implements TimedObject, SessionBean
{
private SessionContext context;
private QueueConnection connection;
private QueueSession session;
private Queue queue;
private QueueSender sender;
-
+
public void ejbCreate() throws RemoteException {}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void setSessionContext(SessionContext sc) {
context = sc;
}
-
-
+
+
// business method to create a timer
public TimerHandle createTimer(long initialDelay, long interval,
String msg) {
-
+
try {
System.out.println("Calling getMessageContext");
context.getMessageContext();
} catch(IllegalStateException ise) {
System.out.println("getMessageContext() successfully threw illegalStateException");
}
-
-
+
+
TimerService timerService = context.getTimerService();
Timer timer;
if( interval == 0 ) {
@@ -77,15 +77,15 @@
}
return timer.getHandle();
}
-
- public void createTimerInOtherServer(String owner, String timerId,
+
+ public void createTimerInOtherServer(String owner, String timerId,
long initialExpiration,
long intervalDuration, String info) {
try {
Date now = new Date();
- TimerBean.testCreate(timerId, context, owner,
- new Date(now.getTime() + initialExpiration),
+ TimerBean.testCreate(timerId, context, owner,
+ new Date(now.getTime() + initialExpiration),
intervalDuration,
info);
} catch(Exception e) {
@@ -96,7 +96,7 @@
}
public void migrateTimersFrom(String owner) {
-
+
TimerBean.testMigrate(owner);
}
@@ -114,31 +114,31 @@
// timer callback method
public void ejbTimeout(Timer timer) {
-
+
String info = (String) timer.getInfo();
System.out.println("Got ejbTimeout for timer " + info);
-
+
try {
System.out.println("Calling getMessageContext");
context.getMessageContext();
} catch(IllegalStateException ise) {
System.out.println("getMessageContext() successfully threw illegalStateException");
}
-
-
+
+
// add message to queue
try {
-
-
+
+
InitialContext ic = new InitialContext();
QueueConnectionFactory qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
Queue queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
connection = qcFactory.createQueueConnection();
-
+
QueueSession session = connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
sender = session.createSender(queue);
-
+
TextMessage message = session.createTextMessage();
message.setText(info);
System.out.println("Sending time out message");
@@ -160,7 +160,7 @@
}
}
}
-
+
public void ejbActivate() {}
public void ejbPassivate() {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
index 1c04f5d..5053cdc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
@@ -21,5 +21,5 @@
import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
- TimerSession create() throws CreateException, RemoteException;
+ TimerSession create() throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties
index 25b18c7..90ee31e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-sessiontimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml
index d55777e..e24a9e2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/TimerSingletonRemote.class,**/TimerSessionHome.class,**/TimerSession.class,**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
index 7f525df..253847c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
@@ -35,9 +35,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
String jndiName = "ejb/ejb_timer_sessiontimer_TimerSession";
@@ -67,44 +67,44 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
System.out.println("Doing timer test for " + jndiName);
//PG-> Object objref = ic.lookup(jndiName);
// java.lang.Object objref = ic.lookup("java:comp/env/" + ejbName);
- java.lang.Object objref = ic.lookup("ejb/ejb_timer_sessiontimer_TimerSession");
+ java.lang.Object objref = ic.lookup("ejb/ejb_timer_sessiontimer_TimerSession");
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---TimerSessionHome---" +
+ System.out.println("---TimerSessionHome---" +
TimerSessionHome.class.getClassLoader());
System.err.println("Looked up home!!");
- TimerSingletonRemote tsr = (TimerSingletonRemote)
- ic.lookup("ejb/ejb_timer_sessiontimer_TimerSingleton");
+ TimerSingletonRemote tsr = (TimerSingletonRemote)
+ ic.lookup("ejb/ejb_timer_sessiontimer_TimerSingleton");
// clear out singleton state. This allows multiple test
// runs without having to redeploy
- tsr.startTest();
+ tsr.startTest();
TimerSessionHome home = (TimerSessionHome)
PortableRemoteObject.narrow(objref, TimerSessionHome.class);
-
+
remoteObj = home.create();
- int timeoutInSeconds = 5;
+ int timeoutInSeconds = 5;
TimerHandle handle = remoteObj.createTimer(timeoutInSeconds * 1000);
System.out.println("Waiting for message");
- boolean gotTimeout = tsr.waitForTimeout(timeoutInSeconds * 2);
+ boolean gotTimeout = tsr.waitForTimeout(timeoutInSeconds * 2);
- // @@@
- System.out.println("TimerSession : jndi lookup for -> " +
+ // @@@
+ System.out.println("TimerSession : jndi lookup for -> " +
jndiName + " <- test passed!!");
-
+
stat.addStatus("sessiontimer " + jndiName, stat.PASS);
} catch(Exception e) {
System.out.println("TimerSession : " + jndiName + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml
index 9fcb2a3..54a4bfb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/application-client.xml
@@ -32,5 +32,5 @@
<remote>com.sun.s1asdev.ejb.timer.sessiontimer.TimerSingletonRemote</remote>
<ejb-link>TimerSingleton</ejb-link>
</ejb-ref>
-
+
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
index 0ea8635..b878e40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
@@ -20,6 +20,6 @@
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
- public TimerHandle createTimer(int ms) throws RemoteException;
+ public TimerHandle createTimer(int ms) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
index 3262ecb..6d05ef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
@@ -26,26 +26,26 @@
import java.rmi.RemoteException;
import javax.naming.*;
-public class TimerSessionEJB implements TimedObject, SessionBean
+public class TimerSessionEJB implements TimedObject, SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private TimerSingleton singleton;
- public void ejbCreate() throws RemoteException {
-
- singleton = (TimerSingleton)
- context.lookup("java:module/TimerSingleton!com.sun.s1asdev.ejb.timer.sessiontimer.TimerSingleton");
+ public void ejbCreate() throws RemoteException {
- }
+ singleton = (TimerSingleton)
+ context.lookup("java:module/TimerSingleton!com.sun.s1asdev.ejb.timer.sessiontimer.TimerSingleton");
- public void ejbRemove() throws RemoteException {}
+ }
- public void setSessionContext(SessionContext sc) {
- context = sc;
- }
+ public void ejbRemove() throws RemoteException {}
- // business method to create a timer
- public TimerHandle createTimer(int ms) {
+ public void setSessionContext(SessionContext sc) {
+ context = sc;
+ }
+
+ // business method to create a timer
+ public TimerHandle createTimer(int ms) {
try {
System.out.println("Calling getMessageContext");
@@ -54,13 +54,13 @@
System.out.println("getMessageContext() successfully threw illegalStateException");
}
- TimerService timerService = context.getTimerService();
- Timer timer = timerService.createTimer(ms, "created timer");
- return timer.getHandle();
- }
+ TimerService timerService = context.getTimerService();
+ Timer timer = timerService.createTimer(ms, "created timer");
+ return timer.getHandle();
+ }
- // timer callback method
- public void ejbTimeout(Timer timer) {
+ // timer callback method
+ public void ejbTimeout(Timer timer) {
try {
System.out.println("Calling getMessageContext");
context.getMessageContext();
@@ -68,10 +68,10 @@
System.out.println("getMessageContext() successfully threw illegalStateException");
}
- singleton.setTimeoutReceived();
+ singleton.setTimeoutReceived();
- }
+ }
- public void ejbActivate() {}
- public void ejbPassivate() {}
+ public void ejbActivate() {}
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
index 14113b3..8943140 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
@@ -21,5 +21,5 @@
import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
- TimerSession create() throws CreateException, RemoteException;
+ TimerSession create() throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
index b2e5d16..b9b3e6f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
@@ -25,35 +25,35 @@
@Lock(LockType.READ)
public class TimerSingleton
{
-
+
boolean timeoutReceived = false;
public void startTest() {
- timeoutReceived = false;
+ timeoutReceived = false;
}
public void setTimeoutReceived() {
- System.out.println("TimerSingleton::setTimeoutReceived()");
- timeoutReceived = true;
+ System.out.println("TimerSingleton::setTimeoutReceived()");
+ timeoutReceived = true;
}
public boolean waitForTimeout(int seconds) {
- int i = 0;
- while(i < seconds) {
- i++;
- try {
- Thread.sleep(1000);
- if( timeoutReceived ) {
- System.out.println("Got timeout after " +
- i + " seconds");
- break;
- }
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e);
- }
- }
- return timeoutReceived;
+ int i = 0;
+ while(i < seconds) {
+ i++;
+ try {
+ Thread.sleep(1000);
+ if( timeoutReceived ) {
+ System.out.println("Got timeout after " +
+ i + " seconds");
+ break;
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ throw new EJBException(e);
+ }
+ }
+ return timeoutReceived;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
index 4594dda..e467809 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
@@ -22,7 +22,7 @@
public interface TimerSingletonRemote {
public void startTest();
-
+
public boolean waitForTimeout(int seconds);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties
index 7feeb49..4c60348 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-sessiontimersecurity"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml
index aef59b2..90da12e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -50,14 +50,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common,delete-user">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -84,10 +84,10 @@
<env key="VMARGS" value="-Dj2eelogin.name=principalName -Dj2eelogin.password=principalName" />
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="create-user">
<antcall target="create-user-common">
@@ -97,14 +97,14 @@
</antcall>
<antcall target="reconfig-common"/>
</target>
-
+
<target name="delete-user">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
<param name="user" value="principalName"/>
</antcall>
</target>
-
+
<target name="restart">
<antcall target="restart-server-instance-common"/>
</target>
@@ -114,7 +114,7 @@
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
index 9edcdf0..2c93f34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
@@ -29,9 +29,9 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
-
- private static SimpleReporterAdapter stat =
+
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
String jndiName = "ejb/ejb_timer_sessiontimersecurity_TimerSession";
@@ -55,24 +55,24 @@
public String doTest() {
String result = kTestPassed;
- QueueConnection connection = null;
+ QueueConnection connection = null;
TimerSession remoteObj = null;
String ejbName = "ejbs/Timer";
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref " + ejbName);
System.out.println("Doing timer test for " + jndiName);
java.lang.Object objref = ic.lookup("java:comp/env/" + ejbName);
- System.out.println("---ejb stub---" +
+ System.out.println("---ejb stub---" +
objref.getClass().getClassLoader());
- System.out.println("---ejb classname---" +
+ System.out.println("---ejb classname---" +
objref.getClass().getName());
- System.out.println("---TimerSessionHome---" +
+ System.out.println("---TimerSessionHome---" +
TimerSessionHome.class.getClassLoader());
System.err.println("Looked up home!!");
@@ -80,11 +80,11 @@
TimerSessionHome home = (TimerSessionHome)
PortableRemoteObject.narrow(objref, TimerSessionHome.class);
-
+
remoteObj = home.create();
- remoteObj.dummyBusinessMethod();
+ remoteObj.dummyBusinessMethod();
TimerHandle handle = remoteObj.createTimer(5000);
-
+
QueueConnectionFactory qcFactory = (QueueConnectionFactory)
ic.lookup("jms/ejb_timer_sessiontimersecurity_TQCF");
System.out.println (" qcFactory = " + qcFactory);
@@ -93,7 +93,7 @@
System.out.println (" queue = " + queue);
connection = qcFactory.createQueueConnection();
- QueueSession session =
+ QueueSession session =
connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
QueueReceiver receiver = session.createReceiver(queue);
connection.start();
@@ -101,14 +101,14 @@
Message message = receiver.receive(45000);
TextMessage textMsg = (TextMessage)message;
- if ( (message == null) ||
+ if ( (message == null) ||
(! textMsg.getText().equals("ejbTimeout() invoked")))
- throw new Exception("Received a null message ... TimeOut failed!!");
- System.out.println("Message : " + message);
-
- System.out.println("TimerSession : jndi lookup for -> " +
+ throw new Exception("Received a null message ... TimeOut failed!!");
+ System.out.println("Message : " + message);
+
+ System.out.println("TimerSession : jndi lookup for -> " +
jndiName + " <- test passed!!");
-
+
stat.addStatus("sessiontimersecurity " + jndiName, stat.PASS);
} catch(Exception e) {
System.out.println("TimerSession : " + jndiName + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
index acfc21a..95c48f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
@@ -20,8 +20,8 @@
import java.rmi.RemoteException;
public interface TimerSession extends EJBObject {
- public TimerHandle createTimer(int ms) throws RemoteException;
+ public TimerHandle createTimer(int ms) throws RemoteException;
- public void dummyBusinessMethod() throws RemoteException;
+ public void dummyBusinessMethod() throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
index e205ecc..cb1f970 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
@@ -33,42 +33,42 @@
import jakarta.jms.TextMessage;
import javax.naming.*;
-public class TimerSessionEJB implements TimedObject, SessionBean
+public class TimerSessionEJB implements TimedObject, SessionBean
{
- private SessionContext context;
- private QueueConnection connection;
- private QueueSession session;
- private Queue queue;
- private QueueSender sender;
+ private SessionContext context;
+ private QueueConnection connection;
+ private QueueSession session;
+ private Queue queue;
+ private QueueSender sender;
- public void ejbCreate() throws RemoteException {}
+ public void ejbCreate() throws RemoteException {}
- public void ejbRemove() throws RemoteException {}
+ public void ejbRemove() throws RemoteException {}
- public void setSessionContext(SessionContext sc) {
- context = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ context = sc;
+ }
- // business method to create a timer
+ // business method to create a timer
public void dummyBusinessMethod() {
try {
- System.out.println("dummyBusinessMethod(): getCallerPrincipal() = "
+ System.out.println("dummyBusinessMethod(): getCallerPrincipal() = "
+ context.getCallerPrincipal());
- System.out.println("dummyBusinessMethod(): isCallerInRole(foo) = "
+ System.out.println("dummyBusinessMethod(): isCallerInRole(foo) = "
+ context.isCallerInRole("foo"));
} catch(IllegalStateException ise) {
System.out.println(
- "dummyBusinessMethod(): isCallerInRole should not throw "
+ "dummyBusinessMethod(): isCallerInRole should not throw "
+ "illegalstateexception in business method");
throw ise;
}
}
- public TimerHandle createTimer(int ms) {
+ public TimerHandle createTimer(int ms) {
System.out.println("Calling createTimer");
- System.out.println("createTimer(): getCallerPrincipal() = "
+ System.out.println("createTimer(): getCallerPrincipal() = "
+ context.getCallerPrincipal());
- System.out.println("createTimer(): isCallerInRole(foo) = "
+ System.out.println("createTimer(): isCallerInRole(foo) = "
+ context.isCallerInRole("foo"));
try {
System.out.println("Calling isCallerInRole");
@@ -78,7 +78,7 @@
throw new Exception("isCallerInRole() should not fail in a business method");
}
} catch(IllegalStateException ise) {
- System.out.println("isCallerInRole should not throw "
+ System.out.println("isCallerInRole should not throw "
+ "illegalstateexception in business method");
throw ise;
} catch(Exception ise) {
@@ -93,22 +93,22 @@
}
- TimerService timerService = context.getTimerService();
- Timer timer = timerService.createTimer(ms, "created timer");
- return timer.getHandle();
- }
+ TimerService timerService = context.getTimerService();
+ Timer timer = timerService.createTimer(ms, "created timer");
+ return timer.getHandle();
+ }
- // timer callback method
- public void ejbTimeout(Timer timer) {
+ // timer callback method
+ public void ejbTimeout(Timer timer) {
try {
System.out.println("Calling ejbTimeout");
java.security.Principal principal = context.getCallerPrincipal();
- System.out.println("In ejbTimeout(): getCallerPrincipal(), principal - "
+ System.out.println("In ejbTimeout(): getCallerPrincipal(), principal - "
+ principal);
- System.out.println("In ejbTimeout(): isCallerInRole(foo), result - "
+ System.out.println("In ejbTimeout(): isCallerInRole(foo), result - "
+ context.isCallerInRole("foo"));
} catch(IllegalStateException ise) {
- System.out.println("ejbTimeout(): getCallerPrincipal() failed by "
+ System.out.println("ejbTimeout(): getCallerPrincipal() failed by "
+ "throwing IllegalStateException");
}
try {
@@ -119,7 +119,7 @@
System.out.println("ejbTimeout(): isCallerInRole() failed" );
}
} catch(IllegalStateException ise) {
- System.out.println("ejbTimeout(): isCallerInRole() failed by "
+ System.out.println("ejbTimeout(): isCallerInRole() failed by "
+ "throwing IllegalStateException");
}
@@ -127,46 +127,46 @@
System.out.println("Calling getMessageContext");
context.getMessageContext();
} catch(IllegalStateException ise) {
- System.out.println("ejbTimeout(): getMessageContext() successfully "
+ System.out.println("ejbTimeout(): getMessageContext() successfully "
+ "threw IllegalStateException");
}
- // add message to queue
- try {
+ // add message to queue
+ try {
- InitialContext ic = new InitialContext();
- QueueConnectionFactory qcFactory = (QueueConnectionFactory)
- ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- Queue queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
- connection = qcFactory.createQueueConnection();
+ InitialContext ic = new InitialContext();
+ QueueConnectionFactory qcFactory = (QueueConnectionFactory)
+ ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
+ Queue queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
+ connection = qcFactory.createQueueConnection();
- QueueSession session = connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- sender = session.createSender(queue);
+ QueueSession session = connection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ sender = session.createSender(queue);
- TextMessage message = session.createTextMessage();
- message.setText("ejbTimeout() invoked");
- System.out.println("Sending time out message");
- sender.send(message);
- System.out.println("Time out message sent");
- } catch(NamingException e) {
- e.printStackTrace();
- } catch(JMSException e) {
- e.printStackTrace();
- }
- finally {
- try {
- if(connection != null) {
- connection.close();
+ TextMessage message = session.createTextMessage();
+ message.setText("ejbTimeout() invoked");
+ System.out.println("Sending time out message");
+ sender.send(message);
+ System.out.println("Time out message sent");
+ } catch(NamingException e) {
+ e.printStackTrace();
+ } catch(JMSException e) {
+ e.printStackTrace();
+ }
+ finally {
+ try {
+ if(connection != null) {
+ connection.close();
connection = null;
- }
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
- }
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
- public void ejbActivate() {}
- public void ejbPassivate() {}
+ public void ejbActivate() {}
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
index c5ddff3..9523096 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
@@ -21,5 +21,5 @@
import jakarta.ejb.CreateException;
public interface TimerSessionHome extends EJBHome {
- TimerSession create() throws CreateException, RemoteException;
+ TimerSession create() throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties
index e00b246..809bb62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-timerserialization-sessiontimer"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml
index 7b01592..4f87569 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,14 +48,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class, **/*SFSB*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -67,7 +67,7 @@
</antcall>
-->
</target>
-
+
<target name="delete-resources" depends="init-common">
<!--
<antcall target="asadmin-batch-common">
@@ -79,14 +79,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
index e0c183d..9a991d4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
@@ -34,8 +34,8 @@
public static String kTestNotRun = "TEST NOT RUN";
public static String kTestPassed = "TEST PASSED";
public static String kTestFailed = "TEST FAILED";
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final int MAX_TIMERS = 60;
@@ -50,11 +50,11 @@
client.doTest();
System.out.println("[TimerSerializationClinet] DONE doTest()...");
stat.printSummary("timerserialization");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
initSFSBList(); //create MAX_TIMERS
@@ -172,7 +172,7 @@
TimerSFSB sfsb = (TimerSFSB) sfsbList.get(i);
String timerName = sfsb.getName();
System.out.println("Accessing Timer bean for: " + timerName);
- sfsb.cancelTimer();
+ sfsb.cancelTimer();
System.out.println("Successfully accessed Timer bean for: " + timerName);
stat.addStatus("ejbclient cancelTimers", stat.PASS);
@@ -185,4 +185,4 @@
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
index a6f5a5b..ff53100 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
@@ -23,19 +23,19 @@
extends EJBObject
{
- public void createTimer(int ms)
+ public void createTimer(int ms)
throws RemoteException;
- public String getName()
+ public String getName()
throws RemoteException;
- public long getTimeRemaining()
+ public long getTimeRemaining()
throws RemoteException;
- public TimerHandle getTimerHandle()
+ public TimerHandle getTimerHandle()
throws RemoteException;
- public void cancelTimer()
+ public void cancelTimer()
throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
index 4a1ad6b..8c8ac66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
@@ -31,14 +31,14 @@
import java.rmi.RemoteException;
public class TimerSFSBEJB
- implements SessionBean
+ implements SessionBean
{
- private SessionContext context;
+ private SessionContext context;
private String timerName;
private Context initialCtx;
private Timer timer;
- public void ejbCreate(String timerName) {
+ public void ejbCreate(String timerName) {
this.timerName = timerName;
}
@@ -46,31 +46,31 @@
return this.timerName;
}
- public void setSessionContext(SessionContext sc) {
- this.context = sc;
+ public void setSessionContext(SessionContext sc) {
+ this.context = sc;
try {
this.initialCtx = new InitialContext();
} catch (Throwable th) {
th.printStackTrace();
}
- }
+ }
- // business method to create a timer
- public void createTimer(int ms)
+ // business method to create a timer
+ public void createTimer(int ms)
throws RemoteException
{
try {
InitialContext initialCtx = new InitialContext();
TimerSLSBHome home = (TimerSLSBHome) initialCtx.lookup("java:comp/env/ejb/TimerSLSB");
- TimerSLSB slsb = (TimerSLSB) home.create();
- timer = slsb.createTimer(ms);
+ TimerSLSB slsb = (TimerSLSB) home.create();
+ timer = slsb.createTimer(ms);
System.out.println ("PG-> after createTimer()");
} catch (Exception ex) {
throw new RemoteException("Exception during TimerSFSBEJB::createTimer", ex);
}
- }
+ }
- public long getTimeRemaining() {
+ public long getTimeRemaining() {
long timeRemaining = -1;
try {
timeRemaining = timer.getTimeRemaining();
@@ -80,7 +80,7 @@
return timeRemaining;
}
- public TimerHandle getTimerHandle() {
+ public TimerHandle getTimerHandle() {
TimerHandle handle = null;
try {
handle = timer.getHandle();
@@ -90,7 +90,7 @@
return handle;
}
- public void cancelTimer() {
+ public void cancelTimer() {
try {
timer.cancel();
} catch(NoSuchObjectLocalException nsole) {
@@ -99,13 +99,13 @@
}
- public void ejbRemove() {}
+ public void ejbRemove() {}
- public void ejbActivate() {
+ public void ejbActivate() {
System.out.println ("In TimerSFSB.activate()");
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In TimerSFSB.passivate()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
index 9c6f951..f6c08cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
@@ -23,6 +23,6 @@
public interface TimerSFSBHome
extends EJBHome
{
- public TimerSFSB create(String timerName)
+ public TimerSFSB create(String timerName)
throws CreateException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
index 4016262..3d40f15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
@@ -22,7 +22,7 @@
extends EJBLocalObject
{
- public Timer createTimer(int ms);
+ public Timer createTimer(int ms);
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
index de0c8c5..da54962 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
@@ -24,35 +24,35 @@
import jakarta.ejb.SessionContext;
public class TimerSLSBEJB
- implements TimedObject, SessionBean
+ implements TimedObject, SessionBean
{
- private SessionContext context;
+ private SessionContext context;
- public void ejbCreate() {}
+ public void ejbCreate() {}
- public void setSessionContext(SessionContext sc) {
- context = sc;
- }
+ public void setSessionContext(SessionContext sc) {
+ context = sc;
+ }
- // business method to create a timer
- public Timer createTimer(int ms) {
- TimerService timerService = context.getTimerService();
- Timer timer = timerService.createTimer(ms, "created timer");
- return timer;
- }
+ // business method to create a timer
+ public Timer createTimer(int ms) {
+ TimerService timerService = context.getTimerService();
+ Timer timer = timerService.createTimer(ms, "created timer");
+ return timer;
+ }
- // timer callback method
- public void ejbTimeout(Timer timer) {
- System.out.println("TimerSLSB::ejbTimeout() invoked");
- }
-
- public void ejbRemove() {}
+ // timer callback method
+ public void ejbTimeout(Timer timer) {
+ System.out.println("TimerSLSB::ejbTimeout() invoked");
+ }
- public void ejbActivate() {
+ public void ejbRemove() {}
+
+ public void ejbActivate() {
System.out.println ("In TimerSLSB.activate()");
}
- public void ejbPassivate() {
+ public void ejbPassivate() {
System.out.println ("In TimerSLSB.passivate()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
index c65e500..607c9da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
@@ -22,6 +22,6 @@
public interface TimerSLSBHome
extends EJBLocalHome
{
- TimerSLSB create()
+ TimerSLSB create()
throws CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties
index 65edb2a..14eb1e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-timer-timertests"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="Bar.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml
index 9c4116a..7a5ec5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/TimerStuff*.class,**/AppInfo.class,**/Bar.class,**/BarHome.class,**/BarPrimaryKey.class,**/Foo.class,**/FooHome.class,**/Stateful.class,**/StatefulHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -63,7 +63,7 @@
<param name="asadmin.file" value="create_resources.asadmin"/>
</antcall>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -73,14 +73,14 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
index 3157547..82cef32 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
@@ -48,10 +48,10 @@
private QueueSender queueSender;
*/
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String args[]) {
+ public static void main(String args[]) {
boolean doJms = false; // TODO (args.length == 1) && (args[0].equalsIgnoreCase("jms"));
stat.addDescription("ejb-timer-timertests");
@@ -63,18 +63,18 @@
TimerStuff foo = new Client().doFooTest("ejbs/Foo_BMT", doJms);
- /** TODO
+ /** TODO
new Client().doMessageDrivenTest("jms/TimerMDBQueue_CMT", foo, doJms);
new Client().doMessageDrivenTest("jms/TimerMDBQueue_BMT", foo, doJms);
- **/
+ **/
- new Client().doStatefulTest("ejbs/Stateful_CMT", foo,doJms);
- new Client().doStatefulTest("ejbs/Stateful_BMT", foo, doJms);
+ new Client().doStatefulTest("ejbs/Stateful_CMT", foo,doJms);
+ new Client().doStatefulTest("ejbs/Stateful_BMT", foo, doJms);
new Client().doBarTest("ejbtimer/Bar_CMT", doJms);
try {
- ((Foo) foo).remove();
+ ((Foo) foo).remove();
} catch(Exception e) {
e.printStackTrace();
}
@@ -95,16 +95,16 @@
public void doMessageDrivenTest(String jndiName, TimerStuff foo,
boolean jms) {
- /**
+ /**
if( jms ) { return; }
try {
System.out.println("********PG-> in doMessageDrivenTest() for jndiName = " + jndiName );
-
+
setup();
System.out.println("********PG-> in doMessageDrivenTest() after setup");
Context ic = new InitialContext();
- Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
+ Queue messageDrivenDest = (Queue) ic.lookup("java:comp/env/" + jndiName);
System.out.println("Doing message driven tests for" + jndiName);
@@ -122,7 +122,7 @@
long sleepTime = 30000;
System.out.println("Sleeping for " + sleepTime / 1000 + " seconds");
Thread.sleep(sleepTime);
-
+
// at this point, all foo timers should have been cancelled
// by the message bean.
foo.assertNoTimers();
@@ -136,12 +136,12 @@
} finally {
cleanup();
}
- **/
+ **/
}
public void doBarTest(String jndiName, boolean jms) {
try {
- Object barObjref = context.lookup(jndiName);
+ Object barObjref = context.lookup(jndiName);
System.out.println("doBarTest(): Doing bar timer test for " + jndiName);
@@ -168,7 +168,7 @@
System.out.println("doBarTest(): Bar after find " );
}
if (jms) {
- doJmsTest(bar);
+ doJmsTest(bar);
} else {
doTest(bar);
((EJBObject)bar).remove();
@@ -185,21 +185,21 @@
}
public void setup() throws Exception {
- /**
+ /**
//PG-> context = new InitialContext();
-
- TopicConnectionFactory topicConFactory =
+
+ TopicConnectionFactory topicConFactory =
(TopicConnectionFactory) context.lookup
("java:comp/env/jms/MyTopicConnectionFactory");
-
+
System.out.println("********PG-> setup(): after lookup");
topicCon = topicConFactory.createTopicConnection();
System.out.println("********PG-> setup(): after createTopicConnection");
- topicSession =
+ topicSession =
topicCon.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
System.out.println("********PG-> setup(): after createTopicSession");
-
+
// Producer will be specified when actual msg is published.
topicPublisher = topicSession.createPublisher(null);
System.out.println("********PG-> setup(): after createPublisher");
@@ -207,25 +207,25 @@
topicCon.start();
System.out.println("********PG-> setup(): after start");
- QueueConnectionFactory queueConFactory =
+ QueueConnectionFactory queueConFactory =
(QueueConnectionFactory) context.lookup
("java:comp/env/jms/MyQueueConnectionFactory");
queueCon = queueConFactory.createQueueConnection();
queueSession = queueCon.createQueueSession
- (false, Session.AUTO_ACKNOWLEDGE);
+ (false, Session.AUTO_ACKNOWLEDGE);
// Producer will be specified when actual msg is sent.
- queueSender = queueSession.createSender(null);
+ queueSender = queueSession.createSender(null);
queueCon.start();
- **/
+ **/
}
public void cleanup() {
- /**
+ /**
try {
if( topicCon != null ) {
topicCon.close();
@@ -239,7 +239,7 @@
**/
}
/**
- public void publishMsgs(Topic topic, Message msg, int num)
+ public void publishMsgs(Topic topic, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + topic);
@@ -247,7 +247,7 @@
}
}
- public void sendMsgs(Queue queue, Message msg, int num)
+ public void sendMsgs(Queue queue, Message msg, int num)
throws JMSException {
for(int i = 0; i < num; i++) {
System.out.println("Publishing message " + i + " to " + queue);
@@ -327,37 +327,37 @@
System.out.println("doTest(): creating the timerhandle");
TimerHandle timerHandle = timerStuff.createTimer(1, 1);
-
+
//
System.out.println("doTest(): creating the timerhandle2");
TimerHandle timerHandle2 = timerStuff.createTimer(10000, 10000);
-
+
//
System.out.println("doTest(): creating the timerhandle3");
TimerHandle timerHandle3 = timerStuff.createTimer(new Date());
-
+
//
System.out.println("doTest(): creating the timerhandle4");
TimerHandle timerHandle4 = timerStuff.createTimer(new Date(new Date().getTime() + 2000));
-
+
//
System.out.println("doTest(): creating the timerhandle5");
TimerHandle timerHandle5 = timerStuff.createTimer(new Date(new Date().getTime() + 20000), 10000);
System.out.println("doTest(): creating the createTimerAndRollback");
timerStuff.createTimerAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancel");
timerStuff.createTimerAndCancel(20000);
-
+
// @@@ reevaluate double cancel logic
//timerStuff.createTimerAndCancelAndCancel(20000);
-
+
//
System.out.println("doTest(): creating the createTimerAndCancelAndRollback");
timerStuff.createTimerAndCancelAndRollback(20000);
-
+
//
System.out.println("doTest(): creating the cancelTimer(timerhandle2)");
timerStuff.cancelTimer(timerHandle2);
@@ -368,18 +368,18 @@
timerStuff.cancelTimerAndRollback(timerHandle5);
// @@@ reevaluate double cancel logic
//timerStuff.cancelTimerAndCancelAndRollback(timerHandle6);
-
- TimerHandle timerHandle7 =
+
+ TimerHandle timerHandle7 =
timerStuff.createTimer(1, 1, "cancelTimer");
- TimerHandle timerHandle8 =
+ TimerHandle timerHandle8 =
timerStuff.createTimer(1, 1, "cancelTimerAndRollback");
- TimerHandle timerHandle9 =
+ TimerHandle timerHandle9 =
timerStuff.createTimer(1, "cancelTimerAndRollback");
TimerHandle timerHandle11 = timerStuff.getTimeRemainingTest1(20);
timerStuff.getTimeRemainingTest2(20, timerHandle11);
timerStuff.getTimeRemainingTest2(20, timerHandle);
-
+
TimerHandle timerHandle12 = timerStuff.getNextTimeoutTest1(20);
timerStuff.getNextTimeoutTest2(20, timerHandle12);
timerStuff.getNextTimeoutTest2(20, timerHandle);
@@ -430,7 +430,7 @@
}
- public void doEntityTests(BarHome barHome)
+ public void doEntityTests(BarHome barHome)
throws Exception {
TimerStuff bar1 = barHome.create(new Long(1), "1");
TimerHandle timerHandle1 = bar1.createTimer(100000000);
@@ -454,7 +454,7 @@
info = bar5.getInfo(timerHandle5);
System.out.println("Info = " + info);
barHome.remove(((EJBObject)bar5).getPrimaryKey());
- // At this point timer should not exist since we removed its
+ // At this point timer should not exist since we removed its
// timed object
try {
info = bar5.getInfoNoError(timerHandle5);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
index 1ba18ae..bd61580 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/application-client.xml
@@ -67,14 +67,14 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/TimerMDBQueue_CMT</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
<message-destination-link>TimerMDBQueue_CMT</message-destination-link>
</message-destination-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/TimerMDBQueue_BMT</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
index 6f00dd0..eb5bdf8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
@@ -85,7 +85,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -112,7 +112,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -141,7 +141,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -173,7 +173,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -205,7 +205,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -237,7 +237,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
@@ -269,7 +269,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <message-destination-ref>
+ <message-destination-ref>
<description>timertest destination</description>
<message-destination-ref-name>jms/MyQueue</message-destination-ref-name>
<message-destination-type>jakarta.jms.Queue</message-destination-type>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java
index dd1c356..0baf70f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/AppInfo.java
@@ -28,6 +28,6 @@
public String toString()
{
- return foo;
+ return foo;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
index 897bb0a..b657ca7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
@@ -20,5 +20,5 @@
import jakarta.ejb.*;
public interface Bar extends EJBObject, TimerStuff {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
index 48c3cf6..ef915c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
@@ -19,9 +19,9 @@
import java.rmi.RemoteException;
import jakarta.ejb.*;
-public abstract class BarEJB
- extends TimerStuffImpl
- implements EntityBean, TimedObject
+public abstract class BarEJB
+ extends TimerStuffImpl
+ implements EntityBean, TimedObject
{
private EJBContext context_;
@@ -32,7 +32,7 @@
// primary key
- public abstract Long getId();
+ public abstract Long getId();
public abstract void setId(Long timerId);
public abstract String getValue2();
@@ -66,7 +66,7 @@
}
- public BarPrimaryKey ejbCreate(Long id, String value2)
+ public BarPrimaryKey ejbCreate(Long id, String value2)
throws CreateException {
String methodName = "ejbCreate";
System.out.println("In BarEJB::ejbCreate");
@@ -80,7 +80,7 @@
return new BarPrimaryKey(id, value2);
}
- public BarPrimaryKey ejbCreateWithTimer(Long id, String value2)
+ public BarPrimaryKey ejbCreateWithTimer(Long id, String value2)
throws CreateException {
String methodName = "ejbCreateWithTimer";
System.out.println("In BarEJB::ejbCreateWithTimer");
@@ -92,7 +92,7 @@
setValue2(value2);
return new BarPrimaryKey(id, value2);
}
-
+
public void ejbPostCreate(Long id, String value2) throws CreateException {
String methodName = "ejbPostCreate";
System.out.println("In BarEJB::ejbPostCreate");
@@ -113,7 +113,7 @@
TimerService timerService = context_.getTimerService();
Timer timer = timerService.createTimer
(1, 1, methodName + id);
-
+
} catch(Exception e) {
e.printStackTrace();
throw new CreateException(e.getMessage());
@@ -139,7 +139,7 @@
context_ = null;
}
- public void ejbHomeNewTimerAndRemoveBean(Long id, String value2)
+ public void ejbHomeNewTimerAndRemoveBean(Long id, String value2)
throws RemoteException {
String methodName = "ejbHomeNewTimerAndRemoveBean";
checkCallerSecurityAccess(methodName, true);
@@ -155,7 +155,7 @@
}
}
- public void ejbHomeNewTimerAndRemoveBeanAndRollback(Long id, String value2)
+ public void ejbHomeNewTimerAndRemoveBeanAndRollback(Long id, String value2)
throws RemoteException {
getTimerService("ejbHomeNewTimerAndRemoveBeanAndRollback", true);
doTimerStuff("ejbHomeNewTimerAndRemoveBeanAndRollback", false);
@@ -170,7 +170,7 @@
}
}
- public void ejbHomeNixBeanAndRollback(Bar b)
+ public void ejbHomeNixBeanAndRollback(Bar b)
throws RemoteException {
getTimerService("ejbHomeNixBeanAndRollback", true);
doTimerStuff("ejbHomeNixBeanAndRollback", false);
@@ -192,7 +192,7 @@
doTimerStuff(methodName, true);
cleanup();
}
-
+
public void ejbLoad() {
String methodName = "ejbLoad";
System.out.println("In BarEJB::ejbLoad");
@@ -201,7 +201,7 @@
getTimerService(methodName, true);
doTimerStuff(methodName, true);
}
-
+
public void ejbStore() {
String methodName = "ejbStore";
System.out.println("In BarEJB::ejbStore");
@@ -210,7 +210,7 @@
getTimerService(methodName, true);
doTimerStuff(methodName, true);
}
-
+
public void ejbPassivate() {
String methodName = "ejbPassivate";
checkCallerSecurityAccess(methodName, false);
@@ -218,7 +218,7 @@
getTimerService(methodName, true);
doTimerStuff(methodName, false);
}
-
+
public void ejbActivate() {
String methodName = "ejbActivate";
checkCallerSecurityAccess(methodName, false);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
index aeee37f..604c19b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
@@ -21,12 +21,12 @@
public interface BarHome extends EJBHome {
- Bar create(Long value1, String value2)
+ Bar create(Long value1, String value2)
throws CreateException, RemoteException;
- Bar createWithTimer(Long value1, String value2)
+ Bar createWithTimer(Long value1, String value2)
throws CreateException, RemoteException;
Bar findByPrimaryKey(BarPrimaryKey bpk) throws FinderException, RemoteException;
-
+
void newTimerAndRemoveBean(Long value1, String value2) throws RemoteException;
void newTimerAndRemoveBeanAndRollback(Long value1, String value2) throws RemoteException;
void nixBeanAndRollback(Bar b) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
index 328c637..70b58c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
@@ -34,21 +34,21 @@
public boolean equals(Object other)
{
- if ( other instanceof BarPrimaryKey ) {
+ if ( other instanceof BarPrimaryKey ) {
BarPrimaryKey bpk = (BarPrimaryKey) other;
- return ((id.equals(bpk.id))
+ return ((id.equals(bpk.id))
&& (value2.equals(bpk.value2)));
}
- return false;
+ return false;
}
public int hashCode()
{
- return id.hashCode();
+ return id.hashCode();
}
public String toString()
{
- return id + "_" + value2;
+ return id + "_" + value2;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
index 7d0b388..4a57b11 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
@@ -50,7 +50,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
setContext(sc);
System.out.println("In FooEJB::setSessionContext");
@@ -62,7 +62,7 @@
}
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbtimer.Foo::ejbCreate !!");
+ System.out.println("In ejbtimer.Foo::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -86,6 +86,6 @@
public void ejbPassivate() {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
index 0cc8fcd..ce0c74c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
@@ -20,7 +20,7 @@
import jakarta.jms.*;
import jakarta.ejb.*;
-public class MessageDrivenEJB extends TimerStuffImpl
+public class MessageDrivenEJB extends TimerStuffImpl
implements MessageDrivenBean, TimedObject, MessageListener {
private MessageDrivenContext mdc;
@@ -38,7 +38,7 @@
System.out.println("Received message " + info + " , redelivered = " + redelivered);
if (info.equals("test1") ) {
- System.out.println("In onMessage : Got th for timer = " +
+ System.out.println("In onMessage : Got th for timer = " +
t.getInfo());
doTimerStuff("onMessage", true);
getInfo(th);
@@ -46,9 +46,9 @@
getTimeRemainingTest2(5, th);
cancelTimer(th);
-
+
createTimerAndCancel(10000000);
-
+
TimerHandle t1 = createTimer(1000000, "messagedrivenejb");
cancelTimer(t1);
TimerHandle t2 = createTimer(10000, "messagedrivenejb");
@@ -59,7 +59,7 @@
if( isBMT() ) {
cancelTimer(th);
} else {
- cancelTimerAndRollback(th);
+ cancelTimerAndRollback(th);
}
}
} else if( info.equals("test3") ) {
@@ -81,8 +81,8 @@
cancelTimer(th);
TimerHandle ctar = createTimer(1, 1, "cancelTimerAndRollback");
cancelTimer(ctar);
- }
-
+ }
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -92,7 +92,7 @@
checkCallerSecurityAccess("ejbTimeout", false);
try {
- System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ System.out.println("In MessageDrivenEJB::ejbTimeout --> "
+ t.getInfo());
} catch(RuntimeException e) {
System.out.println("got exception while calling getInfo");
@@ -111,9 +111,9 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
+ this.mdc = mdc;
setContext(mdc);
- System.out.println("In ejbtimer.MessageDrivenEJB::setMessageDrivenContext !!");
+ System.out.println("In ejbtimer.MessageDrivenEJB::setMessageDrivenContext !!");
checkCallerSecurityAccess("setMessageDrivenContext", false);
getTimerService("setMessageDrivenContext", false);
@@ -121,7 +121,7 @@
}
public void ejbCreate() throws RemoteException {
- System.out.println("In ejbtimer.MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In ejbtimer.MessageDrivenEJB::ejbCreate !!");
setupJmsConnection();
checkGetSetRollbackOnly("ejbCreate", false);
checkCallerSecurityAccess("ejbCreate", false);
@@ -130,7 +130,7 @@
}
public void ejbRemove() {
- System.out.println("In ejbtimer.MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In ejbtimer.MessageDrivenEJB::ejbRemove !!");
checkCallerSecurityAccess("ejbRemove", false);
checkGetSetRollbackOnly("ejbRemove", false);
getTimerService("ejbRemove", true);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
index efc9927..a55498c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
@@ -29,7 +29,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
setContext(sc);
checkCallerSecurityAccess("setSessionContext", false);
@@ -37,7 +37,7 @@
}
public void ejbCreate(TimerHandle th) throws RemoteException {
- System.out.println("In ejbtimer.Stateful::ejbCreate !!");
+ System.out.println("In ejbtimer.Stateful::ejbCreate !!");
timerHandle = th;
@@ -68,8 +68,8 @@
public void ejbPassivate() {
}
- public void afterBegin() {
- System.out.println("in afterBegin");
+ public void afterBegin() {
+ System.out.println("in afterBegin");
try {
Timer t = timerHandle.getTimer();
t.getInfo();
@@ -82,7 +82,7 @@
}
public void beforeCompletion() {
- System.out.println("in beforeCompletion");
+ System.out.println("in beforeCompletion");
try {
Timer t = timerHandle.getTimer();
} catch(NoSuchObjectLocalException nsole) {
@@ -95,7 +95,7 @@
}
public void afterCompletion(boolean committed) {
- System.out.println("in afterCompletion. committed = " + committed);
+ System.out.println("in afterCompletion. committed = " + committed);
try {
Timer t = timerHandle.getTimer();
System.out.println("Error : should have gotten exception in " +
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
index 3df0cba..47055c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
@@ -66,10 +66,10 @@
void assertTimerNotActive(TimerHandle handle) throws RemoteException;
void sendMessageAndCreateTimer() throws RemoteException, Exception;
- void recvMessageAndCreateTimer(boolean expectMessage)
+ void recvMessageAndCreateTimer(boolean expectMessage)
throws RemoteException, Exception;
- void sendMessageAndCreateTimerAndRollback()
+ void sendMessageAndCreateTimerAndRollback()
throws RemoteException, Exception;
- void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws RemoteException, Exception;
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
index e496337..30465cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
@@ -34,14 +34,14 @@
import jakarta.jms.TextMessage;
public class TimerStuffImpl implements TimerStuff {
-
+
private static final int TX_CMT = 0;
private static final int TX_BMT = 1;
private static final int TX_UNSPECIFIED = 2;
-
+
private EJBContext context_;
private int txMode = TX_CMT;
-
+
private Queue queue;
private QueueSession session;
private QueueConnection connection;
@@ -61,12 +61,12 @@
} else {
txMode = TX_UNSPECIFIED;
}
- /** TODO
+ /** TODO
queue = (Queue) ic.lookup("java:comp/env/jms/MyQueue");
- qcFactory = (QueueConnectionFactory)
+ qcFactory = (QueueConnectionFactory)
ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- **/
+ **/
} catch(Exception e) {
e.printStackTrace();
@@ -76,7 +76,7 @@
protected boolean isCMT() { return txMode == TX_CMT; }
protected boolean isBMT() { return txMode == TX_BMT; }
protected boolean isTxUnspecified() { return txMode == TX_UNSPECIFIED; }
-
+
public TimerHandle createTimer(long duration, String info) throws RemoteException, Exception {
TimerService ts = context_.getTimerService();
Timer t = ts.createTimer(duration, info);
@@ -87,30 +87,30 @@
return createTimer(duration, "createTimer<long>" + duration);
}
- public TimerHandle createTimer(long initialDuration, long interval)
+ public TimerHandle createTimer(long initialDuration, long interval)
throws RemoteException, Exception {
- return createTimer(initialDuration, interval,
+ return createTimer(initialDuration, interval,
"createTimer<long, long>" + initialDuration +
"," + interval);
}
- public TimerHandle createTimer(long initialDuration, long interval,
- String info)
+ public TimerHandle createTimer(long initialDuration, long interval,
+ String info)
throws RemoteException, Exception {
if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createTimer(initialDuration, interval,
+ Timer t = ts.createTimer(initialDuration, interval,
new AppInfo(info));
-
+
if( isBMT() ) {
context_.getUserTransaction().commit();
}
return t.getHandle();
}
- public TimerHandle createTimer(Date expirationTime)
+ public TimerHandle createTimer(Date expirationTime)
throws RemoteException, Exception {
TimerService ts = context_.getTimerService();
if( isBMT() ) {
@@ -129,7 +129,7 @@
return t.getHandle();
}
- public TimerHandle createTimer(Date expirationTime, long interval)
+ public TimerHandle createTimer(Date expirationTime, long interval)
throws RemoteException, Exception {
if( isBMT() ) {
@@ -174,12 +174,12 @@
public void createTimerAndCancelAndCancel(long duration) throws RemoteException, Exception {
if( isTxUnspecified() ) {
- return;
+ return;
} else if( isBMT() ) {
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createTimer(duration, "createTimerAndCancelAndCancel"
+ Timer t = ts.createTimer(duration, "createTimerAndCancelAndCancel"
+ duration);
t.cancel();
t.cancel();
@@ -188,7 +188,7 @@
}
}
- public void createTimerAndCancelAndRollback(long duration)
+ public void createTimerAndCancelAndRollback(long duration)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
@@ -196,7 +196,7 @@
context_.getUserTransaction().begin();
}
TimerService ts = context_.getTimerService();
- Timer t = ts.createTimer(duration, "createTimerAndCancelAndRollback"
+ Timer t = ts.createTimer(duration, "createTimerAndCancelAndRollback"
+ duration);
t.cancel();
if( isBMT() ) {
@@ -243,8 +243,8 @@
context_.getUserTransaction().commit();
}
}
-
- public void cancelTimerAndRollback(TimerHandle timerHandle)
+
+ public void cancelTimerAndRollback(TimerHandle timerHandle)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
@@ -260,7 +260,7 @@
}
}
- public void cancelTimerAndCancelAndRollback(TimerHandle timerHandle)
+ public void cancelTimerAndCancelAndRollback(TimerHandle timerHandle)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
@@ -311,7 +311,7 @@
// success
} else {
throw new RemoteException("getTimers failure");
- }
+ }
}
public TimerHandle getTimeRemainingTest1(int numIterations) throws RemoteException, Exception {
@@ -372,7 +372,7 @@
}
}
- // Make sure there are no active timers.
+ // Make sure there are no active timers.
public void assertNoTimers() throws RemoteException, Exception {
checkCallerSecurityAccess("assertNoTimers", true);
TimerService ts = context_.getTimerService();
@@ -382,11 +382,11 @@
}
}
- public void assertTimerNotActive(TimerHandle timerHandle)
+ public void assertTimerNotActive(TimerHandle timerHandle)
throws RemoteException {
try {
Timer t = timerHandle.getTimer();
- throw
+ throw
new Exception("assertTimerNotActive called with active timer");
} catch(NoSuchObjectLocalException nsole) {
// caught expected exception
@@ -395,10 +395,10 @@
}
}
- public Serializable getInfoNoError(TimerHandle timerHandle)
+ public Serializable getInfoNoError(TimerHandle timerHandle)
throws Exception {
return getInfo(timerHandle, false);
-
+
}
public Serializable getInfo(TimerHandle timerHandle) throws Exception {
@@ -449,18 +449,18 @@
return;
}
- public void recvMessageAndCreateTimer(boolean expectMessage)
+ public void recvMessageAndCreateTimer(boolean expectMessage)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
return;
}
try {
-
+
if( isBMT() ) {
context_.getUserTransaction().begin();
}
- recvMessageAndCreateTimer("recvMessageAndCreateTimer",
+ recvMessageAndCreateTimer("recvMessageAndCreateTimer",
expectMessage);
} catch(Exception e) {
@@ -474,7 +474,7 @@
return;
}
- public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
+ public void recvMessageAndCreateTimerAndRollback(boolean expectMessage)
throws RemoteException, Exception {
if( isTxUnspecified() ) {
@@ -515,7 +515,7 @@
TimerHandle th = t.getHandle();
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -526,11 +526,11 @@
QueueReceiver receiver = session.createReceiver(queue);
// Send a message.
TextMessage message = (TextMessage) receiver.receiveNoWait();
-
+
if( message == null ) {
if( expectMessage ) {
throw new RemoteException("Expecting message in " +
- "recvMessageAndCreateTimerAndRollback");
+ "recvMessageAndCreateTimerAndRollback");
}
} else {
if( !expectMessage ) {
@@ -538,13 +538,13 @@
message.getText());
}
}
-
+
TimerService ts = context_.getTimerService();
Timer t = ts.createTimer(1, timerName);
TimerHandle th = t.getHandle();
} catch(Exception e) {
throw e;
- }
+ }
return;
}
@@ -697,7 +697,7 @@
} else {
getTimerService("ejbTimeout", true);
doTimerStuff("ejbTimeout", true);
- }
+ }
}
protected void checkCallerSecurityAccess(String method, boolean allowed) {
@@ -739,19 +739,19 @@
protected void setupJmsConnection() {
- /** TODO
-
+ /** TODO
+
try {
InitialContext ic = new InitialContext();
connection = qcFactory.createQueueConnection();
session = connection.createQueueSession(true, 0);
connection.start();
} catch(Exception e) { e.printStackTrace(); }
- */
+ */
}
protected void cleanup() {
- /** TODO
+ /** TODO
if( connection != null ) {
try {
connection.close();
@@ -760,7 +760,7 @@
jmse.printStackTrace();
}
}
- **/
+ **/
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml b/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml
index e03d391..d3dadb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/build.xml
@@ -46,9 +46,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the ejb-txprop tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the ejb-txprop tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties
index 76f4fd8..a67c7ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-txprop-cmttimeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml
index 94d5df9..a53b29e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleSLSBHome.class,**/SimpleSLSB.class,**/SimpleEntityHome.class,**/SimpleEntity.class,**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
index a39e98a..0ffa3ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
@@ -31,7 +31,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -40,27 +40,27 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-txprop-cmttimeout");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/SimpleSLSBHome");
System.out.println("objref = " + objref);
-
+
SimpleSLSBHome home = (SimpleSLSBHome)PortableRemoteObject.narrow
(objref, SimpleSLSBHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
SimpleSLSB f = home.create();
System.err.println("Got the EJB!!");
@@ -72,7 +72,7 @@
stat.addStatus("ejbclient main" , stat.FAIL);
}
}
-
+
private void doTest1(SimpleSLSB ref) {
try {
// invoke method on the EJB
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
index a9d12cc..1cd7318 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -36,11 +36,11 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public boolean invokeMethod(int timeout) {
@@ -49,14 +49,14 @@
boolean marked = sc.getRollbackOnly();
try {
Context ic = new InitialContext();
-
+
Object objref = ic.lookup("java:comp/env/ejb/hello");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
Hello hr = home.create();
-
+
marked = sc.getRollbackOnly();
System.out.println("Before invocation ctx.getRollbackOnly(): "
+ marked);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
index 80a9db8..4bcbc71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void compute(int timeout) {
@@ -51,7 +51,7 @@
+ "; time left = " + ((deadline - now) / 1000)
+ " seconds.");
sortArray(1024);
- try {Thread.sleep(10);} catch (Exception ex) {}
+ try {Thread.sleep(10);} catch (Exception ex) {}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
index ccd911c..298c2a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
@@ -56,8 +56,8 @@
Connection c = null;
PreparedStatement ps = null;
try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"INSERT INTO SimpleEntity (key, name) VALUES (?,?)");
ps.setString(1, key);
ps.setString(2, name);
@@ -68,7 +68,7 @@
this.name = name;
} catch (SQLException e) {
throw new CreateException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -94,10 +94,10 @@
throws FinderException
{
Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
"SELECT key from SimpleEntity where key = ?");
ps.setString(1, key);
ResultSet rs = ps.executeQuery();
@@ -107,7 +107,7 @@
return key;
} catch (SQLException e) {
throw new FinderException("SQL exception " + e);
- } finally {
+ } finally {
try {
if (ps != null)
ps.close();
@@ -125,65 +125,65 @@
ps = c.prepareStatement(
"SELECT name from SimpleEntity where key = ?");
ps.setString(1, key);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new NoSuchEntityException("No cust for " + key);
- this.name = rs.getString(1);
- } catch (SQLException e) {
- throw new NoSuchEntityException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new NoSuchEntityException("No cust for " + key);
+ this.name = rs.getString(1);
+ } catch (SQLException e) {
+ throw new NoSuchEntityException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbStore() {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE SimpleEntity SET name = ? WHERE key = ?");
- ps.setString(1, name);
- ps.setString(2, key);
- if (ps.executeUpdate() != 1)
- throw new EJBException("Didnt store ejb");
- } catch (SQLException e) {
- throw new EJBException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE SimpleEntity SET name = ? WHERE key = ?");
+ ps.setString(1, name);
+ ps.setString(2, key);
+ if (ps.executeUpdate() != 1)
+ throw new EJBException("Didnt store ejb");
+ } catch (SQLException e) {
+ throw new EJBException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbRemove() throws RemoveException {
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "DELETE FROM SimpleEntity WHERE key = ?");
- ps.setString(1, name);
- if (ps.executeUpdate() != 1)
- throw new RemoveException("Didnt remove ejb");
- } catch (SQLException e) {
- throw new RemoveException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "DELETE FROM SimpleEntity WHERE key = ?");
+ ps.setString(1, name);
+ if (ps.executeUpdate() != 1)
+ throw new RemoveException("Didnt remove ejb");
+ } catch (SQLException e) {
+ throw new RemoveException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
}
public void ejbActivate() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
index 2717571..1e52686 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -34,11 +34,11 @@
}
public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleSLSBHome::ejbCreate !!");
+ System.out.println("In SimpleSLSBHome::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public boolean doSomething(int timeout) {
@@ -51,7 +51,7 @@
long deadline = System.currentTimeMillis() + (timeout * 1000);
for (int n = 1; true; n = n << 1) {
long now = System.currentTimeMillis();
-
+
if (now > deadline) {
break;
}
@@ -60,7 +60,7 @@
+ "; time left = " + ((deadline - now) / 1000)
+ " seconds. result: " + result);
sortArray(1024);
- try {Thread.sleep(5 * 1000);} catch (Exception ex) {}
+ try {Thread.sleep(5 * 1000);} catch (Exception ex) {}
}
result = sc.getRollbackOnly();
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties
index 2cb9fe9..b2f077f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-txprop-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml
index 10dfb6d..a983c93 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/**.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class,**/*Foo.class,**/*FooHome.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -61,10 +61,10 @@
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
index 9eedeeb..8675077 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
@@ -28,7 +28,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -37,31 +37,31 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("ejb-txprop-simpleID");
- }
-
+ }
+
public Client (String[] args) {
}
-
+
public void doTest() {
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/foo");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
FooHome home = (FooHome)PortableRemoteObject.narrow
(objref, FooHome.class);
-
+
System.err.println("Narrowed home!!");
-
-
+
+
Foo f = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("invoking ejb");
f.callHello();
@@ -73,8 +73,8 @@
e.printStackTrace();
stat.addStatus("ejbclient main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
index ef751dd..a699d26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
@@ -19,7 +19,7 @@
import java.util.Date;
import java.util.Collection;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -37,7 +37,7 @@
public FooBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In FooBean::ejbCreate !!");
+ System.out.println("In FooBean::ejbCreate !!");
// getting UserTransaction() is allowed
System.out.println("Calling getUserTransaction()");
@@ -56,7 +56,7 @@
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void callHello() {
@@ -64,24 +64,24 @@
try {
Context ic = new InitialContext();
-
+
System.out.println("Looking up ejb ref ");
- // create EJB using factory from container
+ // create EJB using factory from container
Object objref = ic.lookup("java:comp/env/ejb/hello");
System.out.println("objref = " + objref);
System.err.println("Looked up home!!");
-
+
HelloHome home = (HelloHome)PortableRemoteObject.narrow
(objref, HelloHome.class);
-
+
System.err.println("Narrowed home!!");
-
+
Hello hr = home.create();
System.err.println("Got the EJB!!");
-
+
// invoke method on the EJB
System.out.println("starting user tx");
-
+
sc.getUserTransaction().begin();
System.out.println("invoking ejb with user tx");
@@ -104,13 +104,13 @@
}
TimerService timerService = sc.getTimerService();
-
+
try {
timerService.createTimer(new Date(), 1000, null);
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
try {
@@ -118,7 +118,7 @@
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
try {
@@ -126,7 +126,7 @@
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
try {
@@ -134,26 +134,26 @@
throw new EJBException("CreateTimer call should have failed.");
} catch(IllegalStateException ise) {
System.out.println("Successfully got illegal state exception " +
- "when attempting to create timer : " +
+ "when attempting to create timer : " +
ise.getMessage());
}
Collection timers = timerService.getTimers();
if( timers.size() > 0 ) {
- throw new EJBException("Wrong number of timers : " +
+ throw new EJBException("Wrong number of timers : " +
timers.size());
} else {
System.out.println("Successfully retrieved 0 timers");
}
-
+
Package p = this.getClass().getPackage();
if( p == null ) {
- throw new EJBException("null package for " +
+ throw new EJBException("null package for " +
this.getClass().getName());
} else {
System.out.println("Package name = " + p);
}
-
+
}
public void ejbRemove() throws RemoteException {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
index a2ebe78..3024d5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -31,11 +31,11 @@
public HelloBean() {}
public void ejbCreate() throws RemoteException {
- System.out.println("In HelloBean::ejbCreate !!");
+ System.out.println("In HelloBean::ejbCreate !!");
}
public void setSessionContext(SessionContext sc) {
- this.sc = sc;
+ this.sc = sc;
}
public void sayHello() {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/build.xml
index 6b73da1..64cbb84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/build.xml
@@ -39,10 +39,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
+ <echo>
+ Usage:
ant methodmap (Executes the ejb-util methodmap test)
ant all (Executes all the ejb-util tests)
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
index 0387b4e..0a3019a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="test.name" value="com.sun.s1asdev.ejb.util.methodmap"/>
<property name="simple.client" value="${test.name}.client.MethodMapTest"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
index 3ca01b9..c2bc0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
@@ -42,27 +42,27 @@
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
-
+
<target name="runclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
- </target>
+ </target>
<target name="perf" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${perf.client}">
<arg value="javax.xml.rpc.Service"/>
<arg value="100000"/>
</java>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
index c30a6ce..1461c57 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
@@ -27,21 +27,21 @@
public class MethodMapTest {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private static final Class[] TEST_CLASSES = {
java.lang.Object.class,
- MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
+ MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
MethodMapTest4.class, MethodMapTest3.class, MethodMapTest6.class,
- MethodMapTest.class, jakarta.ejb.EJBHome.class,
+ MethodMapTest.class, jakarta.ejb.EJBHome.class,
jakarta.ejb.EJBObject.class, jakarta.ejb.EJBLocalObject.class,
jakarta.ejb.EJBLocalHome.class, jakarta.ejb.SessionBean.class,
jakarta.ejb.EnterpriseBean.class, java.util.Map.class,
jakarta.jms.QueueConnection.class, jakarta.jms.QueueSession.class,
jakarta.jms.Session.class, java.util.Date.class,
javax.swing.Action.class, javax.swing.AbstractAction.class,
- javax.swing.JComboBox.class, javax.swing.JTextArea.class
+ javax.swing.JComboBox.class, javax.swing.JTextArea.class
};
@@ -51,9 +51,9 @@
MethodMapTest test = new MethodMapTest(args);
test.doTest();
stat.printSummary("ejb-util-methodmapID");
- }
-
- public MethodMapTest (String[] args) {
+ }
+
+ public MethodMapTest (String[] args) {
}
public void doTest() {
@@ -63,17 +63,17 @@
System.out.println("Doing methodmap test for " + c);
boolean result = testClass(c);
if( result ) {
- stat.addStatus("methodmapclient main", stat.PASS);
+ stat.addStatus("methodmapclient main", stat.PASS);
} else {
- stat.addStatus("methodmapclient main", stat.FAIL);
+ stat.addStatus("methodmapclient main", stat.FAIL);
}
- }
-
+ }
+
testCtor();
testUnsupportedOperations();
-
-
+
+
}
private void testCtor() {
@@ -83,7 +83,7 @@
try {
new MethodMap(new HashMap(), -1);
System.out.println("bucketSize -1 should have thrown exception");
- } catch(IllegalArgumentException e) {
+ } catch(IllegalArgumentException e) {
ctorTest1Passed = true;
} catch(Exception e) {
e.printStackTrace();
@@ -107,23 +107,23 @@
ctorTest3Passed = true;
} catch(Exception e) {
e.printStackTrace();
- }
+ }
// pass map containing something other than Method objects
Map otherMap = new HashMap();
otherMap.put("foo", "bar");
boolean ctorTest4Passed = false;
try {
- new MethodMap(otherMap);
+ new MethodMap(otherMap);
} catch(Exception e) {
ctorTest4Passed = true;
}
- if( ctorTest1Passed && ctorTest2Passed & ctorTest3Passed
+ if( ctorTest1Passed && ctorTest2Passed & ctorTest3Passed
&& ctorTest4Passed ) {
- stat.addStatus("methodmapclient ctor", stat.PASS);
+ stat.addStatus("methodmapclient ctor", stat.PASS);
} else {
- stat.addStatus("methodmapclient ctor", stat.FAIL);
+ stat.addStatus("methodmapclient ctor", stat.FAIL);
}
}
@@ -157,7 +157,7 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
boolean uoeTest3Passed = false;
try {
methodMap.remove(method1);
@@ -176,19 +176,19 @@
" null method value");
} catch(Exception e) {
uoeTest4Passed = true;
- }
+ }
if( uoeTest1Passed && uoeTest2Passed && uoeTest3Passed &&
uoeTest4Passed ) {
- stat.addStatus("methodmapclient unsupportedop", stat.PASS);
+ stat.addStatus("methodmapclient unsupportedop", stat.PASS);
} else {
- stat.addStatus("methodmapclient unsupportedop", stat.FAIL);
+ stat.addStatus("methodmapclient unsupportedop", stat.FAIL);
}
}
private boolean testClass(Class c) {
-
+
Map regularMap = new HashMap();
Method[] methods = c.getDeclaredMethods();
@@ -196,31 +196,31 @@
for(int i = 0; i < methods.length; i++) {
regularMap.put(methods[i], methods[i].toString());
}
-
+
Map defaultMethodMap = new MethodMap(regularMap);
System.out.println("Testing " + c + " with default MethodMap");
- boolean defaultTest =
+ boolean defaultTest =
testClass(c, methods, false, regularMap, defaultMethodMap);
- boolean defaultTestOpt =
+ boolean defaultTestOpt =
testClass(c, methods, true, regularMap, defaultMethodMap);
// test degenerate case where there is only 1 bucket in MethodMap.
- // unless there are less than 2 methods in the map, this should
+ // unless there are less than 2 methods in the map, this should
// always defer to parent.
Map oneBucketMethodMap = new MethodMap(regularMap, 1);
System.out.println("Testing " + c + " with 1-bucket MethodMap");
- boolean oneBucketTest =
+ boolean oneBucketTest =
testClass(c, methods, false, regularMap, oneBucketMethodMap);
boolean oneBucketTestOpt =
testClass(c, methods, true, regularMap, oneBucketMethodMap);
Map seventeenBucketMethodMap = new MethodMap(regularMap, 17);
System.out.println("Testing " + c + " with 17-bucket MethodMap");
- boolean seventeenBucketTest =
- testClass(c, methods, false, regularMap, seventeenBucketMethodMap);
- boolean seventeenBucketTestOpt =
- testClass(c, methods, true, regularMap, seventeenBucketMethodMap);
-
+ boolean seventeenBucketTest =
+ testClass(c, methods, false, regularMap, seventeenBucketMethodMap);
+ boolean seventeenBucketTestOpt =
+ testClass(c, methods, true, regularMap, seventeenBucketMethodMap);
+
boolean clearTest = false;
try {
@@ -233,7 +233,7 @@
clearTest = true;
} else {
System.out.println("Clear() should have returned null for " +
- methods[0]
+ methods[0]
+ " after clear(). instead it " +
" returned " + obj);
}
@@ -245,8 +245,8 @@
System.out.println("clear() threw an exception");
e.printStackTrace();
}
-
- return (defaultTest && defaultTestOpt &&
+
+ return (defaultTest && defaultTestOpt &&
oneBucketTest && oneBucketTestOpt &&
seventeenBucketTest && seventeenBucketTestOpt &&
clearTest);
@@ -254,7 +254,7 @@
private boolean testClass(Class c, Method[] methods, boolean useParamOpt,
Map regularMap, Map methodMap) {
-
+
for(int i = 0; i < methods.length; i++) {
Method next = methods[i];
int numParams = next.getParameterTypes().length;
@@ -267,15 +267,15 @@
} else {
methodMapLookup = methodMap.get(next);
}
-
+
if( regularLookup != methodMapLookup ) {
System.out.println("Error. regularLookup = " + regularLookup
+ " methodMapLookup = " + methodMapLookup
+ " for Method " + next.toString());
return false;
- }
+ }
- // System.out.println("Got " + regularLookup + " for method " +
+ // System.out.println("Got " + regularLookup + " for method " +
// next.toString());
}
@@ -305,19 +305,19 @@
// array params
int abc(int[] a);
- int def(int[][][][][][][][] b);
+ int def(int[][][][][][][][] b);
// arbitrary unicode chars
void _B\u8001$();
void _CCMcx\u04e3\u05E90123();
-
+
}
private interface MethodMapTest3 {
void A();
-
+
}
private interface MethodMapTest4 extends MethodMapTest3 {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
index 8f08272..336a042 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
@@ -29,7 +29,7 @@
return ((timeInMillis * 1000.0) / numIterations) + " micro-seconds";
}
-
+
public static void main(String args[]) {
@@ -40,7 +40,7 @@
try {
Class clz = Class.forName(className);
-
+
Map methodMap = new HashMap();
Method[] methods = clz.getMethods();
@@ -49,7 +49,7 @@
methodMap.put(methods[i], methods[i].toString());
}
-
+
System.out.println("--------------------");
System.out.println("With regular hashmap");
System.out.println("--------------------");
@@ -60,11 +60,11 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
-
+
+
System.out.println("--------------------");
System.out.println("With optimized method lookup");
System.out.println("--------------------");
@@ -77,11 +77,11 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
-
+
+
System.out.println("--------------------");
System.out.println("With extra optimized method lookup");
System.out.println("--------------------");
@@ -94,10 +94,10 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
+
/*
System.out.println("--------------------");
System.out.println("With java.util.IdentityHashMap lookup");
@@ -113,10 +113,10 @@
*/
-
- long ihcTime = testSystemIdentityHashCode(numIterations);
+
+ long ihcTime = testSystemIdentityHashCode(numIterations);
System.out.println("system identity hash code= " + toMicroSeconds(ihcTime, numIterations));
-
+
MethodPerf ml = new MethodPerf();
@@ -131,7 +131,7 @@
System.out.println("instance strong typed invocation time = " + toMicroSeconds(i_sTime, numIterations));
long i_rTime = testStaticReflectiveInvocation(numIterations, fooMethod);
System.out.println("instance reflective invocation time = " + toMicroSeconds(i_rTime, numIterations));
-
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -151,10 +151,10 @@
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -169,10 +169,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -187,10 +187,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -205,10 +205,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -222,48 +222,48 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
return (end - begin) - loopTime;
}
- private static long testStaticReflectiveInvocation(int numIterations, Method m)
+ private static long testStaticReflectiveInvocation(int numIterations, Method m)
throws Exception {
-
- long begin = System.currentTimeMillis();
+
+ long begin = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
m.invoke(null, null);
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
return (end - begin) - loopTime;
}
- private static long testInstanceReflectiveInvocation(int numIterations, Object o, Method m)
+ private static long testInstanceReflectiveInvocation(int numIterations, Object o, Method m)
throws Exception {
-
- long begin = System.currentTimeMillis();
+
+ long begin = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
m.invoke(o, null);
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
index f604bc4..48c8d9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-webservice-commit"/>
-<property name="client_pkgname" value="com.sun.s1asdev.ejb.webservice.commit.client"/>
-<property name="appname" value="${module}"/>
+<property name="client_pkgname" value="com.sun.s1asdev.ejb.webservice.commit.client"/> \u0020
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
index 0602902..7b4f97a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
@@ -32,12 +32,12 @@
&run;
<target name="all" depends="build,create_table,deploy,run,undeploy,delete_table"/>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,11 +46,11 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Commit*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="create_table" depends="init-common">
<antcall target="execute-ejb-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -64,16 +64,16 @@
<param name="src" value="client"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/s1asdev/ejb/webservice/commit/client/*.class"/>
</antcall>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
<antcall target="deploy-client-common"/>
</target>
-
+
<target name="wsdl-import">
<antcall target="configurable-wsdl-import">
@@ -85,7 +85,7 @@
<target name="configurable-wsdl-import">
<echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}
- Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
+ Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -p ${client_pkgname} -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/CommitBeanService/CommitBean?WSDL"/>
</exec>
@@ -93,14 +93,14 @@
<target name="run" depends="init-common">
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/archive">
- <arg line="-client ${module}-clientClient.jar"/>
+ <arg line="-client ${module}-clientClient.jar"/>
</exec>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
+ </target>
<target name="delete_table" depends="init-common">
<antcall target="execute-ejb-sql-common">
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java
index 51a2ccb..e841e97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/client/Client.java
@@ -52,11 +52,11 @@
+ " instead of system exception");
stat.addStatus(TEST_ID, stat.FAIL);
} catch(Throwable e) {
- System.out.println("Successfully received " + e +
+ System.out.println("Successfully received " + e +
"for commit failure");
- stat.addStatus(TEST_ID, stat.PASS);
+ stat.addStatus(TEST_ID, stat.PASS);
}
-
+
} catch(Exception e) {
e.printStackTrace();
stat.addStatus(TEST_ID, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
index 4bb5274..ad010b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
@@ -31,34 +31,34 @@
@Resource(mappedName="jdbc/__default")
private DataSource ds;
- @Resource
+ @Resource
private SessionContext sessionCtx;
public int findCustomer(int i) throws FinderException {
- Connection c = null;
- PreparedStatement ps = null;
+ Connection c = null;
+ PreparedStatement ps = null;
int returnValue = -1;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "SELECT c_id from O_customer where c_id = ?");
- ps.setInt(1, i);
- ResultSet rs = ps.executeQuery();
- if (!rs.next())
- throw new FinderException("No cust for " + i);
- returnValue = rs.getInt(1);
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "SELECT c_id from O_customer where c_id = ?");
+ ps.setInt(1, i);
+ ResultSet rs = ps.executeQuery();
+ if (!rs.next())
+ throw new FinderException("No cust for " + i);
+ returnValue = rs.getInt(1);
System.out.println("findCustomer = " + returnValue);
- } catch (SQLException e) {
+ } catch (SQLException e) {
e.printStackTrace();
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
return returnValue;
}
@@ -66,38 +66,38 @@
public void updateCustomer() throws FinderException {
System.out.println( "In updateCustomer caller" );
-
- Connection c = null;
- PreparedStatement ps = null;
- try {
- c = ds.getConnection();
- ps = c.prepareStatement(
- "UPDATE O_customer SET c_phone = ? WHERE c_id = 2 AND c_phone = 'foo'");
+
+ Connection c = null;
+ PreparedStatement ps = null;
+ try {
+ c = ds.getConnection();
+ ps = c.prepareStatement(
+ "UPDATE O_customer SET c_phone = ? WHERE c_id = 2 AND c_phone = 'foo'");
ps.setString(1, "webservice");
- int result = ps.executeUpdate();
+ int result = ps.executeUpdate();
System.out.println("execute update returned " + result);
- } catch (SQLException e) {
+ } catch (SQLException e) {
e.printStackTrace();
- throw new FinderException("SQL exception " + e);
- } finally {
- try {
- if (ps != null)
- ps.close();
- if (c != null)
- c.close();
- } catch (Exception e) {}
- }
+ throw new FinderException("SQL exception " + e);
+ } finally {
+ try {
+ if (ps != null)
+ ps.close();
+ if (c != null)
+ c.close();
+ } catch (Exception e) {}
+ }
System.out.println("Adding CommitStatefulBean with SessionSynch " +
" to transaction");
-
+
CommitStatefulLocal csb = (CommitStatefulLocal)
sessionCtx.lookup("csb");
csb.foo();
return;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
index 9bfe341..ae72c11 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
@@ -20,7 +20,7 @@
import jakarta.annotation.Resource;
@Stateful
-public class CommitStatefulBean
+public class CommitStatefulBean
implements CommitStatefulLocal, SessionSynchronization {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql
index 6975875..b0a3497 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer NOT NULL PRIMARY KEY,
- c_phone char(32)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer NOT NULL PRIMARY KEY,
+ c_phone char(32)
+);
+
INSERT INTO O_Customer values (2, 'foo');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
index 68f7631..3bb091f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
@@ -15,23 +15,23 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ksink"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="web.xml" value="descriptor/war/web.xml"/>
<property name="sun-web.xml" value="descriptor/war/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
index e800c42..38b6515 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
@@ -34,9 +34,9 @@
<target name="all" depends="clean,build,deploy,run,undeploy"/>
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -65,11 +65,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -classpath . -model googleclient.model wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleclient">
- <fileset dir="output//com/sun/s1asdev/ejb/webservice/ksink/googleclient"
+ <fileset dir="output//com/sun/s1asdev/ejb/webservice/ksink/googleclient"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<!-- <delete dir="output"/> -->
@@ -78,11 +78,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserver">
- <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserver"
+ <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserver"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -91,37 +91,37 @@
<target name="wscompile-web" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -model googleweb.model -classpath . wscompile_config_web.xml"/>
</antcall>
<copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
- <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb"
+ <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
</target>
<target name="assemble" depends="init-common, compile">
- <!--
- EJB module creation
+ <!--
+ EJB module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="GoogleMapping_ejb.xml,META-INF/wsdl/**,**/*.class" />
</antcall>
- <!--
- War module creation
+ <!--
+ War module creation
-->
<antcall target="build-war-file"/>
- <!--
- AppClient module creation
+ <!--
+ AppClient module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
@@ -129,36 +129,36 @@
file="GoogleSearch_types.wsdl"/>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch_partial.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <copy todir="${build.classes.dir}"
- file="googleclient.model"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="googleclient.model"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,**/*.class" />
</antcall>
- <!--
- EAR file creation
+ <!--
+ EAR file creation
-->
<antcall target="ear-common" />
<copy todir="${build.classes.dir}/META-INF"
file="${sun-application.xml}"/>
- <jar destfile = "${assemble.dir}/${appname}App.ear"
- update="true">
+ <jar destfile = "${assemble.dir}/${appname}App.ear"
+ update="true">
<fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
</fileset>
</jar>
-
- </target>
+
+ </target>
<target name="build-appclient-file" depends="init-common">
</target>
<target name="build-war-file" depends="init-common">
<echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
+ <delete file="${war.file}"/>
<mkdir dir="${build.classes.dir}/tmp"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF"
@@ -172,10 +172,10 @@
file="GoogleSearch.wsdl"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/tmp"
- file="GoogleMapping_web.xml"/>
- <copy todir="${build.classes.dir}/tmp"
- file="googleweb.model"/>
+ <copy todir="${build.classes.dir}/tmp"
+ file="GoogleMapping_web.xml"/>
+ <copy todir="${build.classes.dir}/tmp"
+ file="googleweb.model"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
<fileset dir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
<include name="**/*.class"/>
@@ -185,12 +185,12 @@
<fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
<include name="**/**"/>
</fileset>
- </jar>
+ </jar>
<delete dir="${build.classes.dir}/tmp"/>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -221,7 +221,7 @@
<target name="build-standalone" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:client -keep -d ${build.classes.dir} -s ${build.classes.dir} -classpath . wscompile_config_standalone.xml"/>
</antcall>
<antcall target="compile-common">
@@ -241,7 +241,7 @@
<pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
<pathelement location="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
<pathelement location="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="${build.classes.dir}"/>
</classpath>
@@ -249,10 +249,10 @@
<sysproperty key="http.proxyPort" value="8080"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="contactgoogle">
<antcall target="runclient-common">
@@ -262,34 +262,34 @@
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
</antcall>
</target>
<target name="gen-mapping-web" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_web.xml wscompile_config_web.xml"/>
</antcall>
</target>
<target name="create-user">
<antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="staff"/>
+ <param name="user" value="j2ee"/>
+ <param name="password" value="j2ee"/>
+ <param name="groups" value="staff"/>
</antcall>
<antcall target="reconfig-common"/>
</target>
-
+
<target name="delete-user">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
@@ -302,10 +302,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java
index 5aacd6a..b9f5b67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/Client.java
@@ -30,10 +30,10 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
@@ -44,12 +44,12 @@
public static void main (String[] args) {
- stat.addDescription("googleserver appclient");
+ stat.addDescription("googleserver appclient");
Client client = new Client(args);
client.doTest();
stat.printSummary("googleserver-applientID");
}
-
+
public Client(String[] args) {
word = (args.length > 0) ? args[0] : "spellng";
targetEndpointAddress = (args.length > 1) ? args[1] : null;
@@ -58,8 +58,8 @@
public void doTest() {
-
- try {
+
+ try {
Context ic = new InitialContext();
String googleKey = (String)
ic.lookup("java:comp/env/googlekey");
@@ -76,7 +76,7 @@
Method helloOneWay = foo.getClass().getMethod("helloOneWay",
new Class[] { java.lang.String.class });
helloOneWay.invoke(foo, new Object[] { "1000" } );
-
+
try {
googleSearchService.getHandlerRegistry();
} catch(java.lang.UnsupportedOperationException uoe) {
@@ -95,7 +95,7 @@
doDynamicProxyTest(googleSearchService, googleKey);
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
doSpellingSuggestion(googleSearchPort, googleKey,
targetEndpointAddress);
@@ -121,7 +121,7 @@
partialWsdlServiceGeneric.getPort(GoogleSearchPort.class);
googleSearch.doSpellingSuggestion(googleKey, word);
-/** GoogleSearchService partialWsdlServiceGenerated =
+/** GoogleSearchService partialWsdlServiceGenerated =
(GoogleSearchService)
ic.lookup("java:comp/env/service/partialGenerated");
googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort();
@@ -130,17 +130,17 @@
stat.addStatus("appclient " + testName, stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("appclient " + testName, stat.FAIL);
- }
+ }
}
private void doSpellingSuggestion(GoogleSearchPort googleSearchPort,
String googleKey,
- String endpointAddress)
+ String endpointAddress)
throws Exception {
if( endpointAddress != null ) {
@@ -157,7 +157,7 @@
System.out.println("Contacting google for spelling " +
"suggestion at " + endpointAddress);
-
+
String spellingSuggestion =
googleSearchPort.doSpellingSuggestion(googleKey, word);
System.out.println("Gave google the word '" + word + "' ... " +
@@ -170,21 +170,21 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
if( targetEndpointAddress != null ) {
- c3.setTargetEndpointAddress(targetEndpointAddress);
- }
+ c3.setTargetEndpointAddress(targetEndpointAddress);
+ }
Object params[] = new Object[] {googleKey, "hello" };
String response = (String) c3.invoke(params);
System.out.println("Response = " + response);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -197,18 +197,18 @@
System.out.println("Calling oneway operation");
Call oneway = service.createCall(PORT_QNAME, "helloOneWay");
if( targetEndpointAddress != null ) {
- oneway.setTargetEndpointAddress(targetEndpointAddress);
- }
+ oneway.setTargetEndpointAddress(targetEndpointAddress);
+ }
long oneWayMethodWaitTimeInMillis = 4000;
- Date before = new Date();
- oneway.invokeOneWay(new Object[]
+ Date before = new Date();
+ oneway.invokeOneWay(new Object[]
{ oneWayMethodWaitTimeInMillis + "" });
Date after = new Date();
long elapsedTime = after.getTime() - before.getTime();
- System.out.println("one way operation began at " + before +
- " and returned at " + after +
+ System.out.println("one way operation began at " + before +
+ " and returned at " + after +
" and took " + elapsedTime + " milli-seconds");
if( elapsedTime > oneWayMethodWaitTimeInMillis ) {
throw new Exception("one way operation blocked for too long ");
@@ -219,7 +219,7 @@
// to undeploy, but the endpoint is still executing its
// oneway operation.
long sleepTime = (oneWayMethodWaitTimeInMillis - elapsedTime);
-
+
System.out.println("now sleeping for " + sleepTime + " milli secs");
Thread.sleep(sleepTime);
System.out.println("returning from doDynamicProxyTest");
@@ -275,7 +275,7 @@
System.out.println("Successfully caught unsupported operation " +
"for Service.getPort(SEI)");
}
-
+
try {
Remote remote = service.getPort(PORT_QNAME, GoogleSearchPort.class);
} catch(java.lang.UnsupportedOperationException uoe) {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java
index a847bbe..9b21cd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/client/ClientHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class ClientHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In ClientHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In ClientHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In ClientHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In ClientHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In ClientHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
index a1c9395..03192a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
@@ -97,7 +97,7 @@
</service-endpoint-interface>
<port-component-link>ksink-web.war#GoogleSearchPort</port-component-link>
</port-component-ref>
- </service-ref>
+ </service-ref>
<!-- <service-ref>
<description>partial wsdl test google service ref</description>
<service-ref-name>service/partialGenerated</service-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
index 3368ac5..3ab2d75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
@@ -19,10 +19,10 @@
-->
<sun-ejb-jar>
- <enterprise-beans>
+ <enterprise-beans>
<ejb>
<ejb-name>GoogleEjb</ejb-name>
- <jndi-name>com_sun_s1asdev_ejb_webservice_ksink_GoogleEjb</jndi-name>
+ <jndi-name>com_sun_s1asdev_ejb_webservice_ksink_GoogleEjb</jndi-name>
<webservice-endpoint>
<port-component-name>GoogleSearchEjbPort</port-component-name>
<endpoint-address-uri>ejb_webservice_ksink_GoogleEJB/GoogleSearch</endpoint-address-uri>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java
index d1754e1..00390b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In FooHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In FooHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In FooHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In FooHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
index ca2537f..a699f1b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
@@ -24,7 +24,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,24 +33,24 @@
public class GoogleEJB implements SessionBean {
private SessionContext sc;
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
+
public GoogleEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
+ System.out.println("In GoogleEJB::ejbCreate !!");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
{
try {
@@ -75,12 +75,12 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
}
-
+
/*
try {
-
+
boolean result = sc.isCallerInRole("foo");
System.out.println(
"GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) returned - " + result);
@@ -89,7 +89,7 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
}
*/
@@ -99,10 +99,10 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/WebDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort webPort = (GoogleSearchPort)
+ GoogleSearchPort webPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = webPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
@@ -114,10 +114,10 @@
System.out.println("GoogleEJB returning " + returnValue);
return returnValue;
}
-
+
public void helloOneWay(String s1) {
- jakarta.transaction.TransactionManager tm =
+ jakarta.transaction.TransactionManager tm =
com.sun.enterprise.Switch.getSwitch().getTransactionManager();
int txStatus = -1;
try {
@@ -126,34 +126,34 @@
throw new EJBException(e);
}
- // The following tests make sure tx attributes are processed
+ // The following tests make sure tx attributes are processed
// correctly when the same method is defined on both the remote
// and webservice interface. Descriptor is set up to have
// no tx for the webservice case and a TX_REQUIRED for the
// Remote case.
try {
-
+
sc.getMessageContext();
-
+
// we were invoked through a webserivce invocation. there
// shouldn't be a transaction.
if( txStatus == jakarta.transaction.Status.STATUS_NO_TRANSACTION) {
System.out.println("Correctly found no tx for helloOneWay " +
" invoked through a webservice");
} else {
- throw new EJBException("Got wrong tx status = " + txStatus +
+ throw new EJBException("Got wrong tx status = " + txStatus +
" for helloOneWay invoked through a " +
"web service");
}
} catch(Exception e) {
// since there's no WEB service message context, we were
- // invoked through a remote invocation.
-
+ // invoked through a remote invocation.
+
if( txStatus == jakarta.transaction.Status.STATUS_ACTIVE) {
System.out.println("Correctly found an active tx for " +
"helloOneWay invoked through a Remote interface");
} else {
- throw new EJBException("Got wrong tx status = " + txStatus +
+ throw new EJBException("Got wrong tx status = " + txStatus +
" for helloOneWay invoked through a " +
"remote interface");
}
@@ -176,16 +176,16 @@
public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
private void doDynamicProxyTest(Service service) throws Exception {
@@ -193,14 +193,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -209,7 +209,7 @@
System.out.println("wsdlLocation = " + wsdlLocation);
}
Iterator ports = service.getPorts();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java
index b36edea..ebcead5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/standalone/StandAloneClient.java
@@ -24,7 +24,7 @@
public class StandAloneClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private String word;
@@ -32,12 +32,12 @@
private String googleKey;
public static void main (String[] args) {
- stat.addDescription("googleserver standalone");
+ stat.addDescription("googleserver standalone");
StandAloneClient client = new StandAloneClient(args);
client.doTest();
stat.printSummary("googleserver-standaloneID");
}
-
+
public StandAloneClient(String[] args) {
word = (args.length > 0) ? "spellng" : args[0];
targetEndpointAddress = (args.length > 1) ?
@@ -47,11 +47,11 @@
}
public void doTest() {
- try {
- GoogleSearchService googleSearchService =
+ try {
+ GoogleSearchService googleSearchService =
new GoogleSearchService_Impl();
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
((Stub)googleSearchPort)._setProperty
@@ -72,15 +72,15 @@
spellingSuggestion + "'");
stat.addStatus("appclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("appclient main" , stat.FAIL);
- }
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java
index 69c30ae..f5c3a6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In FooHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In FooHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In FooHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In FooHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java
index 0dde16d..6d04ad3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/web/GoogleServletImpl.java
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
@@ -30,11 +30,11 @@
public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
+
private boolean gotInit = false;
public GoogleServletImpl() {
@@ -50,9 +50,9 @@
System.out.println("Got ServiceLifecycle::destroy call");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
public void helloOneWay(String s1) {
@@ -71,8 +71,8 @@
new Date());
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
throws RemoteException {
System.out.println("GoogleServletImpl.doSpellingSuggestion() " +
@@ -88,22 +88,22 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/EjbDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort ejbPort = (GoogleSearchPort)
+ GoogleSearchPort ejbPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = ejbPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
e.printStackTrace();
throw new RemoteException(e.getMessage(), e);
}
- }
-
+ }
+
System.out.println("GoogleServletImpl returning " + returnValue);
return returnValue;
}
-
+
public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
@@ -113,14 +113,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -129,7 +129,7 @@
System.out.println("wsdlLocation = " + wsdlLocation);
}
Iterator ports = service.getPorts();
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
index 1178467..36f858e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="com.sun.s1asdev.ejb.webservice.ksink.googleclient"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
index 50c4eaa..76c9951 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="com.sun.s1asdev.ejb.webservice.ksink.googleserver"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
index cf9caca..08a03a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="http://localhost:8080/ejb_webservice_ksink_GoogleServlet/GoogleSearch?WSDL"
packageName="com.sun.s1asdev.ejb.webservice.ksink.standalone"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
index c446c89..cc93bfd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="com.sun.s1asdev.ejb.webservice.ksink.googleserverweb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml b/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml
index c1a7c5d..9b8e82c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml
@@ -18,7 +18,7 @@
-->
<!--
-
+
Note: The targets here use properties that need to be modified
to suit your local settings in the JdbcCommon.properties
-->
@@ -42,10 +42,10 @@
<target name="create-jdbc-connpool-oracle-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-connection-pool
- --datasourceclassname=${oracle.datasource.class}
- --restype=${oracle.resource.type}"/>
- <param name="operand.props" value="${oracle.pool.name}"/>
+ value="create-jdbc-connection-pool
+ --datasourceclassname=${oracle.datasource.class}
+ --restype=${oracle.resource.type}"/>
+ <param name="operand.props" value="${oracle.pool.name}"/>
</antcall>
<antcall target="set-oracle-props-common"/>
@@ -55,10 +55,10 @@
<target name="create-jdbc-driver-connpool-oracle-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-connection-pool
- --driverclassname=${oracle.driver.class}
- --restype=${oracle.resource.type}"/>
- <param name="operand.props" value="${oracle.pool.name}"/>
+ value="create-jdbc-connection-pool
+ --driverclassname=${oracle.driver.class}
+ --restype=${oracle.resource.type}"/>
+ <param name="operand.props" value="${oracle.pool.name}"/>
</antcall>
<antcall target="set-oracle-props-common"/>
@@ -68,18 +68,18 @@
<target name="set-oracle-props-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.pool.name}.property.User=${oracle.user}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.pool.name}.property.User=${oracle.user}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.pool.name}.property.Password=${oracle.password}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.pool.name}.property.Password=${oracle.password}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.pool.name}.property.URL=${oracle.url}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.pool.name}.property.URL=${oracle.url}"/>
</antcall>
</target>
@@ -87,9 +87,9 @@
<target name="create-jdbc-resource-oracle-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-resource
- --connectionpoolid ${oracle.pool.name}"/>
- <param name="operand.props" value="${oracle.resource.name}"/>
+ value="create-jdbc-resource
+ --connectionpoolid ${oracle.pool.name}"/>
+ <param name="operand.props" value="${oracle.resource.name}"/>
</antcall>
</target>
@@ -97,8 +97,8 @@
<target name="delete-jdbc-connpool-oracle-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-jdbc-connection-pool"/>
- <param name="operand.props" value="${oracle.pool.name}"/>
+ value="delete-jdbc-connection-pool"/>
+ <param name="operand.props" value="${oracle.pool.name}"/>
</antcall>
</target>
@@ -106,8 +106,8 @@
<target name="delete-jdbc-resource-oracle-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-jdbc-resource"/>
- <param name="operand.props" value="${oracle.resource.name}"/>
+ value="delete-jdbc-resource"/>
+ <param name="operand.props" value="${oracle.resource.name}"/>
</antcall>
</target>
@@ -125,50 +125,50 @@
<target name="create-jdbc-connpool-oracle-xa-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-connection-pool
- --datasourceclassname=${oracle.xadatasource.class}
- --restype=javax.sql.XADataSource"/>
- <param name="operand.props" value="${oracle.xapool.name}"/>
+ value="create-jdbc-connection-pool
+ --datasourceclassname=${oracle.xadatasource.class}
+ --restype=javax.sql.XADataSource"/>
+ <param name="operand.props" value="${oracle.xapool.name}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.xapool.name}.property.User=${oracle.user}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.xapool.name}.property.User=${oracle.user}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.xapool.name}.property.Password=${oracle.password}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.xapool.name}.property.Password=${oracle.password}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.xapool.name}.property.URL=${oracle.url}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${oracle.xapool.name}.property.URL=${oracle.url}"/>
</antcall>
</target>
<target name="create-jdbc-resource-oracle-xa-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-resource
- --connectionpoolid ${oracle.xapool.name}"/>
- <param name="operand.props" value="${oracle.xaresource.name}"/>
+ value="create-jdbc-resource
+ --connectionpoolid ${oracle.xapool.name}"/>
+ <param name="operand.props" value="${oracle.xaresource.name}"/>
</antcall>
</target>
<target name="delete-jdbc-connpool-oracle-xa-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-jdbc-connection-pool"/>
- <param name="operand.props" value="${oracle.xapool.name}"/>
+ value="delete-jdbc-connection-pool"/>
+ <param name="operand.props" value="${oracle.xapool.name}"/>
</antcall>
</target>
<target name="delete-jdbc-resource-oracle-xa-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-jdbc-resource"/>
- <param name="operand.props" value="${oracle.xaresource.name}"/>
+ value="delete-jdbc-resource"/>
+ <param name="operand.props" value="${oracle.xaresource.name}"/>
</antcall>
</target>
@@ -184,7 +184,7 @@
output="${build.classes.dir}/setupDBTables.out"
classpath="${env.APS_HOME}/devtests/jdbc/classes12.zip"
/>
-
+
</target>
@@ -215,65 +215,65 @@
<param name="operand.props" value="${mysql.xa.pool.name}"/>
</antcall>
</target>
-
+
<target name="create-jdbc-connpool-mysql-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-connection-pool
- --datasourceclassname=${mysql.datasource.class}
- --restype=javax.sql.DataSource"/>
- <param name="operand.props" value="${mysql.pool.name}"/>
+ value="create-jdbc-connection-pool
+ --datasourceclassname=${mysql.datasource.class}
+ --restype=javax.sql.DataSource"/>
+ <param name="operand.props" value="${mysql.pool.name}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.User=${mysql.user}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.User=${mysql.user}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.Password=${mysql.password}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.Password=${mysql.password}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.serverName=${mysql.serverName}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.serverName=${mysql.serverName}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.databaseName=${mysql.databaseName}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.databaseName=${mysql.databaseName}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.port=${mysql.port}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.pool.name}.property.port=${mysql.port}"/>
</antcall>
</target>
<target name="create-jdbc-resource-mysql-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-resource
- --connectionpoolid ${mysql.pool.name}"/>
- <param name="operand.props" value="${mysql.resource.name}"/>
+ value="create-jdbc-resource
+ --connectionpoolid ${mysql.pool.name}"/>
+ <param name="operand.props" value="${mysql.resource.name}"/>
</antcall>
</target>
<target name="delete-jdbc-connpool-mysql-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-jdbc-connection-pool"/>
- <param name="operand.props" value="${mysql.pool.name}"/>
+ value="delete-jdbc-connection-pool"/>
+ <param name="operand.props" value="${mysql.pool.name}"/>
</antcall>
</target>
<target name="delete-jdbc-resource-mysql-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="delete-jdbc-resource"/>
- <param name="operand.props" value="${mysql.resource.name}"/>
+ value="delete-jdbc-resource"/>
+ <param name="operand.props" value="${mysql.resource.name}"/>
</antcall>
</target>
@@ -290,45 +290,45 @@
<target name="create-jdbc-connpool-mysql-xa-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-connection-pool
- --datasourceclassname=${mysql.xa.datasource.class}
- --restype=javax.sql.XADataSource"/>
- <param name="operand.props" value="${mysql.xa.pool.name}"/>
+ value="create-jdbc-connection-pool
+ --datasourceclassname=${mysql.xa.datasource.class}
+ --restype=javax.sql.XADataSource"/>
+ <param name="operand.props" value="${mysql.xa.pool.name}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.User=${mysql.user}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.User=${mysql.user}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.Password=${mysql.password}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.Password=${mysql.password}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.serverName=${mysql.serverName}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.serverName=${mysql.serverName}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.databaseName=${mysql.databaseName}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.databaseName=${mysql.databaseName}"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.port=${mysql.port}"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${mysql.xa.pool.name}.property.port=${mysql.port}"/>
</antcall>
</target>
<target name="create-jdbc-resource-mysql-xa-common" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
- value="create-jdbc-resource
- --connectionpoolid ${mysql.xa.pool.name}"/>
- <param name="operand.props" value="${mysql.xa.resource.name}"/>
+ value="create-jdbc-resource
+ --connectionpoolid ${mysql.xa.pool.name}"/>
+ <param name="operand.props" value="${mysql.xa.resource.name}"/>
</antcall>
</target>
@@ -342,7 +342,7 @@
onerror="continue"
print="yes"
output="${build.classes.dir}/setupDBTables.out"
- classpath="${env.S1AS_HOME}/lib/mysql-connector-java-5.1.7-bin.jar"
+ classpath="${env.S1AS_HOME}/lib/mysql-connector-java-5.1.7-bin.jar"
/>
</target>
@@ -358,7 +358,7 @@
<condition property="aix">
<os name="AIX"/>
</condition>
-
+
<target name="start-derby" depends="init-common">
<antcall target="start-derby-aix"/>
<antcall target="start-derby-nonaix"/>
@@ -398,7 +398,7 @@
<parallel>
<java classname="org.apache.derby.drda.NetworkServerControl"
classpath="${db.classpath}" failonerror="true" fork="true">
- <arg line="-h localhost -p 1527 -user ${derby.user} -password ${derby.password} shutdown"/>
+ <arg line="-h localhost -p 1527 -user ${derby.user} -password ${derby.password} shutdown"/>
</java>
</parallel>
</target>
@@ -408,7 +408,7 @@
<parallel>
<java classname="org.apache.derby.drda.NetworkServerControl"
classpath="${db.classpath}" failonerror="true" fork="true">
- <arg line="-h 0.0.0.0 -p 1527 -user ${derby.user} -password ${derby.password} shutdown"/>
+ <arg line="-h 0.0.0.0 -p 1527 -user ${derby.user} -password ${derby.password} shutdown"/>
</java>
</parallel>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.properties
index f8f6a8d..e51e557 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-appauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.xml
index 0ffcec0..673929c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/build.xml
@@ -40,7 +40,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"/>
@@ -52,13 +52,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -81,7 +81,7 @@
<antcall target="runclient-common"/>
<antcall target="reset-derby-for-no-authentication"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -94,7 +94,7 @@
</antcall>
-->
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/client/SimpleBMPClient.java
index 787259f..c18cf6e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/client/SimpleBMPClient.java
@@ -25,52 +25,52 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class SimpleBMPClient {
-
+
public static void main(String[] args)
throws Exception {
-
+
SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "AppAuth ";
+ String testSuite = "AppAuth ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
- stat.addDescription("JDBC Application Authentication test");
+
+ stat.addDescription("JDBC Application Authentication test");
SimpleBMP simpleBMP = simpleBMPHome.create();
-
+
System.out.println("test 3 will fail with Derby" );
if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- if ( simpleBMP.test3() ) {
- stat.addStatus(testSuite + "test3 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite + "test3 : ", stat.FAIL);
- }
-
- if ( simpleBMP.test4() ) {
- stat.addStatus(testSuite + "test4 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite + "test4 : ", stat.FAIL);
- }
+ if ( simpleBMP.test3() ) {
+ stat.addStatus(testSuite + "test3 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite + "test3 : ", stat.FAIL);
+ }
+
+ if ( simpleBMP.test4() ) {
+ stat.addStatus(testSuite + "test4 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite + "test4 : ", stat.FAIL);
+ }
if ( simpleBMP.test5() ) {
- stat.addStatus(testSuite + "test5 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite + "test5 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite + "test5 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite + "test5 : ", stat.FAIL);
+ }
System.out.println("jdbc appauth status: ");
- stat.printSummary();
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/appauth/descriptor/ejb-jar.xml
index e1c6e75..0f2b4ca 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
index 23bc657..2bca7de 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
@@ -81,7 +81,7 @@
}
public boolean test3() {
- //application auth + wrong user/pwd
+ //application auth + wrong user/pwd
Connection conn = null;
boolean passed = false;
try {
@@ -136,7 +136,7 @@
public boolean test5() {
//application auth + user/pwd specified - right initial
//ensure that connection with same username is returned in both the cases.
-
+
Connection conn = null;
Connection conn2 = null;
boolean passed = false;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.properties
index 96573d4..96515ac 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-appauthtx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.xml
index 9f0277a..08c3d00 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/build.xml
@@ -40,7 +40,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"/>
@@ -52,12 +52,12 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
@@ -71,9 +71,9 @@
<param name="jdbc.conpool.name" value="jdbc-appauth-pool1"/>
<param name="jdbc.resource.name" value="jdbc/s1qeappauth1"/>
</antcall>
-
+
<antcall target="deploy-common"/>
- </target>
+ </target>
@@ -85,7 +85,7 @@
<antcall target="runclient-common"/>
<antcall target="reset-derby-for-no-authentication"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
@@ -100,7 +100,7 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/client/SimpleBMPClient.java
index 52576e7..99430c6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/client/SimpleBMPClient.java
@@ -28,38 +28,38 @@
public static void main(String[] args)
throws Exception {
-
- String testSuite = "AppAuthTX ";
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
+
+ String testSuite = "AppAuthTX ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("JDBC Application Authentication TX test");
-
+ stat.addDescription("JDBC Application Authentication TX test");
+
System.out.println(" All tests will fail with Derby till XA driver is fixed");
- if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
+ if ( simpleBMP.test1() ) {
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- if ( simpleBMP.test3() ) {
- stat.addStatus(testSuite+"test3 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test3 : ", stat.FAIL);
- }
-
- System.out.println("jdbc appauthtx status:");
- stat.printSummary();
+ if ( simpleBMP.test3() ) {
+ stat.addStatus(testSuite+"test3 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test3 : ", stat.FAIL);
+ }
+
+ System.out.println("jdbc appauthtx status:");
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/descriptor/ejb-jar.xml
index 2a04168..3570a79 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/descriptor/ejb-jar.xml
@@ -55,6 +55,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
index d49233d..b2297c1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
@@ -31,78 +31,78 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSourcetx");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSourcetx");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1() {
//application auth + user/pwd not specified - should fail
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = true;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
-
- return passed;
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = true;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+
+ return passed;
+ }
+
public boolean test2() {
//application auth + user/pwd specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD");
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD");
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public boolean test3() {
- //application auth + wrong user/pwd
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection("xyz", "xyz" );
- } catch (Exception e) {
- passed = true;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ //application auth + wrong user/pwd
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection("xyz", "xyz" );
+ } catch (Exception e) {
+ passed = true;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/build.xml
index b995be4..7102e7b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/build.xml
@@ -61,7 +61,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -74,21 +74,21 @@
<param name="appclientjar.classes" value="**/*Client*.class" />
<param name="appclientjar.files" value="${build.classes.dir}" />
<param name="appname" value="appmonitoring"/>
- <param name="appclient.jar" value="${assemble.dir}/appmonitoringAppClient.jar"/>
+ <param name="appclient.jar" value="${assemble.dir}/appmonitoringAppClient.jar"/>
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<exec executable="${ASADMIN}" failonerror="true">
<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}/appmonitoringAppClient.jar"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<echo message="appclient -client ${assemble.dir}/appmonitoringAppClient.jar -name appmonitoringClient -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
@@ -114,12 +114,12 @@
<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="appmonitoringAppClient"/>
</exec>
<ant dir="../contauth" target="undeploy"/>
<ant dir="../statementtimeout" target="undeploy-limited"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/client/Client.java
index 48693a5..ba1e406 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appbasedMonitoring/client/Client.java
@@ -49,18 +49,18 @@
stat.addDescription("App based monitoring tests");
if (getMonitorablePropertyOfConnectionPool(app1, NUM_ACQUIRED) == 2 && getMonitorablePropertyOfConnectionPool(app2, NUM_ACQUIRED) == 3 && getMonitorablePropertyOfConnectionPool(null, NUM_ACQUIRED) == 5) {
- System.out.println("Monitoring : Acquired Statistic test pass");
+ System.out.println("Monitoring : Acquired Statistic test pass");
stat.addStatus("Monitoring : Acquired Statistic test: ", stat.PASS);
} else {
- System.out.println("Monitoring : Acquired Statistic test fail");
+ System.out.println("Monitoring : Acquired Statistic test fail");
stat.addStatus("Monitoring : Acquired Statistic test: ", stat.FAIL);
}
if (getMonitorablePropertyOfConnectionPool(app1, NUM_RELEASED) == 2 && getMonitorablePropertyOfConnectionPool(app2, NUM_RELEASED) == 3 && getMonitorablePropertyOfConnectionPool(null, NUM_RELEASED) == 5) {
- System.out.println("Monitoring : Released Statistic test pass");
+ System.out.println("Monitoring : Released Statistic test pass");
stat.addStatus("Monitoring : Released Statistic test: ", stat.PASS);
} else {
- System.out.println("Monitoring : Released Statistic test fail");
+ System.out.println("Monitoring : Released Statistic test fail");
stat.addStatus("Monitoring : Released Statistic test: ", stat.FAIL);
}
@@ -69,24 +69,24 @@
public int getMonitorablePropertyOfConnectionPool(String appName, String monitoringStat) throws Exception {
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName = null;
- if(appName == null) {
+ if(appName == null) {
objectName = new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-mon,name=resources/" + poolName);
- } else {
- objectName = new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-app-mon,name=resources/" + poolName + "/" + appName);
- }
+ } else {
+ objectName = new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-app-mon,name=resources/" + poolName + "/" + appName);
+ }
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, monitoringStat);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, monitoringStat);
- System.out.println(">>>" + monitoringStat + "=" + returnValue.get("count"));
+ System.out.println(">>>" + monitoringStat + "=" + returnValue.get("count"));
return new Integer(returnValue.get("count").toString());
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.properties
index 6f7be01..5fea2aa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-autocommit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.xml
index d6e4266..0821e21 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/build.xml
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,29 +47,29 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
-
- <antcall target="setup"/>
+
+ <antcall target="setup"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -77,7 +77,7 @@
<antcall target="unsetup"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
@@ -87,12 +87,12 @@
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="jdbc-autocommit-pool"/>
- <param name="jdbc.resource.name" value="jdbc/autocommit"/>
+ <param name="jdbc.resource.name" value="jdbc/autocommit"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-autocommit-pool.steady_pool_size=2"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-autocommit-pool.steady_pool_size=2"/>
</antcall>
<antcall target="asadmin-common">
@@ -100,7 +100,7 @@
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-autocommit-pool.max_pool_size=2"/>
</antcall>
-
+
</target>
<target name="unsetup">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/client/Client.java
index 4d4563f..529b91a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/client/Client.java
@@ -27,36 +27,36 @@
public class Client {
SimpleReporterAdapter stat = new SimpleReporterAdapter();
-
+
public static void main(String[] args)
throws Exception {
Client client = new Client();
- client.runTest();
+ client.runTest();
}
-
+
public void runTest() throws Exception {
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("Autocommit Test");
+ stat.addDescription("Autocommit Test");
if ( simpleBMP.test1() ) {
- stat.addStatus(" AutoCommit test1 : ", stat.PASS);
- } else {
- stat.addStatus(" AutoCommit test1 : ", stat.FAIL);
- }
+ stat.addStatus(" AutoCommit test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(" AutoCommit test1 : ", stat.FAIL);
+ }
if ( simpleBMP.test2() ) {
- stat.addStatus(" AutoCommit test2 : ", stat.PASS);
- } else {
- stat.addStatus(" AutoCommit test2 : ", stat.FAIL);
- }
+ stat.addStatus(" AutoCommit test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(" AutoCommit test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc autocommit status: ");
- stat.printSummary();
+ System.out.println("jdbc autocommit status: ");
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/descriptor/ejb-jar.xml
index 3265f5b..b7bc795 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/descriptor/ejb-jar.xml
@@ -53,7 +53,7 @@
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>SimpleBMPEJB</ejb-name>
@@ -62,6 +62,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
index 50f1766..c780d78 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
@@ -30,67 +30,67 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
/* Get a single connection and close it */
public boolean test1() {
Connection conn = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- passed = !conn.getAutoCommit();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ try {
+ conn = ds.getConnection();
+ passed = !conn.getAutoCommit();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
public boolean test2() {
Connection conn1 = null;
Connection conn2 = null;
- boolean passed = true;
+ boolean passed = true;
- try {
- conn1 = ds.getConnection();
- conn2 = ds.getConnection();
+ try {
+ conn1 = ds.getConnection();
+ conn2 = ds.getConnection();
- passed = conn1.getAutoCommit() & conn2.getAutoCommit();
- } catch( Exception e ) {
- passed = false;
- } finally {
- if (conn1 != null ) {
- try {
- conn1.close();
- } catch( Exception ei) {}
- }
- if (conn2 != null ) {
- try {
- conn2.close();
- } catch( Exception ei) {}
- }
- }
-
- return passed;
+ passed = conn1.getAutoCommit() & conn2.getAutoCommit();
+ } catch( Exception e ) {
+ passed = false;
+ } finally {
+ if (conn1 != null ) {
+ try {
+ conn1.close();
+ } catch( Exception ei) {}
+ }
+ if (conn2 != null ) {
+ try {
+ conn2.close();
+ } catch( Exception ei) {}
+ }
}
-
+
+ return passed;
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/build.xml
index 16b1817..0715c5c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/build.xml
@@ -30,7 +30,7 @@
<project name="jdbc" default="usage" basedir=".">
&commonSetup;
&commonBuild;
-
+
&jdbcCommon;
&jdbcCommonProperties;
<!--&eeCommon;
@@ -43,94 +43,94 @@
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
</delete>
<delete>
- <fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
+ <fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
</delete>
<delete>
<fileset dir="." includes="*.output"/>
</delete>
- <record name="jdbc.output" action="start"/>
- <antcall target="run-tests"/>
- <antcall target="report">
- <param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
- </antcall>
- <record name="jdbc.output" action="stop"/>
-
+ <record name="jdbc.output" action="start"/>
+ <antcall target="run-tests"/>
+ <antcall target="report">
+ <param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
+ </antcall>
+ <record name="jdbc.output" action="stop"/>
+
</target>
-
+
<target name="jdbc-all-security">
<delete>
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
</delete>
<delete>
- <fileset dir="${env.APS_HOME}" includes="JDBCSecuritytest_results.html"/>
+ <fileset dir="${env.APS_HOME}" includes="JDBCSecuritytest_results.html"/>
</delete>
<delete>
<fileset dir="." includes="*.output"/>
</delete>
- <record name="jdbc.secman.output" action="start"/>
- <antcall target="run-tests"/>
- <antcall target="report">
- <param name="htmlfile" value="${env.APS_HOME}/JDBCSecuritytest_results.html"/>
- </antcall>
- <record name="jdbc.secman.output" action="stop"/>
+ <record name="jdbc.secman.output" action="start"/>
+ <antcall target="run-tests"/>
+ <antcall target="report">
+ <param name="htmlfile" value="${env.APS_HOME}/JDBCSecuritytest_results.html"/>
+ </antcall>
+ <record name="jdbc.secman.output" action="stop"/>
</target>
-
+
<target name="run-tests">
- <ant dir="appauth" target="all"/>
- <ant dir="appauthtx" target="all"/>
- <ant dir="contauth" target="all"/>
- <ant dir="contauthtx" target="all"/>
- <ant dir="contauth1" target="all"/>
- <ant dir="contauth1tx" target="all"/>
- <ant dir="reconfig" target="all"/>
- <ant dir="autocommit" target="all"/>
- <ant dir="jdbcjmsauth" target="all"/>
- <ant dir="nopasswdfordb" target="all"/>
+ <ant dir="appauth" target="all"/>
+ <ant dir="appauthtx" target="all"/>
+ <ant dir="contauth" target="all"/>
+ <ant dir="contauthtx" target="all"/>
+ <ant dir="contauth1" target="all"/>
+ <ant dir="contauth1tx" target="all"/>
+ <ant dir="reconfig" target="all"/>
+ <ant dir="autocommit" target="all"/>
+ <ant dir="jdbcjmsauth" target="all"/>
+ <ant dir="nopasswdfordb" target="all"/>
<ant dir="txpassthrough" target="all"/>
<ant dir="txafternontx" target="all"/>
<ant dir="txafternontxjndi" target="all"/>
- <ant dir="notxops" target="all"/>
- <ant dir="nonacc" target="all"/>
- <ant dir="lazyassoc" target="all"/>
- <ant dir="markconnectionasbad.local" target="all"/>
- <ant dir="markconnectionasbad.xa" target="all"/>
- <ant dir="statementwrapper" target="all"/>
- <ant dir="maxconnectionusage" target="all"/>
- <ant dir="switchoffACCconnpooling" target="all"/>
- <ant dir="multipleusercredentials" target="all"/>
+ <ant dir="notxops" target="all"/>
+ <ant dir="nonacc" target="all"/>
+ <ant dir="lazyassoc" target="all"/>
+ <ant dir="markconnectionasbad.local" target="all"/>
+ <ant dir="markconnectionasbad.xa" target="all"/>
+ <ant dir="statementwrapper" target="all"/>
+ <ant dir="maxconnectionusage" target="all"/>
+ <ant dir="switchoffACCconnpooling" target="all"/>
+ <ant dir="multipleusercredentials" target="all"/>
<ant dir="multiplecloseconnection" target="all"/>
- <ant dir="statementtimeout" target="all"/>
- <ant dir="conval" target="all"/>
- <ant dir="conval" target="all-assoc-with-thread"/>
- <ant dir="connleaktracing" target="all"/>
- <ant dir="conncreationretry" target="all"/>
- <ant dir="validateatmostonceperiod" target="all"/>
- <ant dir="connsharing" target="nonxa"/>
- <ant dir="connsharing/nonxa" target="all-assoc-with-thread"/>
- <ant dir="cpds" target="all"/>
- <ant dir="txisolation" target="all"/>
- <ant dir="stmtCaching_hit_miss" target="all"/>
- <ant dir="pooling" target="all"/>
- <ant dir="dmmcf" target="all"/>
- <ant dir="dmmcf.markconnectionasbad.xa" target="all"/>
- <ant dir="dmmcf.appclient" target="all"/>
+ <ant dir="statementtimeout" target="all"/>
+ <ant dir="conval" target="all"/>
+ <ant dir="conval" target="all-assoc-with-thread"/>
+ <ant dir="connleaktracing" target="all"/>
+ <ant dir="conncreationretry" target="all"/>
+ <ant dir="validateatmostonceperiod" target="all"/>
+ <ant dir="connsharing" target="nonxa"/>
+ <ant dir="connsharing/nonxa" target="all-assoc-with-thread"/>
+ <ant dir="cpds" target="all"/>
+ <ant dir="txisolation" target="all"/>
+ <ant dir="stmtCaching_hit_miss" target="all"/>
+ <ant dir="pooling" target="all"/>
+ <ant dir="dmmcf" target="all"/>
+ <ant dir="dmmcf.markconnectionasbad.xa" target="all"/>
+ <ant dir="dmmcf.appclient" target="all"/>
<ant dir="tracingsql" target="all"/>
- <ant dir="datasource40" target="all"/>
- <ant dir="custom-validation" target="all"/>
- <ant dir="custom-validation-1" target="all"/>
- <ant dir="flushconnectionpool" target="all"/>
- <ant dir="connleakreclaimnotify" target="all"/>
- <ant dir="stmtCaching_hit_miss.monitoring" target="all"/>
- <!--ant dir="transparent-pool-reconfig" target="all"/-->
- <!--ant dir="transparent-pool-reconfig-resources-xml" target="all"/-->
- <!--ant dir="sqltracemonitoring" target="all"/-->
- <!--ant dir="statementleakdetection" target="all"/-->
- <!--ant dir="appbasedMonitoring" target="all"/-->
- <ant dir="jpa-dsd" target="all" />
- <ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
- <ant dir="stmtCaching_hit_miss.fixed" target="all"/>
+ <ant dir="datasource40" target="all"/>
+ <ant dir="custom-validation" target="all"/>
+ <ant dir="custom-validation-1" target="all"/>
+ <ant dir="flushconnectionpool" target="all"/>
+ <ant dir="connleakreclaimnotify" target="all"/>
+ <ant dir="stmtCaching_hit_miss.monitoring" target="all"/>
+ <!--ant dir="transparent-pool-reconfig" target="all"/-->
+ <!--ant dir="transparent-pool-reconfig-resources-xml" target="all"/-->
+ <!--ant dir="sqltracemonitoring" target="all"/-->
+ <!--ant dir="statementleakdetection" target="all"/-->
+ <!--ant dir="appbasedMonitoring" target="all"/-->
+ <ant dir="jpa-dsd" target="all" />
+ <ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
+ <ant dir="stmtCaching_hit_miss.fixed" target="all"/>
- <!--<antcall target="all-oracle"/>-->
+ <!--<antcall target="all-oracle"/>-->
</target>
<target name="ee-all">
@@ -171,41 +171,41 @@
<ant dir="validateatmostonceperiod" target="all"/>
<ant dir="cpds" target="all"/>
<ant dir="txisolation" target="all"/>
- <ant dir="stmtCaching_hit_miss" target="all"/>
- <ant dir="pooling" target="all"/>
- <ant dir="transparent-pool-reconfig" target="all"/>
- <ant dir="transparent-pool-reconfig-resources-xml" target="all"/>
- <ant dir="jpa-dsd" target="all" />
- <ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
+ <ant dir="stmtCaching_hit_miss" target="all"/>
+ <ant dir="pooling" target="all"/>
+ <ant dir="transparent-pool-reconfig" target="all"/>
+ <ant dir="transparent-pool-reconfig-resources-xml" target="all"/>
+ <ant dir="jpa-dsd" target="all" />
+ <ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
<record name="jdbc.output" action="stop"/>
</target>
<target name="all">
- <antcall target="jdbc-all"/>
+ <antcall target="jdbc-all"/>
</target>
<target name="all-oracle">
- <record name="jdbc-oracle.output" action="start"/>
- <ant dir="connsharing" target="xa"/>
- <ant dir="simpleoradd" target="all"/>
- <ant dir="dmmcf.notxconn" target="all"/>
- <ant dir="notxconn" target="all"/>
- <ant dir="reconfig" target="userpass"/>
- <ant dir="simpleora" target="all"/>
- <ant dir="init-sql" target="all"/>
- <record name="jdbc-oracle.output" action="stop"/>
+ <record name="jdbc-oracle.output" action="start"/>
+ <ant dir="connsharing" target="xa"/>
+ <ant dir="simpleoradd" target="all"/>
+ <ant dir="dmmcf.notxconn" target="all"/>
+ <ant dir="notxconn" target="all"/>
+ <ant dir="reconfig" target="userpass"/>
+ <ant dir="simpleora" target="all"/>
+ <ant dir="init-sql" target="all"/>
+ <record name="jdbc-oracle.output" action="stop"/>
</target>
<target name="all-with-security-manager">
- <antcall target="create-jvm-options">
+ <antcall target="create-jvm-options">
<param name="option" value="-Djava.security.manager"/>
</antcall>
- <antcall target="restart-server"/>
- <antcall target="jdbc-all-security"/>
- <antcall target="delete-jvm-options">
+ <antcall target="restart-server"/>
+ <antcall target="jdbc-all-security"/>
+ <antcall target="delete-jvm-options">
<param name="option" value="-Djava.security.manager"/>
</antcall>
- <antcall target="restart-server"/>
+ <antcall target="restart-server"/>
</target>
<target name="appauth">
@@ -333,7 +333,7 @@
<ant dir="maxconnectionusage" target="all"/>
<record name="maxconnectionusage.output" action="stop"/>
</target>
-
+
<target name="statementwrapper">
<record name="statementwrapper.output" action="start"/>
<ant dir="statementwrapper" target="all"/>
@@ -383,79 +383,79 @@
</target>
<target name="stmtCaching_hit_miss">
- <record name="stmtCaching_hit_miss.output" action="start"/>
- <ant dir="stmtCaching_hit_miss" target="all"/>
- <record name="stmtCaching_hit_miss.output" action="stop"/>
+ <record name="stmtCaching_hit_miss.output" action="start"/>
+ <ant dir="stmtCaching_hit_miss" target="all"/>
+ <record name="stmtCaching_hit_miss.output" action="stop"/>
</target>
<target name="pooling">
- <record name="pooling.output" action="start"/>
- <ant dir="pooling" target="all"/>
+ <record name="pooling.output" action="start"/>
+ <ant dir="pooling" target="all"/>
</target>
<target name="dmmcf">
- <record name="dmmcf.output" action="start"/>
- <ant dir="dmmcf" target="all"/>
- <record name="dmmcf.output" action="stop"/>
+ <record name="dmmcf.output" action="start"/>
+ <ant dir="dmmcf" target="all"/>
+ <record name="dmmcf.output" action="stop"/>
</target>
<target name="dmmcf.appclient">
- <record name="dmmcf.appclient.output" action="start"/>
- <ant dir="dmmcf.appclient" target="all"/>
- <record name="dmmcf.appclient.output" action="stop"/>
+ <record name="dmmcf.appclient.output" action="start"/>
+ <ant dir="dmmcf.appclient" target="all"/>
+ <record name="dmmcf.appclient.output" action="stop"/>
</target>
<target name="tracingsql">
- <record name="tracingsql.output" action="start"/>
- <ant dir="tracingsql" target="all"/>
- <record name="tracingsql.output" action="stop"/>
+ <record name="tracingsql.output" action="start"/>
+ <ant dir="tracingsql" target="all"/>
+ <record name="tracingsql.output" action="stop"/>
</target>
<target name="datasource40">
- <record name="datasource40.output" action="start"/>
- <ant dir="datasource40" target="all"/>
- <record name="datasource40.output" action="stop"/>
+ <record name="datasource40.output" action="start"/>
+ <ant dir="datasource40" target="all"/>
+ <record name="datasource40.output" action="stop"/>
</target>
<target name="flushconnectionpool">
- <record name="flushconnectionpool.output" action="start"/>
- <ant dir="flushconnectionpool" target="all"/>
- <record name="flushconnectionpool.output" action="stop"/>
+ <record name="flushconnectionpool.output" action="start"/>
+ <ant dir="flushconnectionpool" target="all"/>
+ <record name="flushconnectionpool.output" action="stop"/>
</target>
<target name="init-sql">
- <record name="init-sql.output" action="start"/>
- <ant dir="init-sql" target="all"/>
- <record name="init-sql.output" action="stop"/>
+ <record name="init-sql.output" action="start"/>
+ <ant dir="init-sql" target="all"/>
+ <record name="init-sql.output" action="stop"/>
</target>
<target name="connleakreclaimnotify">
- <record name="connleakreclaimnotify.output" action="start"/>
- <ant dir="connleakreclaimnotify" target="all"/>
- <record name="connleakreclaimnotify.output" action="stop"/>
+ <record name="connleakreclaimnotify.output" action="start"/>
+ <ant dir="connleakreclaimnotify" target="all"/>
+ <record name="connleakreclaimnotify.output" action="stop"/>
</target>
-
+
<target name="transparent-pool-reconfig">
- <record name="transparent-pool-reconfig.output" action="start"/>
- <ant dir="transparent-pool-reconfig" target="all"/>
- <record name="transparent-pool-reconfig.output" action="stop"/>
+ <record name="transparent-pool-reconfig.output" action="start"/>
+ <ant dir="transparent-pool-reconfig" target="all"/>
+ <record name="transparent-pool-reconfig.output" action="stop"/>
</target>
<target name="transparent-pool-reconfig-resources-xml">
- <record name="transparent-pool-reconfig-resources-xml.output" action="start"/>
- <ant dir="transparent-pool-reconfig-resources-xml" target="all"/>
- <record name="transparent-pool-reconfig-resources-xml.output" action="stop"/>
+ <record name="transparent-pool-reconfig-resources-xml.output" action="start"/>
+ <ant dir="transparent-pool-reconfig-resources-xml" target="all"/>
+ <record name="transparent-pool-reconfig-resources-xml.output" action="stop"/>
</target>
<target name="jpa-dsd">
- <record name="jpa-dsd.output" action="start"/>
- <ant dir="jpa-dsd" target="all"/>
- <record name="jpa-dsd.output" action="stop"/>
+ <record name="jpa-dsd.output" action="start"/>
+ <ant dir="jpa-dsd" target="all"/>
+ <record name="jpa-dsd.output" action="stop"/>
</target>
<target name="jpa-dsd.appclient-exposed-dsd">
- <record name="jpa-dsd.appclient-exposed-dsd.output" action="start"/>
- <ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
- <record name="jpa-dsd.appclient-exposed-dsd.output" action="stop"/>
+ <record name="jpa-dsd.appclient-exposed-dsd.output" action="start"/>
+ <ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
+ <record name="jpa-dsd.appclient-exposed-dsd.output" action="stop"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.properties
index 60c72d1..9eae07e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.properties
@@ -15,20 +15,20 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-cmpsimple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="sql/cmpsimple.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.xml
index 049feff..3e15430 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/build.xml
@@ -41,7 +41,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"/>
@@ -55,39 +55,39 @@
<mkdir dir="${assemble.dir}"/>
<antcall target="package-jar"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="**/BlobTest.class, **/BlobTestHome.class,**/*Client*.class" />
+ <param name="appclientjar.classes"
+ value="**/BlobTest.class, **/BlobTestHome.class,**/*Client*.class" />
</antcall>
<antcall target="package-ear"/>
- </target>
+ </target>
<target name="package-jar">
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}"/>
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class,**/*dbschema"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
- </target>
+ </target>
<target name="package-ear">
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </ear>
+ </ear>
</target>
<target name="setup" depends="init-common">
-
+
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
-
+
<antcall target="deploy-jdbc-common"/>
<antcall target="create-persistence-resource-common"/>
@@ -96,17 +96,17 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="execute-sql-common">
@@ -114,15 +114,15 @@
</antcall>
<antcall target="delete-persistence-resource-common"/>
<antcall target="undeploy-jdbc-common"/>
- </target>
-
+ </target>
+
<target name="sql-create" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
- <target name="sql-drop" depends="init-common">
+ <target name="sql-drop" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java
index dd1166b..fdfa041 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/client/Client.java
@@ -24,11 +24,11 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args) {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "cmpsimple";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "cmpsimple";
try {
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/BlobTestBean");
@@ -39,7 +39,7 @@
BlobTest bean = bhome.create(new Integer(100), "FOO");
System.out.println("Created: " +bean.getPrimaryKey());
-
+
System.out.println("Testing new...");
bean = bhome.findByPrimaryKey(new Integer(100));
System.out.println(new String(bean.getName()));
@@ -48,16 +48,16 @@
bean = bhome.findByPrimaryKey(new Integer(1));
System.out.println(new String(bean.getName()));
- stat.addStatus(testSuite + " test : ", stat.PASS);
+ stat.addStatus(testSuite + " test : ", stat.PASS);
} catch (Exception ex) {
System.err.println("Caught an exception:");
ex.printStackTrace();
- stat.addStatus(testSuite + "test : ", stat.FAIL);
+ stat.addStatus(testSuite + "test : ", stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
index 3e7e33b..d023644 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
@@ -24,8 +24,8 @@
*/
public interface BlobTest extends jakarta.ejb.EJBObject {
-
+
public String getName() throws java.rmi.RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
index 7822a4a..37e5a37 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
@@ -25,75 +25,75 @@
public abstract class BlobTestBean implements jakarta.ejb.EntityBean {
-
+
private jakarta.ejb.EntityContext context;
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
*/
public void setEntityContext(jakarta.ejb.EntityContext aContext) {
context=aContext;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbRemove()
*/
public void ejbRemove() {
System.out.println("Debug: BlobTest ejbRemove");
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#unsetEntityContext()
*/
public void unsetEntityContext() {
context=null;
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbLoad()
*/
public void ejbLoad() {
-
+
}
-
-
+
+
/**
* @see jakarta.ejb.EntityBean#ejbStore()
*/
public void ejbStore() {
-
+
}
-
+
public abstract Integer getId();
public abstract void setId(Integer id);
public abstract java.lang.String getName();
public abstract void setName(java.lang.String name);
-
+
/*
public abstract byte[] getBlb();
public abstract void setBlb(byte[] b);
-
+
public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
setId(id);
@@ -102,21 +102,21 @@
return null;
}
- */
- public java.lang.Integer ejbCreate(Integer id, java.lang.String name)
- throws jakarta.ejb.CreateException
+ */
+ public java.lang.Integer ejbCreate(Integer id, java.lang.String name)
+ throws jakarta.ejb.CreateException
{
setId(id);
setName(name);
return null;
}
-
+
/*
public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
}
*/
-
- public void ejbPostCreate(Integer id, java.lang.String name )
+
+ public void ejbPostCreate(Integer id, java.lang.String name )
throws jakarta.ejb.CreateException {}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
index 562f1f5..0c6d46d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
@@ -24,14 +24,14 @@
*/
public interface BlobTestHome extends jakarta.ejb.EJBHome {
- /*
+ /*
public BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
public BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, jakarta.ejb.FinderException;
*/
- public BlobTest create(Integer i, java.lang.String name)
+ public BlobTest create(Integer i, java.lang.String name)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
- public BlobTest findByPrimaryKey (Integer key)
+
+ public BlobTest findByPrimaryKey (Integer key)
throws java.rmi.RemoteException, jakarta.ejb.FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/blob_ora.sql b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/blob_ora.sql
index 5410720..5f22a30 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/blob_ora.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/blob_ora.sql
@@ -1,8 +1,8 @@
drop table myblob;
create table myblob (
- id int primary key,
- name varchar2(100),
+ id int primary key,
+ name varchar2(100),
);
insert into myblob values (1, 'AAA');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/create_pointbase.sql
index 7fc1741..673c096 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
drop table myblob;
create table myblob (
- id integer NOT NULL,
- name varchar(100)
+ id integer NOT NULL,
+ name varchar(100)
);
insert into myblob values (1, 'AAA');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/ee-common.xml b/appserver/tests/appserv-tests/devtests/jdbc/config/ee-common.xml
index 6e5d736..c870bda 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/config/ee-common.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/config/ee-common.xml
@@ -70,11 +70,11 @@
<!-- clean -->
<target name="clean-classes-common" depends="init-common">
- <delete dir="${build.classes.dir}" failonerror="false"/>
+ <delete dir="${build.classes.dir}" failonerror="false"/>
</target>
<target name="clean-jars-common" depends="init-common">
- <delete dir="${assemble.dir}" failonerror="false"/>
+ <delete dir="${assemble.dir}" failonerror="false"/>
</target>
<target name="clean-common" depends="init-common">
@@ -86,7 +86,7 @@
<echo message="cleaning all *.output, *.log and RepRunConf.txt files..."/>
<delete dir="${env.APS_HOME}/build" failonerror="false"/>
<delete failonerror="false">
- <fileset dir="${env.APS_HOME}"
+ <fileset dir="${env.APS_HOME}"
includes="**/*results*.*ml,
**/*.output,
**/*.log,
@@ -103,8 +103,8 @@
<!-- compile -->
<target name="compile-common" depends="init-common">
- <antcall target="compile-common-as"/>
- <antcall target="compile-common-as80"/>
+ <antcall target="compile-common-as"/>
+ <antcall target="compile-common-as80"/>
</target>
<target name="compile-common-as" depends="init-common" unless="AS80">
@@ -132,38 +132,38 @@
<!-- war targets -->
<target name="webclient-war-common" if="hasWebclient" depends="init-common">
- <mkdir dir="${assemble.dir}"/>
- <antcall target="package-war-common">
- <!--param name="war.classes" value="${build.classes.dir}"/-->
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
+ <mkdir dir="${assemble.dir}"/>
+ <antcall target="package-war-common">
+ <!--param name="war.classes" value="${build.classes.dir}"/-->
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
+ </antcall>
</target>
<target name="package-war-without-sun.xml" unless="sun-web.xml">
- <echo message="This war does not contain sun-web.xml"/>
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/WEB-INF"/>
- <copy file="${web.xml}"
- tofile="${build.classes.dir}/WEB-INF/web.xml"/>
- <echo message="Creating war file ${war.file}"/>
- <!--jar jarfile="${war.file}" basedir="${war.classes}" update="true"-->
- <jar jarfile="${war.file}" basedir="${build.classes.dir}"
- update="true" includes ="${webclient.war.classes}">
- <fileset dir="${basedir}/web" casesensitive="yes">
- <include name="*.html"/>
- <include name="*.jsp"/>
- <include name="*.gif"/>
- <include name="*.do"/>
- <exclude name="**/*.java"/>
- </fileset>
- <fileset dir="${build.classes.dir}" casesensitive="true">
- <include name="WEB-INF/web.xml"/>
- </fileset>
- </jar>
- <echo message="created war file ${war.file}"/>
- <delete dir="${build.classes.dir}/WEB-INF" failonerror="false"/>
- <echo message="my webclient war classes are:${webclient.war.classes}"/>
+ <echo message="This war does not contain sun-web.xml"/>
+ <echo message="my build classes dir is:${build.classes.dir}"/>
+ <delete file="${war.file}"/>
+ <mkdir dir="${build.classes.dir}/WEB-INF"/>
+ <copy file="${web.xml}"
+ tofile="${build.classes.dir}/WEB-INF/web.xml"/>
+ <echo message="Creating war file ${war.file}"/>
+ <!--jar jarfile="${war.file}" basedir="${war.classes}" update="true"-->
+ <jar jarfile="${war.file}" basedir="${build.classes.dir}"
+ update="true" includes ="${webclient.war.classes}">
+ <fileset dir="${basedir}/web" casesensitive="yes">
+ <include name="*.html"/>
+ <include name="*.jsp"/>
+ <include name="*.gif"/>
+ <include name="*.do"/>
+ <exclude name="**/*.java"/>
+ </fileset>
+ <fileset dir="${build.classes.dir}" casesensitive="true">
+ <include name="WEB-INF/web.xml"/>
+ </fileset>
+ </jar>
+ <echo message="created war file ${war.file}"/>
+ <delete dir="${build.classes.dir}/WEB-INF" failonerror="false"/>
+ <echo message="my webclient war classes are:${webclient.war.classes}"/>
</target>
<target name="package-war-common">
@@ -172,58 +172,58 @@
</target>
<target name="package-war-with-sun.xml" if="sun-web.xml">
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
- <copy file="${sun-web.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml"
- failonerror="false"/>
- <copy file="${webservices.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
- failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
- tofile="${build.classes.dir}/tmp/${mappingfile.name}"
- failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
- tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
- failonerror="false"/>
- <copy file="${web.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
- <fileset dir="${build.classes.dir}">
- <include name="${war.classes}"/>
- </fileset>
- </copy>
- <echo message="Creating war file ${war.file}"/>
- <jar jarfile="${war.file}" update="true">
- <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
- <include name="**/*class*"/>
- </fileset>
- <fileset dir="${basedir}/web" casesensitive="yes">
- <include name="**/*.html"/>
- <include name="**/*.jsp"/>
- <include name="**/*.gif"/>
- <include name="**/*.do"/>
- <exclude name="**/*.java,**/*.xml,**/*.properties"/>
- </fileset>
- <fileset dir="${build.classes.dir}/tmp/" casesensitive="true">
- <include name="WEB-INF/web.xml"/>
- <include name="WEB-INF/sun-web.xml"/>
- <include name="WEB-INF/webservices.xml"/>
- <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
- <include name="${mappingfile.name}"/>
- </fileset>
- </jar>
- <echo message="created war file ${war.file}"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient war classes are:${webclient.war.classes}"/>
+ <echo message="my build classes dir is:${build.classes.dir}"/>
+ <delete file="${war.file}"/>
+ <mkdir dir="${build.classes.dir}/tmp"/>
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
+ <copy file="${sun-web.xml}"
+ tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml"
+ failonerror="false"/>
+ <copy file="${webservices.xml}"
+ tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
+ failonerror="false"/>
+ <copy file="${mappingfile.location}/${mappingfile.name}"
+ tofile="${build.classes.dir}/tmp/${mappingfile.name}"
+ failonerror="false"/>
+ <copy file="${wsdlfile.location}/${wsdlfile.name}"
+ tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
+ failonerror="false"/>
+ <copy file="${web.xml}"
+ tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"/>
+ <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
+ <fileset dir="${build.classes.dir}">
+ <include name="${war.classes}"/>
+ </fileset>
+ </copy>
+ <echo message="Creating war file ${war.file}"/>
+ <jar jarfile="${war.file}" update="true">
+ <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
+ <include name="**/*class*"/>
+ </fileset>
+ <fileset dir="${basedir}/web" casesensitive="yes">
+ <include name="**/*.html"/>
+ <include name="**/*.jsp"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.do"/>
+ <exclude name="**/*.java,**/*.xml,**/*.properties"/>
+ </fileset>
+ <fileset dir="${build.classes.dir}/tmp/" casesensitive="true">
+ <include name="WEB-INF/web.xml"/>
+ <include name="WEB-INF/sun-web.xml"/>
+ <include name="WEB-INF/webservices.xml"/>
+ <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
+ <include name="${mappingfile.name}"/>
+ </fileset>
+ </jar>
+ <echo message="created war file ${war.file}"/>
+ <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
+ <echo message="my webclient war classes are:${webclient.war.classes}"/>
</target>
<!-- ===== package ejb jar ===== -->
<target name="package-ejbjar-common">
- <mkdir dir="${assemble.dir}"/>
+ <mkdir dir="${assemble.dir}"/>
<delete file="${ejb.jar}" failonerror="false"/>
<echo message="sqe-common.xml: Generating ejb-jar inside build directory"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
@@ -232,9 +232,9 @@
<copy file="${sun-ejb-jar.xml}" tofile="${build.classes.dir}/META-INF/sun-ejb-jar.xml"/>
<!-- optional files -->
- <copy file="${sun-cmp-mappings.xml}"
+ <copy file="${sun-cmp-mappings.xml}"
tofile="${build.classes.dir}/META-INF/sun-cmp-mappings.xml"
- failonerror="false"/>
+ failonerror="false"/>
<copy file="${dbschema}" todir="${build.classes.dir}" failonerror="false"/>
<copy file="${mapping.xml}" todir="${build.classes.dir}/META-INF" failonerror="false"/>
<copy file="${webservices.xml}" todir="${build.classes.dir}/META-INF" failonerror="false"/>
@@ -250,7 +250,7 @@
</jar>
<delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
-</target>
+</target>
<!-- ========================================= -->
<!-- appclient package -->
@@ -259,20 +259,20 @@
<delete file="${appclient.jar}" failonerror="false"/>
<echo message="sqe-common.xml: Generating appclient-jar in build dir"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="${sun-application-client.xml}"
- tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes ="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
+ <copy file="${application-client.xml}"
+ tofile="${build.classes.dir}/META-INF/application-client.xml"/>
+ <copy file="${sun-application-client.xml}"
+ tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
+ <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>
- <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
-</target>
+ </metainf>
+ </jar>
+ <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
+</target>
<!-- ejb jar packager -->
<target name="ejb-jar-common" depends="init-common">
@@ -281,28 +281,28 @@
<param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
-</target>
+</target>
<!-- appclient jar create -->
<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>
+</target>
<!-- ear -->
<target name="build-ear-common" depends="fixFiles,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"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${sun-application.xml}"
+ tofile="${build.classes.dir}/META-INF/sun-application.xml"
+ failonerror="false"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
@@ -312,18 +312,18 @@
<include name="META-INF/sun-application.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </ear>
+ </ear>
</target>
<!-- ear (Without dependencies) -->
<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"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${sun-application.xml}"
+ tofile="${build.classes.dir}/META-INF/sun-application.xml"
+ failonerror="false"/>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
@@ -333,20 +333,20 @@
<include name="META-INF/sun-application.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </ear>
+ </ear>
</target>
<!-- asadmin common target -->
<target name="asadmin-common">
<echo message="Doing admin task ${admin.command}"/>
<exec executable="${ASADMIN}" failonerror="false">
- <arg line="${admin.command} ${as.props} ${operand.props}" />
+ <arg line="${admin.command} ${as.props} ${operand.props}" />
</exec>
</target>
<!-- reconfig the AppServ -->
<target name="reconfig-common" depends="init-common">
- <echo message="Reconfig has been deprecated. No Action will be taken by the Appserver !!"/>
+ <echo message="Reconfig has been deprecated. No Action will be taken by the Appserver !!"/>
</target>
@@ -363,7 +363,7 @@
<arg line="${user}"/>
</exec>
</target>
-
+
<target name="delete-user-common" depends="init-common">
<echo message="Deleting user ${user} in file realm"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -374,16 +374,16 @@
<arg line="${user}"/>
</exec>
</target>
-
+
<!-- create JDBC connection pool -->
-<target name="create-jdbc-connpool-common" depends="init-common">
+<target name="create-jdbc-connpool-common" depends="init-common">
<exec executable="${ASADMIN}" failonerror="false">
- <arg line="create-jdbc-connection-pool"/>
- <arg line="--datasourceclassname ${db.class}"/>
- <arg line="--restype ${jdbc.resource.type}"/>
+ <arg line="create-jdbc-connection-pool"/>
+ <arg line="--datasourceclassname ${db.class}"/>
+ <arg line="--restype ${jdbc.resource.type}"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="${as.props}"/>
- <arg line="${jdbc.conpool.name}"/>
+ <arg line="${jdbc.conpool.name}"/>
</exec>
<antcall target="set-pool-props"/>
</target>
@@ -403,7 +403,7 @@
<arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.Password=${db.pwd}"/>
</exec>
- <antcall target="set-${db.type}-connpool-props"/>
+ <antcall target="set-${db.type}-connpool-props"/>
</target>
<target name="set-derby-connpool-props">
@@ -474,13 +474,13 @@
</target>
<target name="set-sybase-connpool-props-common" unless="datadirect">
- <antcall target="set-non-db2-type2-connpool-props"/>
+ <antcall target="set-non-db2-type2-connpool-props"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="set"/>
<arg line="${as.props}"/>
<arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.DatabaseName=${db.name}" />
</exec>
-</target>
+</target>
<target name="set-oracle-connpool-props">
<antcall target="set-datadirect-pool-props"/>
@@ -488,7 +488,7 @@
</target>
<target name="set-oracle-connpool-props-common" unless="datadirect">
- <antcall target="set-non-db2-type2-connpool-props"/>
+ <antcall target="set-non-db2-type2-connpool-props"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="set"/>
<arg line="${as.props}"/>
@@ -500,7 +500,7 @@
<arg line="${as.props}"/>
<arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.url=${db.url}" />
</exec>
- <!-- inet driver property added for enabling CLOB's in oracle Deepa
+ <!-- inet driver property added for enabling CLOB's in oracle Deepa
Singh 01/27/04 -->
<exec executable="${ASADMIN}" failonerror="false">
<arg line="set"/>
@@ -547,7 +547,7 @@
</target>
<target name="set-pointbase-connpool-props">
- <antcall target="set-non-db2-type2-connpool-props"/>
+ <antcall target="set-non-db2-type2-connpool-props"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="set"/>
<arg line="${as.props}"/>
@@ -569,7 +569,7 @@
</target>
<target name="set-microsoft-connpool-props-common">
- <antcall target="set-non-db2-type2-connpool-props"/>
+ <antcall target="set-non-db2-type2-connpool-props"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="set"/>
<arg line="${as.props}"/>
@@ -580,7 +580,7 @@
<arg line="${as.props}"/>
<arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.databaseName=${db.name}" />
</exec>
-</target>
+</target>
<!-- create XA JDBC connection pool -->
<target name="create-jdbc-xa-connpool-common" depends="init-common">
@@ -603,7 +603,7 @@
<arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.Password=${db.pwd}"/>
</exec>
- <antcall target="set-${db.type}-connpool-props"/>
+ <antcall target="set-${db.type}-connpool-props"/>
</target>
<!-- delete JDBC connection-pool -->
@@ -750,10 +750,10 @@
<!-- drop all tables as part of cleanup -->
<target name="drop-sqe-alltables" depends="init-common">
- <echo message="Droping all tables...executing all drop_xxx.sql
+ <echo message="Droping all tables...executing all drop_xxx.sql
files"/>
<antcall target="execute-sql-common">
- <param name="sql.file.type" value="drop"/>
+ <param name="sql.file.type" value="drop"/>
</antcall>
</target>
@@ -840,8 +840,8 @@
<antcall target="set-unix-classpath-suffix"/>
</target>
-<target name="set-unix-classpath-suffix"
- depends="init-common" if="isUnix">
+<target name="set-unix-classpath-suffix"
+ depends="init-common" if="isUnix">
<!-- Get classpath-suffix -->
<exec executable="${ASADMIN}" failonerror="false"
output="${classpathsuffix.file}">
@@ -862,8 +862,8 @@
<!-- <antcall target="reconfig-common"/> -->
</target>
-<target name="set-win-classpath-suffix"
- depends="init-common" if="isWindows">
+<target name="set-win-classpath-suffix"
+ depends="init-common" if="isWindows">
<!-- Get classpath-suffix -->
<exec executable="${ASADMIN}" failonerror="false"
@@ -887,8 +887,8 @@
</target>
<!-- create/delete Connector connection pool -->
-<target name="create-connector-connpool-common"
- depends="init-common, create-connector-connpool"/>
+<target name="create-connector-connpool-common"
+ depends="init-common, create-connector-connpool"/>
<target name="create-connector-connpool" depends="init-common">
<exec executable="${ASADMIN}" failonerror="false">
@@ -907,7 +907,7 @@
<arg line="delete-connector-connection-pool"/>
<arg line="${as.props}"/>
<arg line="--target ${appserver.instance.name}"/>
- <arg line="${connector.conpool.name}"/>
+ <arg line="${connector.conpool.name}"/>
</exec>
</target>
@@ -1014,7 +1014,7 @@
<target name="create-jms-resource-topic-common" if="topic">
- <echo message="Creating JMS resource with name
+ <echo message="Creating JMS resource with name
${jms.resource.name}"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="create-jmsdest"/>
@@ -1063,11 +1063,11 @@
</target>
<!-- deploy the applications in AppServ -->
-<target name="deploy-common" depends="init-common">
+<target name="deploy-common" depends="init-common">
<antcall target="deploy-common-${execution.mode}"/>
</target>
-<target name="deploy-common-pe" depends="init-common">
+<target name="deploy-common-pe" depends="init-common">
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="${as.props}"/>
@@ -1077,7 +1077,7 @@
</exec>
</target>
-<target name="deploy-common-ee" depends="init-common">
+<target name="deploy-common-ee" depends="init-common">
<echo message="So you are using Enterprise Version eh ?"/>
<property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
@@ -1093,7 +1093,7 @@
<!-- deployed.app defaults to ${assemble.dir}/${appname}App.ear defined in properties.xml-->
<arg line="${deployed.app}"/>
</exec>
- <echo message="Deployment on target server ${appserver.instance.name}
+ <echo message="Deployment on target server ${appserver.instance.name}
successful"/>
</target>
@@ -1101,8 +1101,8 @@
<!-- start cmp deploy/undeploy targets -->
<!-- deploy the applications in java2DB for createtable -->
- <target name="deploy-common-createtable" depends="init-common">
- <echo message="using java2DB targets"/>
+ <target name="deploy-common-createtable" depends="init-common">
+ <echo message="using java2DB targets"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="${as.props}"/>
@@ -1110,23 +1110,23 @@
<arg line="--retrieve ${assemble.dir}"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="--dbvendorname ${db.type}"/>
- <arg line="--createtables=true"/>
- <arg line="--uniquetablenames=true"/>
+ <arg line="--createtables=true"/>
+ <arg line="--uniquetablenames=true"/>
<arg line="${assemble.dir}/${appname}App.ear"/>
</exec>
</target>
<!-- deploy the applications in java2DB for dropandcreatetable -->
- <target name="deploy-common-dropcreatetable" depends="init-common">
- <echo message="using java2DB targets"/>
+ <target name="deploy-common-dropcreatetable" depends="init-common">
+ <echo message="using java2DB targets"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
<arg line="${as.props}"/>
<arg line="--name ${appname}App"/>
<arg line="--retrieve ${assemble.dir}"/>
<arg line="--dbvendorname ${db.type}"/>
- <arg line="--dropandcreatetables=true"/>
- <arg line="--uniquetablenames=true"/>
+ <arg line="--dropandcreatetables=true"/>
+ <arg line="--uniquetablenames=true"/>
<arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}App.ear"/>
</exec>
@@ -1134,7 +1134,7 @@
<!-- undeploy the applications in java2DB for droptable -->
<target name="undeploy-common-droptable" depends="init-common">
- <echo message="using java2DB targets"/>
+ <echo message="using java2DB targets"/>
<echo message="Undeploying ${appname}."/>
<exec executable="${ASADMIN}">
<arg line="undeploy"/>
@@ -1142,9 +1142,9 @@
<arg line="--password ${admin.password}"/>
<arg line="--host ${admin.host}"/>
<arg line="--port ${admin.port}"/>
- <arg line="--droptables=true"/>
+ <arg line="--droptables=true"/>
<arg line="--target ${appserver.instance.name}"/>
- <arg line="${appname}App"/>
+ <arg line="${appname}App"/>
</exec>
</target>
<!-- end cmp targets -->
@@ -1159,11 +1159,11 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="--retrieve ${assemble.dir}"/>
</exec>
-</target>
+</target>
<!-- deploy/undeploy module files -->
-<!--
- Note: Set "modulefile" param to following values:
+<!--
+ Note: Set "modulefile" param to following values:
* <archive_name>.<jar|war|rar> ( for deploy-module-common)
* <archive_name> (for undeploy-module-common)
* <archive_name> (for runclient-module-common)
@@ -1228,8 +1228,8 @@
<param name="test.description" value="${test.description}"/>
</antcall>
</target>
-
-
+
+
<!-- deploy/undeploy RAR files -->
<target name="deploy-rar-common" depends="init-common">
<echo message="Deploying ${rarfile}."/>
@@ -1249,7 +1249,7 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${undeployrar}"/>
</exec>
-</target>
+</target>
<!-- setup RAR config values for all instances in a cluster -->
<target name="create-cluster-rarconfig" depends="init-common">
@@ -1294,7 +1294,7 @@
<arg line="undeploy"/>
<arg line="${as.props}"/>
<arg line="--target ${appserver.instance.name}"/>
- <arg line="${appname}App"/>
+ <arg line="${appname}App"/>
</exec>
<echo message="cmd executed for ${appserver.instance.name}"/>
</target>
@@ -1340,27 +1340,27 @@
<target name="startPB" depends="init-common">
<echo message="Starting Pointbase servers"/>
<property name="jvm.args"
- value="-Ddatabase.home=${db.root}/databases
+ value="-Ddatabase.home=${db.root}/databases
-Dpointbase.ini=${db.root}/tools/serveroption/pointbase.ini"/>
<parallel>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="true" fork="true">
<jvmarg line="${jvm.args}"/>
<arg line="/port:9092"/>
</java>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="true" fork="true">
<jvmarg line="${jvm.args}"/>
<arg line="/port:9093"/>
- </java>
+ </java>
<!-- ports 9094 and 9095 are being used by the Tomcat group -->
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="true" fork="true">
<jvmarg line="${jvm.args}"/>
<arg line="/port:9094"/>
</java>
- <java classname="com.pointbase.net.netServer"
+ <java classname="com.pointbase.net.netServer"
classpath="${db.classpath}" failonerror="true" fork="true">
<jvmarg line="${jvm.args}"/>
<arg line="/port:9095"/>
@@ -1374,21 +1374,21 @@
<echo message="Creating Pointbase Databases"/>
<sleep seconds="10"/>
<parallel>
- <java classname="com.pointbase.tools.toolsCommander"
+ <java classname="com.pointbase.tools.toolsCommander"
classpath="${db.classpath}" failonerror="false">
<arg line="${db.driver}"/>
<arg line="jdbc:pointbase:server://${db.host}:9093/sqe-samples,new"/>
<arg line="${db.user}"/>
<arg line="${db.pwd}"/>
</java>
- <java classname="com.pointbase.tools.toolsCommander"
+ <java classname="com.pointbase.tools.toolsCommander"
classpath="${db.classpath}" failonerror="false">
<arg line="${db.driver}"/>
<arg line="jdbc:pointbase:server://${db.host}:9094/ActivityDB,new"/>
<arg line="PBPUBLIC"/>
<arg line="PBPUBLIC"/>
</java>
- <java classname="com.pointbase.tools.toolsCommander"
+ <java classname="com.pointbase.tools.toolsCommander"
classpath="${db.classpath}" failonerror="false">
<arg line="${db.driver}"/>
<arg line="jdbc:pointbase:server://${db.host}:9095/app_centric_test_servlet2_4_workflow,new"/>
@@ -1397,7 +1397,7 @@
</java>
</parallel>
</target>
-
+
<target name="copyDrivers" depends="init-common">
<echo message="db.driver.dir=${db.driver.dir}"/>
<echo message="db.driver=${db.driver}"/>
@@ -1424,7 +1424,7 @@
<property file="${env.APS_HOME}/devtests/jdbc/config/oracle_datadirect.properties"/>
</target>
-<!-- this target cleans up oracle schema, drops all tables under a user
+<!-- this target cleans up oracle schema, drops all tables under a user
and creates a new one
Added 8/21/2003 Deepa+Sailaja
-->
@@ -1432,7 +1432,7 @@
<property file="${env.APS_HOME}/devtests/jdbc/config/oracle.properties"/>
<sql driver="${db.driver}" url="${db.url}"
userid="system" password="sysdba"
- onerror="continue"
+ onerror="continue"
classpath="${env.S1AS_HOME}/lib/jdbcdrivers/smoracle.jar">
drop user ${db.user} cascade;
create user ${db.user} identified by ${db.pwd};
@@ -1441,8 +1441,8 @@
</target>
<target name="reconfig" depends="init-common">
- <echo>
- Reconfig has been deprecated.
+ <echo>
+ Reconfig has been deprecated.
No Action will be taken by the Appserver !!"/>
</echo>
</target>
@@ -1460,7 +1460,7 @@
</target>
<target name="stopPB" depends="init-common" if="isUnix">
- <java classname="com.pointbase.tools.toolsCommander"
+ <java classname="com.pointbase.tools.toolsCommander"
classpath="${db.classpath}" failonerror="false">
<arg line="${db.driver}"/>
<arg line="jdbc:pointbase:server://${admin.host}:9092/sqe-samples"/>
@@ -1473,7 +1473,7 @@
<!-- ======= restart server instance targets ======= -->
<target name="restart-server-instance-common" depends="init-common">
- <antcall target="restart-server-instance-common-${execution.mode}"/>
+ <antcall target="restart-server-instance-common-${execution.mode}"/>
</target>
<target name="restart-server-instance-common-ee" depends="init-common">
@@ -1515,7 +1515,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${cluster.name}"/>
</exec>
-
+
<sleep seconds="30"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="start-cluster"/>
@@ -1549,7 +1549,7 @@
</target>
<target name="start-domain-ee" depends="init-common" if="isEE">
- <echo message="start-domain is running on Standard/Enterprise Edition..."/>
+ <echo message="start-domain is running on Standard/Enterprise Edition..."/>
<antcall target="start-domain-win"/>
<antcall target="start-domain-unix"/>
<echo message="Waiting for 90 secs to make sure server properly started..."/>
@@ -1655,15 +1655,15 @@
<target name="run-loose-reporter" depends="init-common">
<!--
- Caution:
+ Caution:
the test description should be passed as 'one' word with no spaces
- testname_and_status parameter can be overloaded by specifying multiple
+ testname_and_status parameter can be overloaded by specifying multiple
test names and their status in the order: testname teststatus
- thus, passing space seperated argument makes more sense here.
+ thus, passing space seperated argument makes more sense here.
-->
<property name="testdesc" value="default"/>
<property name="testname_and_status" value="defaultname did_not_run"/>
- <java
+ <java
classname="com.sun.ejte.ccl.reporter.LooseReporterClient"
classpath="${env.APS_HOME}/lib/reporter.jar">
<arg line="${testdesc}"/>
@@ -1673,7 +1673,7 @@
<!-- End Report Targets -->
<target name="list-components-common" depends="init-common">
- <exec executable="${ASADMIN}"
+ <exec executable="${ASADMIN}"
outputproperty="components-list" failonerror="false">
<arg line="list-components"/>
@@ -1682,7 +1682,7 @@
</target>
<target name="show-component-status-common" depends="init-common">
- <exec executable="${ASADMIN}" outputproperty="component-status"
+ <exec executable="${ASADMIN}" outputproperty="component-status"
failonerror="false">
<arg line="show-component-status"/>
<arg line="${as.props}"/>
@@ -1718,13 +1718,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>
@@ -1757,21 +1757,21 @@
</target>
<target name="setupTimer" depends="init-common" if="ee">
- <exec executable="${ASADMIN}" failonerror="false">
- <arg line="create-resource-ref"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--password ${admin.password}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="--target ${appserver.instance.name}"/>
- <arg line="${jdbc.resource.name}"/>
+ <exec executable="${ASADMIN}" failonerror="false">
+ <arg line="create-resource-ref"/>
+ <arg line="--user ${admin.user}"/>
+ <arg line="--password ${admin.password}"/>
+ <arg line="--host ${admin.host}"/>
+ <arg line="--port ${admin.port}"/>
+ <arg line="--target ${appserver.instance.name}"/>
+ <arg line="${jdbc.resource.name}"/>
</exec>
<exec executable="${ASADMIN}" failonerror="false">
- <arg line="set"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--password ${admin.password}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
+ <arg line="set"/>
+ <arg line="--user ${admin.user}"/>
+ <arg line="--password ${admin.password}"/>
+ <arg line="--host ${admin.host}"/>
+ <arg line="--port ${admin.port}"/>
<arg line="${appserver.instance.name}-config.ejb-container.ejb-timer-service.timer-datasource=${jdbc.resource.name}"/>
</exec>
<echo message="creating timer table from ${env.S1AS_HOME}/lib/install/ejbtimer_${db.type}"/>
@@ -1814,17 +1814,17 @@
<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>
<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"/>
<exec executable="${ASADMIN}" failonerror="true">
<env key="AS_ADMIN_PORT" value="${admin.port}"/>
@@ -1832,8 +1832,8 @@
<env key="AS_ADMIN_PASSWORD" value="${admin.password}"/>
<env key="AS_ADMIN_HOST" value="${admin.host}"/>
<env key="AS_ADMIN_INSTANCE" value="${appserver.instance.name}"/>
- <arg line="--target ${appserver.instance.name}
- multimode --file ${asadmin.file}" />
+ <arg line="--target ${appserver.instance.name}
+ multimode --file ${asadmin.file}" />
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml b/appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml
index 01a3246..91afceb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml
@@ -18,26 +18,26 @@
<property environment="env"/>
-<target name="init-common"
- depends="setdefaultmode, setToolProperty,setS1ASclassPath,setS1AS80classPath,setS1WSclassPath,
- setJWSDPclassPath,setTimeStamp">
+<target name="init-common"
+ depends="setdefaultmode, setToolProperty,setS1ASclassPath,setS1AS80classPath,setS1WSclassPath,
+ setJWSDPclassPath,setTimeStamp">
<exec executable="uname" outputproperty="hostname">
<arg line="-n"/>
- </exec>
+ </exec>
<exec executable="uname" outputproperty="osname">
<arg line="-s"/>
</exec>
-
+
<property name="pe" value="Platform Edition of S1AS"/>
<!-- Appserv properties -->
<property name="classpathsuffix.file" value="classpathsuffix.txt"/>
<property name="apptype" value="application"/>
<property name="appuser" value="j2ee"/>
- <property name="apppwd" value="j2ee"/>
+ <property name="apppwd" value="j2ee"/>
<property name="authrealmname" value="file"/>
- <property name="serverinstance.name" value="test-server"/>
+ <property name="serverinstance.name" value="test-server"/>
<echo file="${admin.password.file}" append="false"/>
<property name="as.props"
value="--user ${admin.user} --passwordfile ${admin.password.file} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
@@ -52,7 +52,7 @@
<property name="jms.factory.type" value="jakarta.jms.QueueConnectionFactory"/>
<property name="jms.resource.name" value="jms/SampleQueue"/>
<property name="jms.resource.type" value="jakarta.jms.Queue"/>
- <property name="jms.factory.type"
+ <property name="jms.factory.type"
value="jakarta.jms.QueueConnectionFactory" />
<property name="queue.property.name" value="imqDestinationName" />
<property name="queue.property.value" value="SampleQueue" />
@@ -81,7 +81,7 @@
<property name="mqadmin.password" value="admin"/>
<!-- pointbase properties -->
- <!-- Changed to derby properties
+ <!-- Changed to derby properties
<property file="${env.APS_HOME}/devtests/jdbc/config/pointbase.properties"/>
<property name="db.root" value="${env.S1AS_HOME}/pointbase"/>
<property name="db.classpath" value="${db.root}/lib/pbtools.jar:${db.root}/lib/pbclient.jar:${db.root}/lib/pbembedded.jar"/>-->
@@ -91,7 +91,7 @@
<!-- Test Harness properties -->
<property name="glassfish-acc.xml" value="${env.S1AS_HOME}/domains/domain1/config/glassfish-acc.xml"/>
- <property name="build.base.dir"
+ <property name="build.base.dir"
value="${env.APS_HOME}/build/${execution.mode}/${os.arch}_${hostname}_${osname}/${module}"/>
<property name="build.classes.dir" value="${build.base.dir}/classes"/>
<property name="assemble.dir" value="${build.base.dir}/archive"/>
@@ -117,14 +117,14 @@
<property name="component.name" value="${appname}App"/>
<property name="test.base" value="pe"/>
- <property name="base.report.dir"
- value="${env.APS_HOME}/reports/${test.base}-${execution.mode}"/>
+ <property name="base.report.dir"
+ value="${env.APS_HOME}/reports/${test.base}-${execution.mode}"/>
<!--
- <property name="results.golden.list.file"
- value="${env.APS_HOME}/build-config/results_baseline.properties"/>
+ <property name="results.golden.list.file"
+ value="${env.APS_HOME}/build-config/results_baseline.properties"/>
<property name="results.analysis.file" value="test_analysis"/>
- <property name="results.list.file"
- value="${env.rPS_HOME}/build-config/results.properties"/>
+ <property name="results.list.file"
+ value="${env.rPS_HOME}/build-config/results.properties"/>
<property name="results.summary.file" value="summaryreport"/>
-->
<!-- Test Harness properties for WebTest ============ -->
@@ -151,8 +151,8 @@
<fileset dir="${env.APS_HOME}/lib" includes="**/*.jar,**/*.zip"/>
<fileset dir="${env.ANT_HOME}/lib" includes="*.jar"/>
</path>
- <pathconvert pathsep=":"
- property="s1as.classpath"
+ <pathconvert pathsep=":"
+ property="s1as.classpath"
refid="s1as_classpath_jars"/>
</target>
@@ -169,11 +169,11 @@
<target name="setS1WSclassPath" if="isS1WS">
<path id="s1ws_classpath_jars">
- <fileset dir="${env.IWS_SERVER_HOME}/bin/https/jar"
+ <fileset dir="${env.IWS_SERVER_HOME}/bin/https/jar"
includes="*.jar"/>
</path>
- <pathconvert pathsep=":"
- property="s1ws.classpath"
+ <pathconvert pathsep=":"
+ property="s1ws.classpath"
refid="s1ws_classpath_jars"/>
</target>
@@ -187,11 +187,11 @@
refid="jwsdp_classpath_jars"/>
</target>
-<target name="setToolProperty"
+<target name="setToolProperty"
depends="setOSConditions,setToolWin,setToolUnix">
</target>
-<target name="setOSConditions">
+<target name="setOSConditions">
<condition property="isUnix">
<os family="unix"/>
</condition>
@@ -200,7 +200,7 @@
</condition>
</target>
-<target name="setToolWin" if="isWindows">
+<target name="setToolWin" if="isWindows">
<property name="APPCLIENT" value="${env.S1AS_HOME}/bin/appclient.bat"/>
<property name="ASADMIN" value="${env.S1AS_HOME}/bin/asadmin.bat"/>
<property name="IMQCMD" value="${env.S1AS_HOME}/imq/bin/imqcmd.exe"/>
@@ -218,7 +218,7 @@
<property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wscompile.bat"/>
</target>
-<target name="setToolUnix" if="isUnix">
+<target name="setToolUnix" if="isUnix">
<property name="APPCLIENT" value="${env.S1AS_HOME}/bin/appclient"/>
<property name="ASADMIN" value="${env.S1AS_HOME}/bin/asadmin"/>
<property name="IMQCMD" value="${env.S1AS_HOME}/imq/bin/imqcmd"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/mail.xml b/appserver/tests/appserv-tests/devtests/jdbc/config/mail.xml
index 66b7fe5..4cb32d5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/config/mail.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/config/mail.xml
@@ -22,11 +22,11 @@
<property name="mail.host" value="ha21sca-mail1.sfbay.sun.com"/>
<property name="machine.config" value="default_${os.name}_${os.arch}" />
<target name="mail" depends="init-common">
- <mail from="${results.mailer}" tolist="${results.mailee}"
- subject="Test results for ${machine.config}"
- mailhost="${mail.host}"
- message="Yeh lo results...">
- <fileset dir="${env.SPS_HOME}"
+ <mail from="${results.mailer}" tolist="${results.mailee}"
+ subject="Test results for ${machine.config}"
+ mailhost="${mail.host}"
+ message="Yeh lo results...">
+ <fileset dir="${env.SPS_HOME}"
includes="test_results.html"/>
- </mail>
+ </mail>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.properties
index b1b1fae..8653ef5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-connectioncreationretry"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="poolname" value="jdbc-connectioncreationretry"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.xml
index dc25220..c2fd088 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/build.xml
@@ -22,8 +22,8 @@
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
<!ENTITY run SYSTEM "./../../../config/run.xml">
- <!ENTITY jdbcxml SYSTEM "./../JdbcCommon.xml">
- <!ENTITY jdbcProps SYSTEM "./../JdbcCommon.properties">
+ <!ENTITY jdbcxml SYSTEM "./../JdbcCommon.xml">
+ <!ENTITY jdbcProps SYSTEM "./../JdbcCommon.properties">
]>
<project name="mix" default="usage" basedir=".">
@@ -71,13 +71,13 @@
<target name="run" depends="init-common">
<antcall target="stop-derby"/>
- <parallel>
- <antcall target="runclient-common"/>
- <sequential>
- <sleep seconds="15"/>
- <antcall target="start-derby"/>
- </sequential>
- </parallel>
+ <parallel>
+ <antcall target="runclient-common"/>
+ <sequential>
+ <sleep seconds="15"/>
+ <antcall target="start-derby"/>
+ </sequential>
+ </parallel>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/client/Client.java
index dff045a..7ec3880 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/client/Client.java
@@ -36,12 +36,12 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP convalBMP = convalBMPHome.create();
- stat.addDescription("Connection Creation Retry Tests");
+ stat.addDescription("Connection Creation Retry Tests");
if (convalBMP.test1()) {
- stat.addStatus(testSuite + "test ", stat.PASS);
+ stat.addStatus(testSuite + "test ", stat.PASS);
} else {
- stat.addStatus(testSuite + "test ", stat.FAIL);
+ stat.addStatus(testSuite + "test ", stat.FAIL);
}
stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
index cd1d898..5d1b466 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
@@ -41,7 +41,7 @@
}
-
+
/* Get a single connection and close it */
public boolean test1(){
Connection conn = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.properties
index 4959885..021d74c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementwrapper"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.xml
index 27d58ec..675d758 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/build.xml
@@ -42,7 +42,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,13 +54,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -76,7 +76,7 @@
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -90,7 +90,7 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props"
+ <param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.ql-jdbc-pool.steady_pool_size=${steady-pool-size}"/>
</antcall>
@@ -124,14 +124,14 @@
</target>
-<target name="switch-on-monitoring">
+<target name="switch-on-monitoring">
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="server.monitoring-service.module-monitoring-levels.jdbc-connection-pool=HIGH"/>
</antcall>
</target>
-<target name="switch-off-monitoring">
+<target name="switch-off-monitoring">
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
@@ -145,7 +145,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/client/SimpleBMPClient.java
index a3b5855..c8b9e6e 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/client/SimpleBMPClient.java
@@ -34,7 +34,7 @@
public class SimpleBMPClient {
-
+
private static long count = 0;
private static final Object lock = new Integer(10);
private long totalIterations = 0;
@@ -84,7 +84,7 @@
for (int i = 0; i < threads.length; i++) {
threads[i].start();
}
-// System.out.println("Started at : " +
+// System.out.println("Started at : " +
TimerTask task = new TimerTask() {
public void run() {
@@ -102,7 +102,7 @@
System.out.println("-----------------------------------------------------------------------------------");
System.out.println("Total getConnection() : " + totalCount + ", monitoring-count : " + monitoringCount);
System.out.println("-----------------------------------------------------------------------------------");
-
+
if(totalCount == monitoringCount){
stat.addStatus(testSuite + " Perf-test : ", stat.PASS);
}else{
@@ -112,7 +112,7 @@
e.printStackTrace();
}
stat.printSummary();
-
+
}
};
Timer timer = new Timer();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/sql/create_pointbase.sql
index dd4c5e5..11e61ee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/sql/create_pointbase.sql
@@ -1,10 +1,10 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.properties
index 05a29ca..37e3ca6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementwrapper"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.xml
index 9cd6061..b7ca06c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -80,7 +80,7 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props"
+ <param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.ql-jdbc-pool.connection_leak_timeout_in_seconds=10"/>
</antcall>
@@ -91,11 +91,11 @@
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -103,7 +103,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/client/SimpleBMPClient.java
index a9a87e3..5e3d5bf 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/client/SimpleBMPClient.java
@@ -27,21 +27,21 @@
public class SimpleBMPClient {
- public static int NO_OF_THREADS = 20;
+ public static int NO_OF_THREADS = 20;
public int failedCount = 0;
SimpleReporterAdapter stat = new SimpleReporterAdapter();
String testSuite = "ConnectionLeakReclaim ";
public SimpleBMPClient(){
- execute();
+ execute();
}
public static void main(String[] args) {
- new SimpleBMPClient();
+ new SimpleBMPClient();
}
private void execute() {
- stat.addDescription("Connection Leak Reclaim Notify Tests");
+ stat.addDescription("Connection Leak Reclaim Notify Tests");
WorkerThread workers[] = new WorkerThread[NO_OF_THREADS];
for(int i=0; i< workers.length;i++){
workers[i] = new WorkerThread();
@@ -60,11 +60,11 @@
for(int i=0; i<workers.length;i++){
workers[i].setExit(true);
}
- if(failedCount > 0) {
- stat.addStatus(testSuite + "test1 : ", stat.FAIL);
- } else {
- stat.addStatus(testSuite + "test1 : ", stat.PASS);
- }
+ if(failedCount > 0) {
+ stat.addStatus(testSuite + "test1 : ", stat.FAIL);
+ } else {
+ stat.addStatus(testSuite + "test1 : ", stat.PASS);
+ }
stat.printSummary();
}
@@ -88,7 +88,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- test(simpleBMP);
+ test(simpleBMP);
}catch(Exception e){
System.out.println("Thread : " + Thread.currentThread().getName() + "did not run ");
e.printStackTrace();
@@ -97,10 +97,10 @@
}
public boolean test(SimpleBMP bmp) throws RemoteException{
- if( ! bmp.test1()) {
- SimpleBMPClient.this.failedCount++;
- }
- return true;
+ if( ! bmp.test1()) {
+ SimpleBMPClient.this.failedCount++;
+ }
+ return true;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/descriptor/ejb-jar.xml
index 951ef92..addd03a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/descriptor/ejb-jar.xml
@@ -52,6 +52,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
index 4857269..403288b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
@@ -29,7 +29,7 @@
private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
- m_ctx = context;
+ m_ctx = context;
}
public Integer ejbCreate() throws CreateException {
@@ -42,26 +42,26 @@
Connection conn = null;
boolean passed = true;
Context context = null;
- long startTime = 0, endTime = 0, timeTaken =0;
+ long startTime = 0, endTime = 0, timeTaken =0;
try {
context = new InitialContext();
ds = (DataSource) context.lookup("java:comp/env/jdbc/DataSource");
} catch(NamingException e) {
throw new EJBException("cant find datasource");
}
- try {
+ try {
startTime = System.currentTimeMillis();
conn = ds.getConnection();
- endTime = System.currentTimeMillis();
+ endTime = System.currentTimeMillis();
} catch (Exception e) {
e.printStackTrace();
passed = false;
- }
- timeTaken = (endTime-startTime)/1000;
+ }
+ timeTaken = (endTime-startTime)/1000;
System.out.println("preparedStmtTest : TimeTaken : " + timeTaken);
- if(timeTaken > 59) {
- passed = false;
- }
+ if(timeTaken > 59) {
+ passed = false;
+ }
return passed;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.properties
index c4cbed0..61986d7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-connectionleaktracing"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="poolname" value="jdbc-connectionleaktracing"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.xml
index 525787d..4f6c720 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/build.xml
@@ -19,9 +19,9 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../config/run.xml">
+ <!ENTITY run SYSTEM "./../config/run.xml">
]>
<project name="mix" default="usage" basedir=".">
@@ -51,9 +51,9 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
<param name="ejbjar.classes"
- value="**/ejb/*.class"/>
+ value="**/ejb/*.class"/>
<param name="appclientjar.classes"
- value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class"/>
+ value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class"/>
</antcall>
</target>
@@ -67,7 +67,7 @@
</target>
<target name="run" depends="init-common">
- <antcall target="runclient-common"/>
+ <antcall target="runclient-common"/>
</target>
@@ -77,7 +77,7 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="delete-jdbc-stuff"/>
- <antcall target="undeploy-common"/>
+ <antcall target="undeploy-common"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/client/Client.java
index 671c68c..082f433 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/client/Client.java
@@ -32,20 +32,20 @@
String testSuite = "ConnectionLeakTracing";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- stat.addDescription("Connection Leak Tracing Tests");
+ stat.addDescription("Connection Leak Tracing Tests");
- for(int i=0; i<3; i++){
+ for(int i=0; i<3; i++){
SimpleBMPHome convalBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP convalBMP = convalBMPHome.create();
- if(!convalBMP.test1()){
- stat.addStatus(testSuite + "test1 : ", stat.FAIL);
- break;
- }
- Thread.sleep(20000);
- }
- stat.addStatus(testSuite + "test1 : ", stat.PASS);
+ if(!convalBMP.test1()){
+ stat.addStatus(testSuite + "test1 : ", stat.FAIL);
+ break;
+ }
+ Thread.sleep(20000);
+ }
+ stat.addStatus(testSuite + "test1 : ", stat.PASS);
stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/descriptor/ejb-jar.xml
index bc6233e..7db7cb2 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/descriptor/ejb-jar.xml
@@ -31,16 +31,16 @@
<ejb-name>SimpleBMPEJB</ejb-name>
<home>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMPHome</home>
<remote>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMP</remote>
- <ejb-class>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMPBean</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Container</transaction-type>
- <!--<persistence-type>Bean</persistence-type>
+ <ejb-class>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMPBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ <!--<persistence-type>Bean</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>False</reentrant>
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>-->
+ </security-identity>-->
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
index 98a69ed..dd98a7d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
@@ -28,7 +28,7 @@
private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
- m_ctx = context;
+ m_ctx = context;
}
public Integer ejbCreate() throws CreateException {
@@ -36,7 +36,7 @@
}
-
+
/* Get a single connection and close it */
public boolean test1() {
Connection conn = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/build.xml
index 93b22e5..be1352a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/build.xml
@@ -23,7 +23,7 @@
]>
<project name="jdbc" default="usage" basedir=".">
-
+
&eeCommon;
&eeCommonProperties;
@@ -32,24 +32,24 @@
<target name="all">
<antcall target="${execution.mode}-all"/>
</target>
-
+
<target name="pe-all">
<delete>
<fileset dir="." includes="*.output"/>
</delete>
<record name="connsharing.output" action="start" />
- <ant dir="nonxa" target="all"/>
- <ant dir="xa" target="all"/>
+ <ant dir="nonxa" target="all"/>
+ <ant dir="xa" target="all"/>
<record name="connsharing.output" action="stop" />
</target>
-
+
<target name="ee-all">
<delete>
<fileset dir="." includes="*.output"/>
</delete>
<record name="connsharing.output" action="start" />
- <ant dir="nonxa" target="all"/>
- <ant dir="xa" target="all"/>
+ <ant dir="nonxa" target="all"/>
+ <ant dir="xa" target="all"/>
<record name="connsharing.output" action="stop" />
</target>
@@ -65,9 +65,9 @@
<record name="xa.output" action="stop" />
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the jdbc tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the jdbc tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.properties
index 6dbdb88..249fb74 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-connsharingnonxa"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.xml
index d90a558..7dd22cb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/build.xml
@@ -41,11 +41,11 @@
&eeSetup;
&eeProperties;
&testproperties;
- -->
+ -->
<property name="execution.mode" value="pe"/>
-
-
+
+
<target name="all" depends="build,deploy,run,undeploy"/>
<target name="all-assoc-with-thread" depends="build,deploy,set-assoc-with-thread,run,undeploy"/>
@@ -64,13 +64,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-connsharing-pool"/>
@@ -114,12 +114,12 @@
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-connsharing-pool"/>
- <param name="jdbc.resource.name" value="jdbc/connsharing"/>
+ <param name="jdbc.resource.name" value="jdbc/connsharing"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-connsharing-pool"/>
- <param name="jdbc.resource.name" value="jdbc/connsharing2"/>
+ <param name="jdbc.resource.name" value="jdbc/connsharing2"/>
</antcall>
<antcall target="deploy-common"/>
@@ -133,14 +133,14 @@
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -149,7 +149,7 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/connsharing"/>
</antcall>
-
+
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/connsharing2"/>
</antcall>
@@ -175,7 +175,7 @@
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/descriptor/ejb-jar.xml
index abc8439..3411113 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/descriptor/ejb-jar.xml
@@ -48,11 +48,11 @@
<transaction-type>Container</transaction-type>
<ejb-ref>
<description></description>
- <ejb-ref-name>ejb/SimpleSession2EJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
+ <ejb-ref-name>ejb/SimpleSession2EJB</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
<home>com.sun.s1asdev.jdbc.connsharing.nonxa.ejb.SimpleSession2Home</home>
<remote>com.sun.s1asdev.jdbc.connsharing.nonxa.ejb.SimpleSession2</remote>
- <ejb-link>SimpleSession2EJB</ejb-link>
+ <ejb-link>SimpleSession2EJB</ejb-link>
</ejb-ref>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
@@ -93,6 +93,6 @@
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
index 81e154a..ec6d0af 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
@@ -28,14 +28,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -44,57 +44,57 @@
/**
*/
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2' WHERE c_id=100");
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2' WHERE c_id=100");
- return true;
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
+ return true;
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+
+ }
+
public boolean test2() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2_2' WHERE c_id=200");
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2_2' WHERE c_id=200");
- return true;
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
+ return true;
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
}
public boolean test3() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/create_pointbase.sql
index 8cb3174..721d9e8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/create_pointbase.sql
@@ -1,6 +1,6 @@
-Drop table CONNSHARING;
-
-CREATE TABLE CONNSHARING (
- c_id integer constraint pk_key primary key,
- c_phone char(25)
-);
+Drop table CONNSHARING;
+
+CREATE TABLE CONNSHARING (
+ c_id integer constraint pk_key primary key,
+ c_phone char(25)
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/drop_pointbase.sql
index c2817f6..77d1d5a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table CONNSHARING;
+Drop table CONNSHARING;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.properties
index be244a3..e93d487 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-connsharingxa"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.xml
index 21ab02e..109029b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/build.xml
@@ -39,7 +39,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,13 +51,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-oracle-xa-common">
<param name="oracle.xapool.name" value="jdbc-connsharing-xa-pool"/>
@@ -69,7 +69,7 @@
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -78,15 +78,15 @@
<antcall target="run-lazy-enlist"/>
</target>
-
+
<target name="run-lazy-enlist" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-connsharing-xa-pool.property.LazyConnectionEnlistment=true"/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-connsharing-xa-pool.property.LazyConnectionEnlistment=true"/>
</antcall>
<antcall target="runclient-common"/>
@@ -100,7 +100,7 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/connsharing-xa"/>
</antcall>
-
+
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/connsharing2-xa"/>
</antcall>
@@ -108,9 +108,9 @@
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-connsharing-xa-pool"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/client/Client.java
index 32a9624..a5f4b6f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/client/Client.java
@@ -25,45 +25,45 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "connsharing-test1 ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "connsharing-test1 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running notxops testSuite1 ");
+
+ stat.addDescription("Running notxops testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if (simpleSession.test1() && simpleSession.query()) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
if (simpleSession.test2() && simpleSession.query()) {
- stat.addStatus( testSuite + " test2 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test2 : " , stat.FAIL );
- }
+ stat.addStatus( testSuite + " test2 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test2 : " , stat.FAIL );
+ }
if (simpleSession.test3() && simpleSession.query2()) {
- stat.addStatus( testSuite + " test3 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test3 : " , stat.FAIL );
- }
+ stat.addStatus( testSuite + " test3 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test3 : " , stat.FAIL );
+ }
if (simpleSession.test4() && simpleSession.query2()) {
- stat.addStatus( testSuite + " test4 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test4 : " , stat.FAIL );
- }
-
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test4 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test4 : " , stat.FAIL );
+ }
+
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/descriptor/ejb-jar.xml
index bb887bc..71162c9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/descriptor/ejb-jar.xml
@@ -49,11 +49,11 @@
<transaction-type>Container</transaction-type>
<ejb-ref>
<description></description>
- <ejb-ref-name>ejb/SimpleSession2EJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
+ <ejb-ref-name>ejb/SimpleSession2EJB</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
<home>com.sun.s1asdev.jdbc.connsharing.xa.ejb.SimpleSession2Home</home>
<remote>com.sun.s1asdev.jdbc.connsharing.xa.ejb.SimpleSession2</remote>
- <ejb-link>SimpleSession2EJB</ejb-link>
+ <ejb-link>SimpleSession2EJB</ejb-link>
</ejb-ref>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
@@ -87,6 +87,6 @@
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
index 062ebe2..efa1a4f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
@@ -28,14 +28,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -44,37 +44,37 @@
/**
* Get connection and do some database inserts. Then call another
* EJB's method in the same transaction and change the inserted value.
- * Since all this is in the same tx, the other bean's method should
+ * Since all this is in the same tx, the other bean's method should
* get the same connection (physical) and hence be able to see the
* inserted value even though the tx has not committed yet.
* The idea is to test connection sharing
*/
public boolean test1(String newVal, int key) throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Statement stmt1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone = '"+ newVal +"' WHERE" +
- " c_id = " + key);
-
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone = '"+ newVal +"' WHERE" +
+ " c_id = " + key);
+
return true;
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
index 1c12088..c93560f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
@@ -28,14 +28,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -44,47 +44,47 @@
/**
* Get connection and do some database inserts. Then call another
* EJB's method in the same transaction and change the inserted value.
- * Since all this is in the same tx, the other bean's method should
+ * Since all this is in the same tx, the other bean's method should
* get the same connection (physical) and hence be able to see the
* inserted value even though the tx has not committed yet.
* The idea is to test connection sharing
*/
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
-
- Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
- SimpleSession2Home home = (SimpleSession2Home)
- javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
- SimpleSession2 bean = home.create();
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
- return bean.test1("ADITYA_BEAN_2", 100);
+ Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
+ SimpleSession2Home home = (SimpleSession2Home)
+ javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
+ SimpleSession2 bean = home.create();
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ return bean.test1("ADITYA_BEAN_2", 100);
+
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+ }
+
/**
* Get connection and do some database inserts. Then call another
* EJB's method in the same transaction and change the inserted value.
- * Since all this is in the same tx, the other bean's method should
+ * Since all this is in the same tx, the other bean's method should
* get the same connection (physical) and hence be able to see the
* inserted value even though the tx has not committed yet.
* This test does the same thing as test1 except that it closes the
@@ -92,119 +92,119 @@
* The idea is to test connection sharing
*/
public boolean test2() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
-
- stmt1.close();
- conn1.close();
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
- Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
- SimpleSession2Home home = (SimpleSession2Home)
- javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
- SimpleSession2 bean = home.create();
+ stmt1.close();
+ conn1.close();
- return bean.test1("ADITYA_BEAN_2", 100);
+ Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
+ SimpleSession2Home home = (SimpleSession2Home)
+ javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
+ SimpleSession2 bean = home.create();
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ return bean.test1("ADITYA_BEAN_2", 100);
+
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
}
public boolean test3() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Connection conn2 = null;
- Statement stmt1 = null;
- Statement stmt2 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Connection conn2 = null;
+ Statement stmt1 = null;
+ Statement stmt2 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
-
- conn2 = ds.getConnection();
- stmt2 = conn2.createStatement();
- stmt2.executeUpdate( "INSERT INTO CONNSHARING values (200, 'ADITYA_200')");
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
- Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
- SimpleSession2Home home = (SimpleSession2Home)
- javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
- SimpleSession2 bean = home.create();
+ conn2 = ds.getConnection();
+ stmt2 = conn2.createStatement();
+ stmt2.executeUpdate( "INSERT INTO CONNSHARING values (200, 'ADITYA_200')");
- return bean.test1("ADITYA_BEAN_2_2", 200);
+ Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
+ SimpleSession2Home home = (SimpleSession2Home)
+ javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
+ SimpleSession2 bean = home.create();
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ return bean.test1("ADITYA_BEAN_2_2", 200);
+
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
}
public boolean test4() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Connection conn2 = null;
- Statement stmt1 = null;
- Statement stmt2 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Connection conn2 = null;
+ Statement stmt1 = null;
+ Statement stmt2 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
-
- stmt1.close();
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "INSERT INTO CONNSHARING values (100, 'ADITYA')");
+
+ stmt1.close();
conn1.close();
- conn2 = ds.getConnection();
- stmt2 = conn2.createStatement();
- stmt2.executeUpdate( "INSERT INTO CONNSHARING values (200, 'ADITYA_200')");
+ conn2 = ds.getConnection();
+ stmt2 = conn2.createStatement();
+ stmt2.executeUpdate( "INSERT INTO CONNSHARING values (200, 'ADITYA_200')");
- stmt2.close();
- conn2.close();
+ stmt2.close();
+ conn2.close();
- Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
- SimpleSession2Home home = (SimpleSession2Home)
- javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
- SimpleSession2 bean = home.create();
+ Object o = ic_.lookup("java:comp/env/ejb/SimpleSession2EJB");
+ SimpleSession2Home home = (SimpleSession2Home)
+ javax.rmi.PortableRemoteObject.narrow( o, SimpleSession2Home.class);
+ SimpleSession2 bean = home.create();
- return bean.test1("ADITYA_BEAN_2_2", 200);
+ return bean.test1("ADITYA_BEAN_2_2", 200);
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
}
/**
@@ -213,50 +213,50 @@
*/
public boolean query() throws Exception {
DataSource ds = (DataSource) ic_.lookup("java:comp/env/DataSource");
- Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Connection conn = null;
+ Statement stmt = null;
+ ResultSet rs = null;
- try {
- conn = ds.getConnection();
- stmt = conn.createStatement();
- rs = stmt.executeQuery("SELECT * FROM CONNSHARING WHERE c_id=100");
- if ( rs.next() ) {
+ try {
+ conn = ds.getConnection();
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("SELECT * FROM CONNSHARING WHERE c_id=100");
+ if ( rs.next() ) {
String str = rs.getString( 2 );
- System.out.println(" str => " + str );
- if( "ADITYA_BEAN_2".equals(str.trim()) ) {
- return true;
- }
- }
+ System.out.println(" str => " + str );
+ if( "ADITYA_BEAN_2".equals(str.trim()) ) {
+ return true;
+ }
+ }
- return false;
- } catch( SQLException e ) {
- e.printStackTrace();
- return false;
- } finally {
- if( rs != null ) {
- try { rs.close() ; }catch( Exception e ) {}
- }
+ return false;
+ } catch( SQLException e ) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if( rs != null ) {
+ try { rs.close() ; }catch( Exception e ) {}
+ }
- if( stmt != null) {
- try { stmt.close(); } catch(Exception e) { }
- }
-
- //cleanup table
- try {
- stmt = conn.createStatement();
- stmt.executeUpdate( "DELETE FROM CONNSHARING WHERE c_id=100" );
- stmt.close();
- } catch( Exception e ) {
- e.printStackTrace();
- }
+ if( stmt != null) {
+ try { stmt.close(); } catch(Exception e) { }
+ }
- if( conn != null ) { try { conn.close(); } catch(Exception e) { }
- }
- }
-
+ //cleanup table
+ try {
+ stmt = conn.createStatement();
+ stmt.executeUpdate( "DELETE FROM CONNSHARING WHERE c_id=100" );
+ stmt.close();
+ } catch( Exception e ) {
+ e.printStackTrace();
+ }
+
+ if( conn != null ) { try { conn.close(); } catch(Exception e) { }
+ }
+ }
+
}
/**
@@ -265,72 +265,72 @@
*/
public boolean query2() throws Exception {
DataSource ds = (DataSource) ic_.lookup("java:comp/env/DataSource");
- Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
- ResultSet rs1 = null;
- String str1 = null;
- String str2 = null;
-
+ Connection conn = null;
+ Statement stmt = null;
+ ResultSet rs = null;
+ ResultSet rs1 = null;
+ String str1 = null;
+ String str2 = null;
- try {
- conn = ds.getConnection();
- stmt = conn.createStatement();
- rs = stmt.executeQuery("SELECT * FROM CONNSHARING WHERE c_id=100");
- if ( rs.next() ) {
+
+ try {
+ conn = ds.getConnection();
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("SELECT * FROM CONNSHARING WHERE c_id=100");
+ if ( rs.next() ) {
str1 = rs.getString(2);
System.out.println(" str1 => " + str1 );
- }
+ }
- rs1 = stmt.executeQuery("SELECT * FROM CONNSHARING WHERE c_id=200");
- if ( rs1.next() ) {
- str2 = rs1.getString(2);
+ rs1 = stmt.executeQuery("SELECT * FROM CONNSHARING WHERE c_id=200");
+ if ( rs1.next() ) {
+ str2 = rs1.getString(2);
System.out.println(" str2 => " + str2 );
- }
- if( "ADITYA".equals(str1.trim()) &&
- "ADITYA_BEAN_2_2".equals(str2.trim())) {
+ }
+ if( "ADITYA".equals(str1.trim()) &&
+ "ADITYA_BEAN_2_2".equals(str2.trim())) {
return true;
- }
+ }
- return false;
- } catch( SQLException e ) {
- e.printStackTrace();
- return false;
- } finally {
- if( rs != null ) {
- try { rs.close() ; }catch( Exception e ) {}
- }
+ return false;
+ } catch( SQLException e ) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if( rs != null ) {
+ try { rs.close() ; }catch( Exception e ) {}
+ }
if( rs1 != null) {
- try { rs1.close(); } catch(Exception e) { }
- }
+ try { rs1.close(); } catch(Exception e) { }
+ }
- if( stmt != null) {
- try { stmt.close(); } catch(Exception e) { }
- }
+ if( stmt != null) {
+ try { stmt.close(); } catch(Exception e) { }
+ }
-
- //cleanup table
- try {
- stmt = conn.createStatement();
- stmt.executeUpdate( "DELETE FROM CONNSHARING WHERE c_id=100" );
- stmt.close();
- } catch( Exception e ) {
- e.printStackTrace();
- }
- try {
- stmt = conn.createStatement();
- stmt.executeUpdate( "DELETE FROM CONNSHARING WHERE c_id=200" );
- stmt.close();
- } catch( Exception e ) {
- e.printStackTrace();
- }
+ //cleanup table
+ try {
+ stmt = conn.createStatement();
+ stmt.executeUpdate( "DELETE FROM CONNSHARING WHERE c_id=100" );
+ stmt.close();
+ } catch( Exception e ) {
+ e.printStackTrace();
+ }
- if( conn != null ) { try { conn.close(); } catch(Exception e) { }
- }
- }
-
+ try {
+ stmt = conn.createStatement();
+ stmt.executeUpdate( "DELETE FROM CONNSHARING WHERE c_id=200" );
+ stmt.close();
+ } catch( Exception e ) {
+ e.printStackTrace();
+ }
+
+ if( conn != null ) { try { conn.close(); } catch(Exception e) { }
+ }
+ }
+
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/create_pointbase.sql
index 5a333fd..cd5ff58 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/create_pointbase.sql
@@ -1,6 +1,6 @@
-Drop table CONNSHARING;
-
-CREATE TABLE CONNSHARING (
- c_id integer constraint pk_key primary key,
- c_phone char(16)
-);
+Drop table CONNSHARING;
+
+CREATE TABLE CONNSHARING (
+ c_id integer constraint pk_key primary key,
+ c_phone char(16)
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/drop_pointbase.sql
index c2817f6..77d1d5a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table CONNSHARING;
+Drop table CONNSHARING;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.properties
index f417fb4..97a6230 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-contauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.xml
index f7ef969..5090459 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,13 +49,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -63,14 +63,14 @@
<antcall target="deploy-jdbc-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -78,7 +78,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/client/SimpleBMPClient.java
index 4b74b6f..1894299 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/client/SimpleBMPClient.java
@@ -29,34 +29,34 @@
SimpleReporterAdapter stat = new SimpleReporterAdapter();
public static void main(String[] args)
throws Exception {
-
- SimpleBMPClient client = new SimpleBMPClient();
+
+ SimpleBMPClient client = new SimpleBMPClient();
client.runTest();
}
public void runTest() throws Exception {
- String testSuite = "ContAuth ";
+ String testSuite = "ContAuth ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
stat.addDescription("JDBC Container Authentication test");
if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc contauth status: ");
- stat.printSummary();
+ System.out.println("jdbc contauth status: ");
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauth/descriptor/ejb-jar.xml
index c6c2569..05a7bec 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
index 5ceec41..52d9900 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
@@ -30,58 +30,58 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1() {
//container auth + user/pwd specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD" );
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
-
- return passed;
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD" );
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+
+ return passed;
+ }
+
public boolean test2() {
//container auth + user/pwd NOT specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
-
- return passed;
+
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.properties
index 43227cc..9a684d8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-contauth1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.xml
index 42af9e7..7e817b4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/build.xml
@@ -46,7 +46,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,13 +58,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -81,7 +81,7 @@
<antcall target="runclient-common"/>
<antcall target="reset-derby-for-no-authentication"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -89,7 +89,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/client/SimpleBMPClient.java
index 9ea74cb..8960bdc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/client/SimpleBMPClient.java
@@ -28,32 +28,32 @@
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "ContAuth1 ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "ContAuth1 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
- System.out.println(" Test 2 will fail with Derby");
- stat.addDescription("JDBC Container Authentication 1 tests ");
- SimpleBMP simpleBMP = simpleBMPHome.create();
-
- if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
- System.out.println("jdbc contauth1 status: ");
- stat.printSummary();
-
+ System.out.println(" Test 2 will fail with Derby");
+ stat.addDescription("JDBC Container Authentication 1 tests ");
+ SimpleBMP simpleBMP = simpleBMPHome.create();
+
+ if ( simpleBMP.test1() ) {
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
+
+ System.out.println("jdbc contauth1 status: ");
+ stat.printSummary();
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/descriptor/ejb-jar.xml
index 99856f6..d851c4b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
index 004b8d3..6dd7058 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
@@ -31,13 +31,13 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
@@ -46,42 +46,42 @@
public boolean test1() {
//container auth + user/pwd specified - should pass
- boolean passed = true;
- Connection conn = null;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD" );
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
-
- return passed;
+ boolean passed = true;
+ Connection conn = null;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD" );
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+
+ return passed;
+ }
+
public boolean test2() {
//container auth + wrong user/passwd in resourceref - should fail
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = true;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = true;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.properties
index dc16894..e32b4c9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-contauth1tx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.xml
index daebb85..2c09d3b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/build.xml
@@ -46,7 +46,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -58,12 +58,12 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
@@ -77,9 +77,9 @@
<param name="jdbc.conpool.name" value="jdbc-appauth-pool1"/>
<param name="jdbc.resource.name" value="jdbc/s1qeappauth1"/>
</antcall>
-
+
<antcall target="deploy-common"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<antcall target="setup-derby-for-authentication"/>
@@ -89,7 +89,7 @@
<antcall target="runclient-common"/>
<antcall target="reset-derby-for-no-authentication"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
@@ -104,7 +104,7 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/client/SimpleBMPClient.java
index e7fd30f..8798706 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/client/SimpleBMPClient.java
@@ -29,29 +29,29 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "ContAuth1TX ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "ContAuth1TX ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("JDBC ContAuth1TX tests");
+ stat.addDescription("JDBC ContAuth1TX tests");
System.out.println(" All tests shall fail till a stable XA driver is integrated into Derby");
if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc contauth1tx status: ");
- stat.printSummary();
+ System.out.println("jdbc contauth1tx status: ");
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/descriptor/ejb-jar.xml
index d920989..0bbf856 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
index 6fc6da8..2562bc8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
@@ -31,13 +31,13 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSourcetx");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSourcetx");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
@@ -47,42 +47,42 @@
public boolean test1() {
//container auth + user/pwd specified - should pass
- boolean passed = true;
- Connection conn = null;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD" );
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
-
- return passed;
+ boolean passed = true;
+ Connection conn = null;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD" );
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+
+ return passed;
+ }
+
public boolean test2() {
//container auth + wrong user/passwd in resourceref - should fail
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = true;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = true;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.properties
index ead98ac..b0d3687 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-contauthtx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.xml
index e129c8e..79ba1f8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/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="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
@@ -65,19 +65,19 @@
<param name="jdbc.conpool.name" value="jdbc-appauth-pool1"/>
<param name="jdbc.resource.name" value="jdbc/s1qeappauth1"/>
</antcall>
-
- <antcall target="deploy-common"/>
- </target>
-
-
+ <antcall target="deploy-common"/>
+ </target>
+
+
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
@@ -93,7 +93,7 @@
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/client/SimpleBMPClient.java
index 56b664a..1f8d58f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/client/SimpleBMPClient.java
@@ -31,34 +31,34 @@
public static void main(String[] args)
throws Exception {
- SimpleBMPClient client = new SimpleBMPClient();
- client.runTest();
+ SimpleBMPClient client = new SimpleBMPClient();
+ client.runTest();
}
public void runTest() throws Exception {
-
- String testSuite = "ContAuthTX ";
+
+ String testSuite = "ContAuthTX ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
System.out.println(" Will Fail till a better XA driver is integrated into Derby");
- stat.addDescription("JDBC Container Authentication TX test");
+ stat.addDescription("JDBC Container Authentication TX test");
if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc contauthtx status: ");
- stat.printSummary();
+ System.out.println("jdbc contauthtx status: ");
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/descriptor/ejb-jar.xml
index 3e58616..ff0c252 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
index f12be1f..2f8c90e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
@@ -30,58 +30,58 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSourcetx");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSourcetx");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1() {
//container auth + user/pwd specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD" );
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
-
- return passed;
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD" );
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+
+ return passed;
+ }
+
public boolean test2() {
//container auth + user/pwd NOT specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
-
- return passed;
+
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/conval/build.properties
index 7313ca0..fc835fc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-conval"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="classes12.zip" value="/tmp/classes12.zip"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/conval/build.xml
index 9e8116d..7678f77 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/build.xml
@@ -80,8 +80,8 @@
<param name="appclient.application.args" value="1"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
@@ -111,8 +111,8 @@
<param name="appclient.application.args" value="3"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="4"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/client/Client.java
index 616b865..7786153 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/client/Client.java
@@ -38,7 +38,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP convalBMP = convalBMPHome.create();
- stat.addDescription("Connection Validation Tests");
+ stat.addDescription("Connection Validation Tests");
if (args != null && args.length > 0) {
String param = args[0];
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.properties
index 781a7a7..292926c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-cpds"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.xml
index 3934b3e..182fd2c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/build.xml
@@ -61,7 +61,7 @@
<target name="deploy" depends="init-common">
- <antcall target="deploy-jdbc-common">
+ <antcall target="deploy-jdbc-common">
<param name="jdbc.resource.type" value="javax.sql.ConnectionPoolDataSource"/>
<param name="jdbc.resource.name" value="jdbc/s1qeDB-cpds"/>
<param name="jdbc.conpool.name" value="jdbc-cpds"/>
@@ -70,7 +70,7 @@
<antcall target="setup-derby-for-authentication"/>
- <antcall target="execute-sql-common">
+ <antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/client/SimpleBMPClient.java
index c7ccacf..581097e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/client/SimpleBMPClient.java
@@ -28,41 +28,41 @@
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "ConnectionPoolDataSource ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "ConnectionPoolDataSource ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("Connection Pool DataSource tests");
-
- if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite + " test1 : ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test1 : ", stat.FAIL );
- }
+ stat.addDescription("Connection Pool DataSource tests");
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite + " test2 : ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test2 : ", stat.FAIL );
- }
+ if ( simpleBMP.test1() ) {
+ stat.addStatus(testSuite + " test1 : ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test1 : ", stat.FAIL );
+ }
- if ( simpleBMP.test3() ) {
- stat.addStatus(testSuite + " test3 : ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test3 : ", stat.FAIL );
- }
- if ( simpleBMP.test4() ) {
- stat.addStatus(testSuite + " test4 : ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test4 : ", stat.FAIL );
- }
-
- stat.printSummary();
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite + " test2 : ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test2 : ", stat.FAIL );
+ }
+
+ if ( simpleBMP.test3() ) {
+ stat.addStatus(testSuite + " test3 : ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test3 : ", stat.FAIL );
+ }
+ if ( simpleBMP.test4() ) {
+ stat.addStatus(testSuite + " test4 : ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test4 : ", stat.FAIL );
+ }
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/cpds/descriptor/ejb-jar.xml
index 54cf72e..1cc03c3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/descriptor/ejb-jar.xml
@@ -42,7 +42,7 @@
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<res-type>javax.sql.ConnectionPoolDataSource</res-type>
- <res-auth>Container</res-auth>
+ <res-auth>Container</res-auth>
<!-- <res-auth>Application</res-auth> -->
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
@@ -58,6 +58,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
index 99e1269..0c3247a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
@@ -84,7 +84,7 @@
}
public boolean test3() {
- //application auth + wrong user/pwd
+ //application auth + wrong user/pwd
System.out.println("-----------------Start test3--------------");
Connection conn = null;
boolean passed = false;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.properties
index 48043ef..b582e0c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-cpdsperf"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="200000"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.xml
index 676fc7c..e229021 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/build.xml
@@ -42,7 +42,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,22 +54,22 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<!-- Create the ORACLE connection pool connection pool and datasource -->
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.resource.type" value="javax.sql.ConnectionPoolDataSource"/>
<param name="jdbc.conpool.name" value="jdbc-cpdsperf-1"/>
- <param name="db.class" value="oracle.jdbc.pool.OracleConnectionPoolDataSource"/>
- <param name="db.user" value="system"/>
- <param name="db.pwd" value="manager"/>
- <param name="db.url" value="ORA"/>
+ <param name="db.class" value="oracle.jdbc.pool.OracleConnectionPoolDataSource"/>
+ <param name="db.user" value="system"/>
+ <param name="db.pwd" value="manager"/>
+ <param name="db.url" value="ORA"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -79,7 +79,7 @@
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-cpdsperf-1.property.URL=jdbc:oracle:thin:@129.158.229.239:1521:ORA"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-cpdsperf-1.property.ServerName=129.158.229.239"/>
@@ -90,10 +90,10 @@
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.resource.type" value="javax.sql.DataSource"/>
<param name="jdbc.conpool.name" value="jdbc-cpdsperf-2"/>
- <param name="db.class" value="oracle.jdbc.pool.OracleDataSource"/>
- <param name="db.user" value="system"/>
- <param name="db.pwd" value="manager"/>
- <param name="db.url" value="ORA"/>
+ <param name="db.class" value="oracle.jdbc.pool.OracleDataSource"/>
+ <param name="db.user" value="system"/>
+ <param name="db.pwd" value="manager"/>
+ <param name="db.url" value="ORA"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -103,7 +103,7 @@
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-cpdsperf-2.property.URL=jdbc:oracle:thin:@129.158.229.239:1521:ORA"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-cpdsperf-2.property.ServerName=129.158.229.239"/>
@@ -120,23 +120,23 @@
</antcall>
-
+
<antcall target="deploy-common"/>
<echo message="Executing sql from ${sql.file}"/>
<sql
src="sql/create_pointbase.sql"
- driver="oracle.jdbc.driver.OracleDriver"
- userid="system"
- password="manager"
- url="jdbc:oracle:thin:@129.158.229.239:1521:ORA"
- classpath="${env.APS_HOME}/devtests/jdbc/classes12.zip"
- onerror="continue"
- print="yes"
+ driver="oracle.jdbc.driver.OracleDriver"
+ userid="system"
+ password="manager"
+ url="jdbc:oracle:thin:@129.158.229.239:1521:ORA"
+ classpath="${env.APS_HOME}/devtests/jdbc/classes12.zip"
+ onerror="continue"
+ print="yes"
/>
-
+
<antcall target="reconfig-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
@@ -145,31 +145,31 @@
<echo message="Executing sql from ${sql.file}"/>
<sql
src="sql/drop_pointbase.sql"
- driver="oracle.jdbc.driver.OracleDriver"
- userid="system"
- password="manager"
- url="jdbc:oracle:thin:@129.158.229.239:1521:ORA"
- classpath="${env.APS_HOME}/devtests/jdbc/classes12.zip"
- onerror="continue"
- print="yes"
+ driver="oracle.jdbc.driver.OracleDriver"
+ userid="system"
+ password="manager"
+ url="jdbc:oracle:thin:@129.158.229.239:1521:ORA"
+ classpath="${env.APS_HOME}/devtests/jdbc/classes12.zip"
+ onerror="continue"
+ print="yes"
/>
- <antcall target="undeploy-common"/>
+ <antcall target="undeploy-common"/>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB-cpdsperf-1"/>
</antcall>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB-cpdsperf-2"/>
</antcall>
- <antcall target="delete-jdbc-connpool-common">
+ <antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-cpdsperf-1"/>
</antcall>
- <antcall target="delete-jdbc-connpool-common">
+ <antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-cpdsperf-2"/>
</antcall>
<antcall target="reconfig-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/client/SimpleBMPClient.java
index bafea23..8ac9fc0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/client/SimpleBMPClient.java
@@ -24,41 +24,41 @@
import com.sun.s1asdev.jdbc.cpdsperf.ejb.SimpleBMP;
public class SimpleBMPClient {
-
+
public static void main(String[] args)
throws Exception {
- int numTimes = 100;
- if (args.length == 1) {
+ int numTimes = 100;
+ if (args.length == 1) {
numTimes = Integer.parseInt( args[0] );
- }
-
+ }
+
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create( numTimes );
-
- long timeTaken = 0;
- System.out.println("----------------------------");
- System.out.println(" test1: Using ConnectionPoolDataSource");
- if ( (timeTaken = simpleBMP.test1()) != -1 ) {
- System.out.println("Passed: Num Connections: " + numTimes+
- " Time taken :" + timeTaken);
- } else {
- System.out.println("Failed");
- }
- System.out.println("----------------------------");
- System.out.println();
- System.out.println("----------------------------");
- System.out.println(" test2: Using DataSource");
- if ( (timeTaken = simpleBMP.test2()) != -1 ) {
- System.out.println("Passed: Num Connections: " + numTimes+
- " Time taken :" + timeTaken);
- } else {
- System.out.println("Failed");
- }
- System.out.println("----------------------------");
- }
+ long timeTaken = 0;
+ System.out.println("----------------------------");
+ System.out.println(" test1: Using ConnectionPoolDataSource");
+ if ( (timeTaken = simpleBMP.test1()) != -1 ) {
+ System.out.println("Passed: Num Connections: " + numTimes+
+ " Time taken :" + timeTaken);
+ } else {
+ System.out.println("Failed");
+ }
+ System.out.println("----------------------------");
+ System.out.println();
+ System.out.println("----------------------------");
+ System.out.println(" test2: Using DataSource");
+ if ( (timeTaken = simpleBMP.test2()) != -1 ) {
+ System.out.println("Passed: Num Connections: " + numTimes+
+ " Time taken :" + timeTaken);
+ } else {
+ System.out.println("Failed");
+ }
+
+ System.out.println("----------------------------");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/descriptor/ejb-jar.xml
index 4d594e1..da17f21 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/descriptor/ejb-jar.xml
@@ -63,6 +63,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
index a08964d..e4c0b8b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
@@ -32,154 +32,154 @@
protected int numRuns;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- dsCP = (DataSource) context.lookup("java:comp/env/DataSource-cp");
- dsNormal = (DataSource) context.lookup("java:comp/env/DataSource-normal");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ dsCP = (DataSource) context.lookup("java:comp/env/DataSource-cp");
+ dsNormal = (DataSource) context.lookup("java:comp/env/DataSource-normal");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate(int _numRuns) throws CreateException {
numRuns = _numRuns;
- return new Integer(1);
+ return new Integer(1);
}
-
+
/**
* Do an SQL insert into the database and time this
* @return time taken. -1 If test fails
*/
public long test1() {
//ConnectionPoolDataSource
- System.out.println("-----------------Start test1--------------");
- Connection conn = null;
- boolean passed = true;
- long startTime = 0 ;
- long endTime = 0;
- try {
- startTime = System.currentTimeMillis();
- for ( int i = 0; i < numRuns; i++ ) {
- conn = dsCP.getConnection("system", "manager");
- insertEntry( i, "1234567890", conn);
- if (i / 10 == 0 ) {
- queryTable( conn );
- }
- conn.close();
- }
- endTime = System.currentTimeMillis();
- } catch (Exception e) {
- e.printStackTrace();
- passed = false;
- } finally {
- if ( conn != null ) {
- try { conn.close(); } catch( Exception e1) {}
- }
- }
- System.out.println("-----------------End test1--------------");
-
- try {
- emptyTable( conn );
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (conn != null) {
- try { conn.close(); } catch( Exception e1 ) {}
- }
- }
- if (passed) {
- return (endTime - startTime)/1000;
- }
- return -1;
+ System.out.println("-----------------Start test1--------------");
+ Connection conn = null;
+ boolean passed = true;
+ long startTime = 0 ;
+ long endTime = 0;
+ try {
+ startTime = System.currentTimeMillis();
+ for ( int i = 0; i < numRuns; i++ ) {
+ conn = dsCP.getConnection("system", "manager");
+ insertEntry( i, "1234567890", conn);
+ if (i / 10 == 0 ) {
+ queryTable( conn );
+ }
+ conn.close();
+ }
+ endTime = System.currentTimeMillis();
+ } catch (Exception e) {
+ e.printStackTrace();
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try { conn.close(); } catch( Exception e1) {}
+ }
}
-
+ System.out.println("-----------------End test1--------------");
+
+ try {
+ emptyTable( conn );
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (conn != null) {
+ try { conn.close(); } catch( Exception e1 ) {}
+ }
+ }
+ if (passed) {
+ return (endTime - startTime)/1000;
+ }
+ return -1;
+ }
+
public long test2() {
//Normal DataSource
- System.out.println("-----------------Start test2--------------");
- Connection conn = null;
- boolean passed = true;
- long startTime = 0 ;
- long endTime = 0;
- try {
- startTime = System.currentTimeMillis();
- for ( int i = 0; i < numRuns; i++ ) {
- conn = dsNormal.getConnection("system", "manager");
- insertEntry( i, "1234567890", conn);
- if (i / 10 == 0 ) {
- queryTable( conn );
- }
- conn.close();
- }
- endTime = System.currentTimeMillis();
- } catch (Exception e) {
- e.printStackTrace();
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
- System.out.println("-----------------End test2--------------");
-
- try {
- conn = dsNormal.getConnection("system","manager");
- emptyTable(conn);
- conn.close();
- } catch( Exception e) {
- e.printStackTrace();
- } finally {
- if (conn != null) {
- try { conn.close(); } catch( Exception e1) {}
- }
- }
+ System.out.println("-----------------Start test2--------------");
+ Connection conn = null;
+ boolean passed = true;
+ long startTime = 0 ;
+ long endTime = 0;
+ try {
+ startTime = System.currentTimeMillis();
+ for ( int i = 0; i < numRuns; i++ ) {
+ conn = dsNormal.getConnection("system", "manager");
+ insertEntry( i, "1234567890", conn);
+ if (i / 10 == 0 ) {
+ queryTable( conn );
+ }
+ conn.close();
+ }
+ endTime = System.currentTimeMillis();
+ } catch (Exception e) {
+ e.printStackTrace();
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+ System.out.println("-----------------End test2--------------");
+
+ try {
+ conn = dsNormal.getConnection("system","manager");
+ emptyTable(conn);
+ conn.close();
+ } catch( Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (conn != null) {
+ try { conn.close(); } catch( Exception e1) {}
+ }
+ }
if (passed) {
- return (endTime - startTime)/1000;
- }
- return -1;
+ return (endTime - startTime)/1000;
+ }
+ return -1;
}
private void insertEntry( int id, String phone, Connection con )
throws SQLException {
-
- PreparedStatement stmt = con.prepareStatement(
- "insert into O_Customer values (?, ?)" );
- stmt.setInt(1, id);
- stmt.setString(2, phone);
-
- stmt.executeUpdate();
- stmt.close();
- /*
PreparedStatement stmt = con.prepareStatement(
- "select * from O_Customer" );
- stmt.executeUpdate();
- stmt.close();
- */
+ "insert into O_Customer values (?, ?)" );
+
+ stmt.setInt(1, id);
+ stmt.setString(2, phone);
+
+ stmt.executeUpdate();
+ stmt.close();
+ /*
+ PreparedStatement stmt = con.prepareStatement(
+ "select * from O_Customer" );
+ stmt.executeUpdate();
+ stmt.close();
+ */
}
private void emptyTable( Connection con ) {
try {
Statement stmt = con.createStatement();
-
- stmt.execute("delete * from O_Customer");
- stmt.close();
+
+ stmt.execute("delete * from O_Customer");
+ stmt.close();
} catch( Exception e) {
- }
-
+ }
+
}
private void queryTable( Connection con ) {
try {
- Statement stmt = con.createStatement();
- ResultSet rs = stmt.executeQuery("select * from O_Customer");
- while( rs.next() ) ;
- rs.close();
- } catch( Exception e) {
- }
+ Statement stmt = con.createStatement();
+ ResultSet rs = stmt.executeQuery("select * from O_Customer");
+ while( rs.next() ) ;
+ rs.close();
+ } catch( Exception e) {
+ }
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.properties
index 1a0af6f..252a395 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-customval-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="classes12.zip" value="/tmp/classes12.zip"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.xml
index 92ed03d..34d09fd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/build.xml
@@ -21,9 +21,9 @@
<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../../config/run.xml">
- <!ENTITY jdbcxml SYSTEM "./../JdbcCommon.xml">
- <!ENTITY jdbcProps SYSTEM "./../JdbcCommon.properties">
+ <!ENTITY run SYSTEM "./../../../config/run.xml">
+ <!ENTITY jdbcxml SYSTEM "./../JdbcCommon.xml">
+ <!ENTITY jdbcProps SYSTEM "./../JdbcCommon.properties">
]>
<project name="mix" default="usage" basedir=".">
@@ -61,8 +61,8 @@
<param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class"/>
</antcall>
- <jar jarfile="${custom-validator-jar}" update="true">
- <fileset dir="${build.classes.dir}" casesensitive="yes">
+ <jar jarfile="${custom-validator-jar}" update="true">
+ <fileset dir="${build.classes.dir}" casesensitive="yes">
<include name="**/MyValidator.class"/>
</fileset>
</jar>
@@ -85,8 +85,8 @@
<param name="appclient.application.args" value="1"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
@@ -103,7 +103,7 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.validation_classname=com.sun.s1asdev.jdbc.customval.validator.MyValidator"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.validation_classname=com.sun.s1asdev.jdbc.customval.validator.MyValidator"/>
</antcall>
<antcall target="asadmin-common">
@@ -116,8 +116,8 @@
<param name="appclient.application.args" value="3"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="4"/>
@@ -131,9 +131,9 @@
<target name="undeploy" depends="init-common">
<antcall target="delete-jdbc-stuff"/>
<antcall target="undeploy-common"/>
- <delete file="${env.S1AS_HOME}/lib/myvalidator.jar"/>
- <delete file="${custom-validator-jar}"/>
- <antcall target="restart-server"/>
+ <delete file="${env.S1AS_HOME}/lib/myvalidator.jar"/>
+ <delete file="${custom-validator-jar}"/>
+ <antcall target="restart-server"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/client/Client.java
index 34090d7..d820d45 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/client/Client.java
@@ -38,7 +38,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP convalBMP = convalBMPHome.create();
- stat.addDescription("Custom Validation Test using a custom validator ");
+ stat.addDescription("Custom Validation Test using a custom validator ");
if (args != null && args.length > 0) {
String param = args[0];
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/create_pointbase.sql
index 32dca8a..7aa4b60 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/create_pointbase.sql
@@ -1,15 +1,15 @@
-Drop table O_CUSTOMER;
-
-CREATE TABLE O_CUSTOMER (
- c_id integer not null,
- c_phone char(16)
-);
-
-Drop table DUMMY;
-
-CREATE TABLE DUMMY (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO DUMMY VALUES(1, 'wxyz');
+Drop table O_CUSTOMER;
+
+CREATE TABLE O_CUSTOMER (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+Drop table DUMMY;
+
+CREATE TABLE DUMMY (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO DUMMY VALUES(1, 'wxyz');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/validator/com/sun/s1asdev/jdbc/customval/validator/MyValidator.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/validator/com/sun/s1asdev/jdbc/customval/validator/MyValidator.java
index 7f15c1c..64efa23 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/validator/com/sun/s1asdev/jdbc/customval/validator/MyValidator.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/validator/com/sun/s1asdev/jdbc/customval/validator/MyValidator.java
@@ -22,13 +22,13 @@
public class MyValidator implements ConnectionValidation {
public boolean isConnectionValid(Connection con) {
- boolean valid = false;
- try {
+ boolean valid = false;
+ try {
valid = isValid(con, "select count(*) as COUNT from DUMMY");
- } catch(Exception ex) {
+ } catch(Exception ex) {
ex.printStackTrace();
- }
- return valid;
+ }
+ return valid;
}
/**
@@ -40,32 +40,32 @@
* @throws ResourceException if the connection is not valid
*/
protected boolean isValid(java.sql.Connection con,
- String query) throws Exception{
- int count = 1;
- boolean valid = false;
+ String query) throws Exception{
+ int count = 1;
+ boolean valid = false;
if (con == null) {
- throw new Exception("The connection is not valid as "
- + "the connection is null");
- }
+ throw new Exception("The connection is not valid as "
+ + "the connection is null");
+ }
java.sql.PreparedStatement stmt = null;
java.sql.ResultSet rs = null;
try {
- stmt = con.prepareStatement(query);
- rs = stmt.executeQuery();
+ stmt = con.prepareStatement(query);
+ rs = stmt.executeQuery();
while(rs.next()) {
- int resultCount = rs.getInt("COUNT");
- if(count == resultCount) {
- valid = true;
+ int resultCount = rs.getInt("COUNT");
+ if(count == resultCount) {
+ valid = true;
} else {
System.out.println("Expected count [" + count +
"] does not match result[" + resultCount + "]");
- valid = false;
+ valid = false;
}
}
- } catch (Exception sqle) {
- throw new Exception(sqle);
+ } catch (Exception sqle) {
+ throw new Exception(sqle);
} finally {
try {
if (rs != null) {
@@ -79,6 +79,6 @@
}
} catch (Exception e2) {}
}
- return valid;
+ return valid;
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.properties
index 142ceef..0599ebf 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-customval"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="classes12.zip" value="/tmp/classes12.zip"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.xml
index b439690..dbb992f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/build.xml
@@ -22,8 +22,8 @@
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
<!ENTITY run SYSTEM "./../../../config/run.xml">
- <!ENTITY jdbcxml SYSTEM "./../JdbcCommon.xml">
- <!ENTITY jdbcProps SYSTEM "./../JdbcCommon.properties">
+ <!ENTITY jdbcxml SYSTEM "./../JdbcCommon.xml">
+ <!ENTITY jdbcProps SYSTEM "./../JdbcCommon.properties">
]>
<project name="mix" default="usage" basedir=".">
@@ -74,8 +74,8 @@
<param name="appclient.application.args" value="1"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
@@ -105,8 +105,8 @@
<param name="appclient.application.args" value="3"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="4"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/client/Client.java
index 29ce4bf..90873f5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/client/Client.java
@@ -38,7 +38,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP convalBMP = convalBMPHome.create();
- stat.addDescription("Custom Validation Tests");
+ stat.addDescription("Custom Validation Tests");
if (args != null && args.length > 0) {
String param = args[0];
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.properties
index 76ef749..3779711 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-datasource40"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.xml
index df64822..f5e4c92 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/build.xml
@@ -62,7 +62,7 @@
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="ds-pool"/>
<param name="jdbc.resource.name" value="jdbc/ds-resource"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientDataSource40"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientDataSource40"/>
<param name="jdbc.resource.type" value="javax.sql.DataSource"/>
</antcall>
@@ -120,7 +120,7 @@
<param name="jdbc.conpool.name" value="xa-pool"/>
<param name="jdbc.resource.name" value="jdbc/xa-resource"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
index c6dbe6d..083945d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
@@ -108,16 +108,16 @@
String physicalConnection2 = (((com.sun.appserv.jdbc.DataSource) ds).getConnection(conn)).toString();
//Ensure that both the connections are the same.
- System.out.println("PhysicalConn 1 : " + physicalConnection1);
+ System.out.println("PhysicalConn 1 : " + physicalConnection1);
System.out.println("PhysicalConn 2 : " + physicalConnection1);
if (physicalConnection2.equals(physicalConnection1)) {
passed = true;
- System.out.println("Physical Connections are equal");
+ System.out.println("Physical Connections are equal");
}else{
- System.out.println("Physical Connections are not equal");
- }
-
+ System.out.println("Physical Connections are not equal");
+ }
+
} catch (Exception e) {
e.printStackTrace();
@@ -178,7 +178,7 @@
System.out.println("DataSource unwrap() did not return appropriate db-datasources");
}
-
+
} catch (Exception e) {
e.printStackTrace();
passed = false;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/sql/create_pointbase.sql
index d3f5a12..8b13789 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/sql/create_pointbase.sql
@@ -1 +1 @@
-
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.properties
index af24daf..20bc85d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-markconnectionasbad.xa"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.xml
index 7d766f0..5e7771f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/build.xml
@@ -107,7 +107,7 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-local-pool.idle_timeout_in_seconds=3600"/>
</antcall>
- <!--<antcall target="asadmin-common">
+ <!--<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-local-pool.property.URL=jdbc:derby://localhost:1527/testdb;user=dbuser;password=dbpassword"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/client/Client.java
index ff0fb53..ccf34b6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/client/Client.java
@@ -38,27 +38,27 @@
public void runTest() throws Exception {
- Set<Integer> localdsSet = new HashSet();
- Set<Integer> localdsAfterSet = new HashSet();
- int countLocalds = 0;
+ Set<Integer> localdsSet = new HashSet();
+ Set<Integer> localdsAfterSet = new HashSet();
+ int countLocalds = 0;
InitialContext ic = new InitialContext();
- com.sun.appserv.jdbc.DataSource ds = (com.sun.appserv.jdbc.DataSource) ic.lookup("jdbc/localdatasource");
-
- stat.addDescription("DMMCF Mark-Connection-As-Bad Appclient ");
+ com.sun.appserv.jdbc.DataSource ds = (com.sun.appserv.jdbc.DataSource) ic.lookup("jdbc/localdatasource");
+
+ stat.addDescription("DMMCF Mark-Connection-As-Bad Appclient ");
- localdsSet = getFromLocalDS(MAX_POOL_SIZE, ds);
- System.out.println("localds = " + localdsSet);
-
- //jdbc-local-pool
+ localdsSet = getFromLocalDS(MAX_POOL_SIZE, ds);
+ System.out.println("localds = " + localdsSet);
+
+ //jdbc-local-pool
test1(ds);
- localdsAfterSet = getFromLocalDS(MAX_POOL_SIZE, ds);
- System.out.println("localdsAfter = " + localdsAfterSet);
+ localdsAfterSet = getFromLocalDS(MAX_POOL_SIZE, ds);
+ System.out.println("localdsAfter = " + localdsAfterSet);
- countLocalds = compareAndGetCount(localdsSet, localdsAfterSet);
- if(MAX_POOL_SIZE-countLocalds == 5) {
+ countLocalds = compareAndGetCount(localdsSet, localdsAfterSet);
+ if(MAX_POOL_SIZE-countLocalds == 5) {
stat.addStatus(" Mark-Connection-As-Bad destroyedCount localds: ", stat.PASS);
} else {
stat.addStatus(" Mark-Connection-As-Bad destroyedCount localds: ", stat.FAIL);
@@ -69,27 +69,27 @@
public int compareAndGetCount(Set<Integer> beforeSet, Set<Integer> afterSet) {
//denotes the count of hashcodes that matched in both sets.
- int contains = 0;
- if(!beforeSet.containsAll(afterSet)) {
+ int contains = 0;
+ if(!beforeSet.containsAll(afterSet)) {
//if it does not contain all the elements of the after set
- //find how many are absent from the beforeSet
+ //find how many are absent from the beforeSet
for(int afterInt : afterSet) {
if(beforeSet.contains(afterInt)) {
- contains++;
- }
- }
- }
+ contains++;
+ }
+ }
+ }
return contains;
}
public Set<Integer> getFromLocalDS(int count, com.sun.appserv.jdbc.DataSource localds1) {
- int connHashCode = 0;
+ int connHashCode = 0;
Connection conn = null;
- Set<Integer> hashCodeSet = new HashSet();
+ Set<Integer> hashCodeSet = new HashSet();
for (int i = 0; i < count; i++) {
- try {
- conn = localds1.getNonTxConnection();
- connHashCode = (localds1.getConnection(conn)).hashCode();
+ try {
+ conn = localds1.getNonTxConnection();
+ connHashCode = (localds1.getConnection(conn)).hashCode();
hashCodeSet.add(connHashCode);
} catch (Exception e) {
@@ -101,8 +101,8 @@
}
}
}
- }
- return hashCodeSet;
+ }
+ return hashCodeSet;
}
/* Read Operation - Driver - shareable */
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/create_pointbase.sql
index dcc321c..fa84161 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/create_pointbase.sql
@@ -1,29 +1,29 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (id integer , description char(50));
-
-Drop table DESTROYED_INFO;
-
-CREATE TABLE DESTROYED_INFO (test_name varchar(20), pool_name varchar(30), num_des_count integer);
-
-insert into DESTROYED_INFO values ('test1', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test2', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test3', 'jdbc-shareable-pool', 5);
-insert into DESTROYED_INFO values ('test4', 'jdbc-shareable-pool', 5);
-insert into DESTROYED_INFO values ('test5', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test6', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test7', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test8', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test9', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test9', 'jdbc-local-pool', 1);
-insert into DESTROYED_INFO values ('test10', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test10', 'jdbc-local-pool', 1);
-insert into DESTROYED_INFO values ('test11', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test11', 'jdbc-local-pool', 1);
-insert into DESTROYED_INFO values ('test12', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test12', 'jdbc-local-pool', 1);
-
-drop table owner;
-
-create table owner ( id integer, description char(50));
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (id integer , description char(50));
+
+Drop table DESTROYED_INFO;
+
+CREATE TABLE DESTROYED_INFO (test_name varchar(20), pool_name varchar(30), num_des_count integer);
+
+insert into DESTROYED_INFO values ('test1', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test2', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test3', 'jdbc-shareable-pool', 5);
+insert into DESTROYED_INFO values ('test4', 'jdbc-shareable-pool', 5);
+insert into DESTROYED_INFO values ('test5', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test6', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test7', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test8', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test9', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test9', 'jdbc-local-pool', 1);
+insert into DESTROYED_INFO values ('test10', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test10', 'jdbc-local-pool', 1);
+insert into DESTROYED_INFO values ('test11', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test11', 'jdbc-local-pool', 1);
+insert into DESTROYED_INFO values ('test12', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test12', 'jdbc-local-pool', 1);
+
+drop table owner;
+
+create table owner ( id integer, description char(50));
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/drop_pointbase.sql
index a5ea2f8..d87d5de 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.appclient/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table O_Customer;
-drop table owner;
+Drop table O_Customer;
+drop table owner;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.properties
index af24daf..20bc85d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-markconnectionasbad.xa"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.xml
index 93e60c8..498ad55 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/build.xml
@@ -184,7 +184,7 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-local-pool.idle_timeout_in_seconds=3600"/>
</antcall>
- <!--<antcall target="asadmin-common">
+ <!--<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-local-pool.property.URL=jdbc:derby://localhost:1527/testdb;user=dbuser;password=dbpassword"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/client/Client.java
index 28acbe9..7c8722d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/client/Client.java
@@ -48,21 +48,21 @@
switch (Integer.parseInt(param)) {
case 1: {//old method
- client.runNonAMXTest();
- break;
- }
- case 2: { //using amx
+ client.runNonAMXTest();
+ break;
+ }
+ case 2: { //using amx
client.runTest();
- break;
- }
- }
- }
+ break;
+ }
+ }
+ }
}
public void runNonAMXTest() throws Exception {
- Set<Integer> localdsSet = new HashSet();
- Set<Integer> localdsAfterSet = new HashSet();
- int countLocalds = 0;
+ Set<Integer> localdsSet = new HashSet();
+ Set<Integer> localdsAfterSet = new HashSet();
+ int countLocalds = 0;
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
@@ -73,17 +73,17 @@
stat.addDescription("DMMCF Mark-Connection-As-Bad NonAMX ");
- localdsSet = simpleBMP.getFromLocalDS(MAX_POOL_SIZE);
- System.out.println("localds = " + localdsSet);
-
- //jdbc-local-pool
+ localdsSet = simpleBMP.getFromLocalDS(MAX_POOL_SIZE);
+ System.out.println("localds = " + localdsSet);
+
+ //jdbc-local-pool
simpleBMP.test0();
- localdsAfterSet = simpleBMP.getFromLocalDS(MAX_POOL_SIZE);
- System.out.println("localdsAfter = " + localdsAfterSet);
+ localdsAfterSet = simpleBMP.getFromLocalDS(MAX_POOL_SIZE);
+ System.out.println("localdsAfter = " + localdsAfterSet);
- countLocalds = compareAndGetCount(localdsSet, localdsAfterSet);
- if(MAX_POOL_SIZE-countLocalds == 5) {
+ countLocalds = compareAndGetCount(localdsSet, localdsAfterSet);
+ if(MAX_POOL_SIZE-countLocalds == 5) {
stat.addStatus(" DMMCF Mark-Connection-As-Bad destroyedCount localds: ", stat.PASS);
} else {
stat.addStatus(" DMMCF Mark-Connection-As-Bad destroyedCount localds: ", stat.FAIL);
@@ -165,14 +165,14 @@
stat.addStatus(" DMMCF Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Write] : ", stat.FAIL);
}
- if (simpleBMP.test11() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 15 &&
+ if (simpleBMP.test11() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 15 &&
getMonitorablePropertyOfConnectionPool("jdbc-local-pool") == 3) {
stat.addStatus(" DMMCF Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Read] : ", stat.PASS);
} else {
stat.addStatus(" DMMCF Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Read] : ", stat.FAIL);
}
- if (simpleBMP.test12() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 16 &&
+ if (simpleBMP.test12() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 16 &&
getMonitorablePropertyOfConnectionPool("jdbc-local-pool") == 4) {
stat.addStatus(" DMMCF Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Write-Read] : ", stat.PASS);
} else {
@@ -186,33 +186,33 @@
public int compareAndGetCount(Set<Integer> beforeSet, Set<Integer> afterSet) {
//denotes the count of hashcodes that matched in both sets.
- int contains = 0;
- if(!beforeSet.containsAll(afterSet)) {
+ int contains = 0;
+ if(!beforeSet.containsAll(afterSet)) {
//if it does not contain all the elements of the after set
- //find how many are absent from the beforeSet
+ //find how many are absent from the beforeSet
for(int afterInt : afterSet) {
if(beforeSet.contains(afterInt)) {
- contains++;
- }
- }
- }
+ contains++;
+ }
+ }
+ }
return contains;
}
public int getMonitorablePropertyOfConnectionPool(String poolName) throws Exception {
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-mon,name=resources/" + poolName);
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, NUM_CON_DESTROYED_COUNT);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, NUM_CON_DESTROYED_COUNT);
return new Integer(returnValue.get("count").toString());
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
index 0e6f501..6f0e8a8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
@@ -51,13 +51,13 @@
public Set<Integer> getFromLocalDS(int count) {
- int connHashCode = 0;
+ int connHashCode = 0;
Connection conn = null;
- Set<Integer> hashCodeSet = new HashSet();
+ Set<Integer> hashCodeSet = new HashSet();
for (int i = 0; i < count; i++) {
- try {
- conn = localds.getNonTxConnection();
- connHashCode = (localds.getConnection(conn)).hashCode();
+ try {
+ conn = localds.getNonTxConnection();
+ connHashCode = (localds.getConnection(conn)).hashCode();
hashCodeSet.add(connHashCode);
} catch (Exception e) {
@@ -69,8 +69,8 @@
}
}
}
- }
- return hashCodeSet;
+ }
+ return hashCodeSet;
}
/* Read Operation - Driver - shareable */
@@ -332,7 +332,7 @@
stmt.executeUpdate("insert into owner values (9,'localds')");
conn1 = ds1.getConnection();
- System.out.println("Conn1 got " + conn1);
+ System.out.println("Conn1 got " + conn1);
Statement stmt1 = conn1.createStatement();
stmt1.executeUpdate("insert into o_customer values (9,'xads')");
@@ -351,7 +351,7 @@
try {
ds1.markConnectionAsBad(conn1);
conn1.close();
- System.out.println("Conn1 closed "+ conn1);
+ System.out.println("Conn1 closed "+ conn1);
} catch (Exception e1) {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/create_pointbase.sql
index 0c1818a..7694f07 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/create_pointbase.sql
@@ -1,29 +1,29 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (id integer , description char(50));
-
-Drop table DESTROYED_INFO;
-
-CREATE TABLE DESTROYED_INFO (test_name varchar(20), pool_name varchar(30), num_des_count integer);
-
-insert into DESTROYED_INFO values ('test0', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test2', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test3', 'jdbc-shareable-pool', 5);
-insert into DESTROYED_INFO values ('test4', 'jdbc-shareable-pool', 5);
-insert into DESTROYED_INFO values ('test5', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test6', 'jdbc-unshareable-pool', 5);
-insert into DESTROYED_INFO values ('test7', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test8', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test9', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test9', 'jdbc-local-pool', 1);
-insert into DESTROYED_INFO values ('test10', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test10', 'jdbc-local-pool', 1);
-insert into DESTROYED_INFO values ('test11', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test11', 'jdbc-local-pool', 1);
-insert into DESTROYED_INFO values ('test12', 'jdbc-shareable-pool', 1);
-insert into DESTROYED_INFO values ('test12', 'jdbc-local-pool', 1);
-
-drop table owner;
-
-create table owner ( id integer, description char(50));
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (id integer , description char(50));
+
+Drop table DESTROYED_INFO;
+
+CREATE TABLE DESTROYED_INFO (test_name varchar(20), pool_name varchar(30), num_des_count integer);
+
+insert into DESTROYED_INFO values ('test0', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test2', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test3', 'jdbc-shareable-pool', 5);
+insert into DESTROYED_INFO values ('test4', 'jdbc-shareable-pool', 5);
+insert into DESTROYED_INFO values ('test5', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test6', 'jdbc-unshareable-pool', 5);
+insert into DESTROYED_INFO values ('test7', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test8', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test9', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test9', 'jdbc-local-pool', 1);
+insert into DESTROYED_INFO values ('test10', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test10', 'jdbc-local-pool', 1);
+insert into DESTROYED_INFO values ('test11', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test11', 'jdbc-local-pool', 1);
+insert into DESTROYED_INFO values ('test12', 'jdbc-shareable-pool', 1);
+insert into DESTROYED_INFO values ('test12', 'jdbc-local-pool', 1);
+
+drop table owner;
+
+create table owner ( id integer, description char(50));
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/drop_pointbase.sql
index a5ea2f8..d87d5de 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table O_Customer;
-drop table owner;
+Drop table O_Customer;
+drop table owner;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/build.xml
index cef436d..c12fa40 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/build.xml
@@ -32,8 +32,8 @@
<fileset dir="." includes="*.output"/>
</delete>
<record name="notxconn.output" action="start" />
- <ant dir="test1" target="all"/>
- <ant dir="test2" target="all"/>
+ <ant dir="test1" target="all"/>
+ <ant dir="test2" target="all"/>
<record name="notxconn.output" action="stop" />
</target>
@@ -49,9 +49,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the reconfig tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the reconfig tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.properties
index cf4625c..dfd1ca3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-dmmcfnotxconn"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="oracle.resource.type" value="java.sql.Driver"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.xml
index 269c23b..18cee81 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
-
+
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,28 +51,28 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-driver-oracle-common">
- <param name="oracle.resource.type" value="${oracle.resource.type}"/>
+ <param name="oracle.resource.type" value="${oracle.resource.type}"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -80,7 +80,7 @@
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/ejb-jar.xml
index cc9b0e8..a1aa729 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/ejb-jar.xml
@@ -49,6 +49,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/sun-ejb-jar.xml
index afa0207..b0d631a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/descriptor/sun-ejb-jar.xml
@@ -28,10 +28,10 @@
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<jndi-name>jdbc/oracleres</jndi-name>
- <default-resource-principal>
- <name>scott</name>
- <password>tiger</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>scott</name>
+ <password>tiger</password>
+ </default-resource-principal>
</resource-ref>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
index 619ff8c..767d521 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
@@ -56,27 +56,27 @@
ds = (com.sun.appserv.jdbc.DataSource) ic_.lookup("java:comp/env/DataSource");
UserTransaction tx =(UserTransaction)ctxt_.getUserTransaction();
- tx.begin();
+ tx.begin();
conn = ds.getConnection();
- noTxConn = ds.getNonTxConnection();
+ noTxConn = ds.getNonTxConnection();
stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
+ stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
String query1 = "SELECT * FROM NOTXCONNTABLE";
rs = stmt.executeQuery(query1);
- stmt2 = noTxConn.createStatement();
+ stmt2 = noTxConn.createStatement();
rs2 = stmt2.executeQuery("SELECT * FROM NOTXCONNTABLE");
-
+
if ( rs2.next() ) {
- return false;
- }
-
- tx.commit();
- return true;
-
+ return false;
+ }
+
+ tx.commit();
+ return true;
+
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -87,72 +87,72 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
-
+
if (rs2 != null ) {
try {rs2.close();} catch( Exception e1 ) {}
}
if (stmt2 != null ) {
try {stmt2.close(); } catch( Exception e1) {}
}
-
+
if (noTxConn != null ) {
try { noTxConn.close(); }catch( Exception e1) {}
}
- }
+ }
-
+
}
public boolean test2() throws Exception {
- Connection conn = null;
- Connection noTxConn = null;
+ Connection conn = null;
+ Connection noTxConn = null;
try {
ds = (com.sun.appserv.jdbc.DataSource)ic_.lookup("java:comp/env/DataSource");
UserTransaction tx =(UserTransaction)ctxt_.getUserTransaction();
- tx.begin();
+ tx.begin();
System.out.println("Getting TRANSACTIONAL connection");
conn = ds.getConnection();
System.out.println("Autocommit => " + conn.getAutoCommit());
- if (conn.getAutoCommit() == true ) {
- return false;
- }
+ if (conn.getAutoCommit() == true ) {
+ return false;
+ }
- conn.close();
- for (int i = 0; i < 20; i++ ) {
- System.out.println("Getting NonTx connection");
- noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
- System.out.println("Autocommit => " + noTxConn.getAutoCommit());
- if (noTxConn.getAutoCommit() == false ) {
- return false;
- }
- noTxConn.close();
- }
+ conn.close();
+ for (int i = 0; i < 20; i++ ) {
+ System.out.println("Getting NonTx connection");
+ noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
+ System.out.println("Autocommit => " + noTxConn.getAutoCommit());
+ if (noTxConn.getAutoCommit() == false ) {
+ return false;
+ }
+ noTxConn.close();
+ }
System.out.println("Getting TRANSACTIONAL connection");
conn = ds.getConnection();
System.out.println("Autocommit => " + conn.getAutoCommit());
- if (conn.getAutoCommit() == true ) {
- return false;
- }
- conn.close();
- tx.commit();
+ if (conn.getAutoCommit() == true ) {
+ return false;
+ }
+ conn.close();
+ tx.commit();
- return true;
-
+ return true;
+
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
- try {
- if (noTxConn != null ) {
- noTxConn.close();
- }
- } catch( Exception e1 ) {}
- }
+ try {
+ if (noTxConn != null ) {
+ noTxConn.close();
+ }
+ } catch( Exception e1 ) {}
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/create_pointbase.sql
index 00eb96c..2d3d1a2 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
-DROP TABLE NOTXCONNTABLE;
-CREATE TABLE NOTXCONNTABLE(
- name char(20),
- num integer
-);
+DROP TABLE NOTXCONNTABLE;
+CREATE TABLE NOTXCONNTABLE(
+ name char(20),
+ num integer
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/drop_pointbase.sql
index 03490d0..762a0f6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table NOTXCONNTABLE;
+Drop table NOTXCONNTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.properties
index cf4625c..dfd1ca3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-dmmcfnotxconn"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="oracle.resource.type" value="java.sql.Driver"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.xml
index 269c23b..18cee81 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
-
+
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,28 +51,28 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-driver-oracle-common">
- <param name="oracle.resource.type" value="${oracle.resource.type}"/>
+ <param name="oracle.resource.type" value="${oracle.resource.type}"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -80,7 +80,7 @@
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/descriptor/ejb-jar.xml
index 2e09567..ffb9817 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/descriptor/ejb-jar.xml
@@ -49,6 +49,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>-->
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
index 3e6c8b9..215fb8e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
@@ -56,28 +56,28 @@
ds = (com.sun.appserv.jdbc.DataSource) ic_.lookup("java:comp/env/DataSource");
UserTransaction tx =(UserTransaction)ctxt_.getUserTransaction();
- tx.begin();
+ tx.begin();
conn = ds.getConnection("scott", "tiger");
stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
+ stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
String query1 = "SELECT * FROM NOTXCONNTABLE";
rs = stmt.executeQuery(query1);
- noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection("scott", "tiger");
+ noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection("scott", "tiger");
- stmt2 = noTxConn.createStatement();
+ stmt2 = noTxConn.createStatement();
rs2 = stmt2.executeQuery("SELECT * FROM NOTXCONNTABLE");
- tx.commit();
+ tx.commit();
if ( rs2.next() ) {
- return false;
- }
-
-
- return true;
-
+ return false;
+ }
+
+
+ return true;
+
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -88,20 +88,20 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
-
+
if (rs2 != null ) {
try {rs2.close();} catch( Exception e1 ) {}
}
if (stmt2 != null ) {
try {stmt2.close(); } catch( Exception e1) {}
}
-
+
if (noTxConn != null ) {
try { noTxConn.close(); }catch( Exception e1) {}
}
- }
+ }
-
+
}
public void ejbLoad() {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/create_pointbase.sql
index 00eb96c..2d3d1a2 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
-DROP TABLE NOTXCONNTABLE;
-CREATE TABLE NOTXCONNTABLE(
- name char(20),
- num integer
-);
+DROP TABLE NOTXCONNTABLE;
+CREATE TABLE NOTXCONNTABLE(
+ name char(20),
+ num integer
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/drop_pointbase.sql
index 03490d0..762a0f6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table NOTXCONNTABLE;
+Drop table NOTXCONNTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.properties
index 049277f..92ad954 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-dmmcf"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.xml
index 6b8c415..6ff589c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/build.xml
@@ -32,14 +32,14 @@
&run;
<property name="execution.mode" value="pe"/>
-
-
+
+
<target name="all" depends="build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,13 +51,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-driver-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-driver-pool"/>
@@ -67,29 +67,29 @@
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-driver-pool"/>
- <param name="jdbc.resource.name" value="jdbc/driverRes"/>
+ <param name="jdbc.resource.name" value="jdbc/driverRes"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-driver-pool"/>
- <param name="jdbc.resource.name" value="jdbc/driverRes1"/>
+ <param name="jdbc.resource.name" value="jdbc/driverRes1"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-driver-pool.property.URL=jdbc:derby://localhost:1527/testdb;user=dbuser;password=dbpassword"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-driver-pool.property.URL=jdbc:derby://localhost:1527/testdb;user=dbuser;password=dbpassword"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -98,7 +98,7 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/driverRes"/>
</antcall>
-
+
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/driverRes1"/>
</antcall>
@@ -106,9 +106,9 @@
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-driver-pool"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/client/Client.java
index 4db1e69..570fa67 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/client/Client.java
@@ -74,7 +74,7 @@
} else {
stat.addStatus(testSuite + " test6 : ", stat.FAIL);
}
-
+
stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/descriptor/ejb-jar.xml
index 531463b..5d4143b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/descriptor/ejb-jar.xml
@@ -49,11 +49,11 @@
<transaction-type>Container</transaction-type>
<ejb-ref>
<description></description>
- <ejb-ref-name>ejb/SimpleSession2EJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
+ <ejb-ref-name>ejb/SimpleSession2EJB</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
<home>com.sun.s1asdev.jdbc.dmmcf.ejb.SimpleSession2Home</home>
<remote>com.sun.s1asdev.jdbc.dmmcf.ejb.SimpleSession2</remote>
- <ejb-link>SimpleSession2EJB</ejb-link>
+ <ejb-link>SimpleSession2EJB</ejb-link>
</ejb-ref>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
@@ -94,6 +94,6 @@
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
index a510de4..23593e6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
@@ -28,14 +28,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -44,57 +44,57 @@
/**
*/
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2' WHERE c_id=100");
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2' WHERE c_id=100");
- return true;
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
+ return true;
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+
+ }
+
public boolean test2() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2_2' WHERE c_id=200");
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "UPDATE CONNSHARING SET c_phone='CONN_SHARING_BEAN_2_2' WHERE c_id=200");
- return true;
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
+ return true;
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
}
public boolean test3() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/create_pointbase.sql
index 8cb3174..721d9e8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/create_pointbase.sql
@@ -1,6 +1,6 @@
-Drop table CONNSHARING;
-
-CREATE TABLE CONNSHARING (
- c_id integer constraint pk_key primary key,
- c_phone char(25)
-);
+Drop table CONNSHARING;
+
+CREATE TABLE CONNSHARING (
+ c_id integer constraint pk_key primary key,
+ c_phone char(25)
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/drop_pointbase.sql
index c2817f6..77d1d5a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table CONNSHARING;
+Drop table CONNSHARING;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.properties
index 5bba1ec..e87ef09 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-fetchoutofseq"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.xml
index 67b2b4e..aa99c2d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/build.xml
@@ -40,7 +40,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"/>
@@ -52,13 +52,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -66,14 +66,14 @@
<antcall target="deploy-jdbc-oracle-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -81,7 +81,7 @@
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/client/SimpleBMPClient.java
index 28a7c40..f785efb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/client/SimpleBMPClient.java
@@ -29,31 +29,31 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "jdbcfetchoutofseq ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "jdbcfetchoutofseq ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc fetchoutofseq status: ");
- stat.printSummary();
-
-
+ System.out.println("jdbc fetchoutofseq status: ");
+ stat.printSummary();
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/descriptor/ejb-jar.xml
index 85b0795..cd23d2d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
index c7f97de..640883d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
@@ -30,17 +30,17 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1() {
@@ -60,40 +60,40 @@
* update" query. Since a connection obtained using getNonTxConnection
* is not managed (transaction-wise), its autocommit is set to true by
* default. So this fails.
- * 2. gets a connection as above but sets its autocommit to true. The
+ * 2. gets a connection as above but sets its autocommit to true. The
* query will then pass.
*/
public boolean issueQuery(boolean autoCommit) {
Connection conn = null;
- PreparedStatement stmt = null;
+ PreparedStatement stmt = null;
boolean passed = (autoCommit ? false : true);
- try {
- //conn = ds.getConnection();
- conn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
- if ( !autoCommit ) {
- conn.setAutoCommit( false );
- }
- stmt = conn.prepareStatement("SELECT c_id, c_phone FROM O_CUSTOMER FOR UPDATE OF c_id");
- stmt.executeQuery();
- } catch (Exception e) {
- if (autoCommit) {
- passed = true;
- } else {
- passed = false;
- }
- e.printStackTrace();
- } finally {
- if (stmt != null ) {
- try {stmt.close();} catch(Exception e1) {}
- }
- if ( conn != null ) {
- try { conn.close(); } catch( Exception e1) {}
- }
- }
-
- return passed;
+ try {
+ //conn = ds.getConnection();
+ conn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
+ if ( !autoCommit ) {
+ conn.setAutoCommit( false );
+ }
+ stmt = conn.prepareStatement("SELECT c_id, c_phone FROM O_CUSTOMER FOR UPDATE OF c_id");
+ stmt.executeQuery();
+ } catch (Exception e) {
+ if (autoCommit) {
+ passed = true;
+ } else {
+ passed = false;
+ }
+ e.printStackTrace();
+ } finally {
+ if (stmt != null ) {
+ try {stmt.close();} catch(Exception e1) {}
+ }
+ if ( conn != null ) {
+ try { conn.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
-
+
public void ejbLoad() {}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_mysql.sql b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_mysql.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_mysql.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_mysql.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_pointbase.sql
index 637a7c5..c3b0d5c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO O_CUSTOMER VALUES (0, 'abcd');
-INSERT INTO O_CUSTOMER VALUES (1, 'pqrs');
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO O_CUSTOMER VALUES (0, 'abcd');
+INSERT INTO O_CUSTOMER VALUES (1, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.properties
index 751b348..5c4a00a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-flushconnectionpool"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.xml
index 4b494c8..fe2be3b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/build.xml
@@ -75,7 +75,7 @@
<param name="operand.props"
value="jdbc-flushconnectionpool-pool"/>
</antcall>
- <antcall target="runclient-common"/>
+ <antcall target="runclient-common"/>
</target>
<target name="undeploy" depends="init-common">
@@ -108,14 +108,14 @@
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-flushconnectionpool-pool.steady_pool_size=1"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-flushconnectionpool-pool.max_pool_size=1"/>
</antcall>
- <!-- <antcall target="asadmin-common">
+ <!-- <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-flushconnectionpool-pool.max_connection_usage_count=5"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
index 00b6470..0c0c4f5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
@@ -52,8 +52,8 @@
/**
* Acquire 4 connections, closing them at the end of the loop.
- * Cache the first connection, and before acquiring the last connection,
- * do a flush connection pool. The 5th connection got after the
+ * Cache the first connection, and before acquiring the last connection,
+ * do a flush connection pool. The 5th connection got after the
* flush should be different from the first connection got.
*
* @return boolean
@@ -69,12 +69,12 @@
for (int i = 0; i < 5; i++) {
Connection conn = null;
try {
- //Do a flush and then get a connection for the last iteration
- if(i ==4) {
- if(!flushConnectionPool()) {
- break;
- }
- }
+ //Do a flush and then get a connection for the last iteration
+ if(i ==4) {
+ if(!flushConnectionPool()) {
+ break;
+ }
+ }
conn = ds.getConnection();
System.out.println("********i=" + i + "conn=" + ds.getConnection(conn));
@@ -112,44 +112,44 @@
ds = this.ds;
boolean passed = true;
- Connection con = null;
- try {
+ Connection con = null;
+ try {
con = ds.getConnection();
- } catch(Exception ex) {
- passed = false;
- }
+ } catch(Exception ex) {
+ passed = false;
+ }
return passed;
}
private boolean flushConnectionPool() throws Exception {
ServiceLocator habitat = Globals.getDefaultHabitat();
- GlassFish gf = habitat.getService(GlassFish.class);
- CommandRunner runner = gf.getCommandRunner();
- CommandResult res = runner.run("flush-connection-pool", poolName);
- System.out.println("res= " + res.getOutput());
- if(res.getExitStatus() == CommandResult.ExitStatus.SUCCESS) {
+ GlassFish gf = habitat.getService(GlassFish.class);
+ CommandRunner runner = gf.getCommandRunner();
+ CommandResult res = runner.run("flush-connection-pool", poolName);
+ System.out.println("res= " + res.getOutput());
+ if(res.getExitStatus() == CommandResult.ExitStatus.SUCCESS) {
return true;
- }
- return false;
+ }
+ return false;
}
private boolean amxFlushConnectionPool() throws Exception {
final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- boolean result = false;
+ boolean result = false;
final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
- new ObjectName("amx:pp=/ext,type=connector-runtime-api-provider");
+ new ObjectName("amx:pp=/ext,type=connector-runtime-api-provider");
- String[] params = {poolName};
- String[] signature = {String.class.getName()};
+ String[] params = {poolName};
+ String[] signature = {String.class.getName()};
Map<String,Object> flushStatus = (Map<String,Object>) connection.invoke(objectName, "flushConnectionPool", params, signature);
- if(flushStatus != null) {
- result = (Boolean) flushStatus.get("FlushConnectionPoolKey");
- }
+ if(flushStatus != null) {
+ result = (Boolean) flushStatus.get("FlushConnectionPoolKey");
+ }
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/create_pointbase.sql
index 84654a1..fa5086c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table flush_connection_pool;
-
-CREATE TABLE flush_connection_pool (
- id integer not null,
- value char(16)
-);
-
+Drop table flush_connection_pool;
+
+CREATE TABLE flush_connection_pool (
+ id integer not null,
+ value char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/drop_pointbase.sql
index 9d50687..c2649b4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table flush_connection_pool;
+Drop table flush_connection_pool;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.properties
index 0338c97..cbf09c6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-initsql"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.xml
index 22fa0e4..a4ca9af 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
-
+
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -61,31 +61,31 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-oracle-common">
- <param name="oracle.pool.name" value="jdbc-oracle-pool-initsql"/>
- <param name="oracle.resource.name" value="jdbc/oracleres-initsql"/>
+ <param name="oracle.pool.name" value="jdbc-oracle-pool-initsql"/>
+ <param name="oracle.resource.name" value="jdbc/oracleres-initsql"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-oracle-pool-initsql.init-sql='ALTER SESSION SET NLS_COMP=LINGUISTIC NLS_SORT=BINARY_CI'"/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-oracle-pool-initsql.init-sql='ALTER SESSION SET NLS_COMP=LINGUISTIC NLS_SORT=BINARY_CI'"/>
</antcall>
<antcall target="deploy-common"/>
<antcall target="execute-sql-oracle-common">
- <param name="sql.file" value="sql/create.sql"/>
+ <param name="sql.file" value="sql/create.sql"/>
</antcall>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jdbc-oracle-common">
- <param name="oracle.pool.name" value="jdbc-oracle-pool-initsql"/>
- <param name="oracle.resource.name" value="jdbc/oracleres-initsql"/>
+ <param name="oracle.pool.name" value="jdbc-oracle-pool-initsql"/>
+ <param name="oracle.resource.name" value="jdbc/oracleres-initsql"/>
</antcall>
<antcall target="undeploy-common"/>
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop.sql"/>
</antcall>
</target>
-
+
<target name="run">
<antcall target="runclient-common">
<param name="appclient.application.args" value="1"/>
@@ -100,9 +100,9 @@
<param name="appclient.application.args" value="2"/>
</antcall>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/client/Client.java
index 23b7afe..9f6d9e1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/client/Client.java
@@ -25,24 +25,24 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
private static String testSuite = "initsql-test";
private static InitialContext ic;
public static void main(String[] args)
throws Exception {
-
+
try {
- ic = new InitialContext();
- } catch(NamingException ex) {
- ex.printStackTrace();
- }
+ ic = new InitialContext();
+ } catch(NamingException ex) {
+ ex.printStackTrace();
+ }
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
- stat.addDescription("Running initsql testSuite ");
+ stat.addDescription("Running initsql testSuite ");
SimpleSession simpleSession = simpleSessionHome.create();
if (args != null && args.length > 0) {
@@ -65,9 +65,9 @@
}
break;
}
- }
- }
-
+ }
+ }
+
stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/ejb-jar.xml
index fc6e9fb..807356b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/ejb-jar.xml
@@ -51,6 +51,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/sun-ejb-jar.xml
index fd04412..a19aba3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.initsql.ejb.SimpleSessionHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource1</res-ref-name>
- <jndi-name>jdbc/oracleres-initsql</jndi-name>
+ <jndi-name>jdbc/oracleres-initsql</jndi-name>
</resource-ref>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
index 1e0db90..17c02bd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
@@ -30,71 +30,71 @@
private SessionContext context;
private InitialContext ic;
- private DataSource ds1;
+ private DataSource ds1;
public void setSessionContext(SessionContext ctxt) {
this.context = ctxt;
- try {
- ic = new InitialContext();
- ds1 = (com.sun.appserv.jdbc.DataSource)ic.lookup("java:comp/env/DataSource1");
- } catch( Exception ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic = new InitialContext();
+ ds1 = (com.sun.appserv.jdbc.DataSource)ic.lookup("java:comp/env/DataSource1");
+ } catch( Exception ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
}
/**
- * Test to select the names from a table.
+ * Test to select the names from a table.
*
- * The result set would contain different number of rows based on
- * a session property set during the initialization sql phase.
- * Based on the property set, the number of rows are compared to
+ * The result set would contain different number of rows based on
+ * a session property set during the initialization sql phase.
+ * Based on the property set, the number of rows are compared to
* test the feature.
*/
public boolean test1(boolean caseSensitive) {
Connection con = null;
- Statement stmt = null;
- ResultSet rs = null;
- String query = "Select name from WORKERS where name='Joy Joy'";
- boolean result = false;
- int size = 0;
- try {
- con = ds1.getConnection();
- stmt = con.createStatement();
- rs = stmt.executeQuery(query);
- if(rs != null) {
- while(rs.next()) {
- size++;
- }
- }
- if(caseSensitive) {
- result = size == 1;
- } else {
- result = size == 3;
- }
- } catch (SQLException ex) {
- result = false;
- ex.printStackTrace();
- } finally {
+ Statement stmt = null;
+ ResultSet rs = null;
+ String query = "Select name from WORKERS where name='Joy Joy'";
+ boolean result = false;
+ int size = 0;
+ try {
+ con = ds1.getConnection();
+ stmt = con.createStatement();
+ rs = stmt.executeQuery(query);
+ if(rs != null) {
+ while(rs.next()) {
+ size++;
+ }
+ }
+ if(caseSensitive) {
+ result = size == 1;
+ } else {
+ result = size == 3;
+ }
+ } catch (SQLException ex) {
+ result = false;
+ ex.printStackTrace();
+ } finally {
if(rs != null) {
- try {
- rs.close();
- } catch(Exception ex) {}
- }
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
- if(con != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
- }
- return result;
+ try {
+ rs.close();
+ } catch(Exception ex) {}
+ }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
+ if(con != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
+ }
+ return result;
}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/sql/create.sql b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/sql/create.sql
index 34c8dc1..f1aa0d9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/sql/create.sql
@@ -1,6 +1,6 @@
DROP TABLE WORKERS;
CREATE TABLE WORKERS(
- name char(20)
+ name char(20)
);
INSERT INTO WORKERS VALUES('Joy Joy');
INSERT INTO WORKERS VALUES('joy joy');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.properties
index 6aee91f..c6bd41b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc41-devtests"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.xml
index 74bcdf2..34cbace 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/build.xml
@@ -50,23 +50,23 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-41-pool"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-41-pool"/>
- <param name="jdbc.resource.name" value="jdbc/41resource"/>
+ <param name="jdbc.resource.name" value="jdbc/41resource"/>
</antcall>
<antcall target="deploy-common"/>
@@ -74,11 +74,11 @@
<param name="sql.file" value="sql/create.sql"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
@@ -88,13 +88,13 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/41resource"/>
</antcall>
-
+
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-41-pool"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/client/Client.java
index 90ca373..17435be 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/client/Client.java
@@ -25,43 +25,43 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = " JDBC41 tests on JDK7 ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = " JDBC41 tests on JDK7 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running JDBC41 testSuite ");
+
+ stat.addDescription("Running JDBC41 testSuite ");
SimpleSession simpleSession = simpleSessionHome.create();
if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : Connection API/abort Test : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : Connection API/abort Test : " , stat.FAIL );
- }
-
+ stat.addStatus( testSuite + " test1 : Connection API/abort Test : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : Connection API/abort Test : " , stat.FAIL );
+ }
+
if (simpleSession.test2() ) {
- stat.addStatus( testSuite + " test2 : Connection API/abort usertx Test : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test2 : Connection API/abort usertx Test : " , stat.FAIL );
- }
-
+ stat.addStatus( testSuite + " test2 : Connection API/abort usertx Test : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test2 : Connection API/abort usertx Test : " , stat.FAIL );
+ }
+
if (simpleSession.test3() ) {
- stat.addStatus( testSuite + " test3 : DatabaseMetaData Test : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test3 : DatabaseMetaData Test : " , stat.FAIL );
- }
-
+ stat.addStatus( testSuite + " test3 : DatabaseMetaData Test : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test3 : DatabaseMetaData Test : " , stat.FAIL );
+ }
+
if (simpleSession.test4() ) {
- stat.addStatus( testSuite + " test4 : Statement API/Connection abort usertx Test : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test4 : Statement API/Connection abort usertx Test : " , stat.FAIL );
- }
- stat.printSummary();
+ stat.addStatus( testSuite + " test4 : Statement API/Connection abort usertx Test : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test4 : Statement API/Connection abort usertx Test : " , stat.FAIL );
+ }
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/descriptor/ejb-jar.xml
index db89d3e..c444aad 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/descriptor/ejb-jar.xml
@@ -44,8 +44,8 @@
</enterprise-beans>
<assembly-descriptor>
-
+
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
index 2e0f3f2..614d6fd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
@@ -30,16 +30,16 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
private DataSource ds;
PrintTask task1 = new PrintTask("thread1");
PrintTask task2 = new PrintTask("thread2");
ExecutorService threadExecutor = Executors.newCachedThreadPool(new ThreadFactory() {
- public Thread newThread(Runnable r) {
- Thread th = new Thread(r);
- th.setDaemon(true);
- return th;
- }
+ public Thread newThread(Runnable r) {
+ Thread th = new Thread(r);
+ th.setDaemon(true);
+ return th;
+ }
});
class PrintTask implements Runnable {
@@ -56,247 +56,247 @@
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- ds = (DataSource) ic_.lookup("java:comp/env/DataSource");
- } catch( Exception ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ ds = (DataSource) ic_.lookup("java:comp/env/DataSource");
+ } catch( Exception ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
}
/**
- * Testing connection object
+ * Testing connection object
*/
public boolean test1() throws Exception {
- Connection con = null;
- Connection[] conns = new Connection[32];
- Statement stmt = null;
- boolean passed = true;
- try {
- con = ds.getConnection("scott", "tiger");
- stmt = con.createStatement();
+ Connection con = null;
+ Connection[] conns = new Connection[32];
+ Statement stmt = null;
+ boolean passed = true;
+ try {
+ con = ds.getConnection("scott", "tiger");
+ stmt = con.createStatement();
- //Try getting schema from con object
- System.out.println(">>> con.getSchema()=" + con.getSchema());
+ //Try getting schema from con object
+ System.out.println(">>> con.getSchema()=" + con.getSchema());
- //try getting network timeout from con object
- try {
- System.out.println(">>> con.getNetworkTimeout=" + con.getNetworkTimeout());
- } catch(Exception ex) {
- passed = true;
- //Expected as this is not implemented in derby 10.8 jdbc41 driver
- }
+ //try getting network timeout from con object
+ try {
+ System.out.println(">>> con.getNetworkTimeout=" + con.getNetworkTimeout());
+ } catch(Exception ex) {
+ passed = true;
+ //Expected as this is not implemented in derby 10.8 jdbc41 driver
+ }
- //Invoke abort on con object
- threadExecutor.submit(task1);
- threadExecutor.submit(task2);
- con.abort(threadExecutor);
- System.out.println("Marked connection for aborting...");
-
- //Try to use the aborted connection to create a statement. should fail
- try {
- con.createStatement();
- } catch(SQLException ex) {
- passed = true;
- System.out.println("Creating statement from con after tx abort : Failed : Expected");
- }
- } catch(Exception ex) {
- passed = false;
- } finally {
- if ( stmt != null ) {
- try { stmt.close(); } catch( Exception e1) {}
- }
- if ( con != null ) {
- try { con.close(); } catch( Exception e1) {}
- }
- for(int i=0; i<32; i++) {
- if(conns[i] != null) {
- try { conns[i].close(); } catch(Exception ex) {}
- }
- }
- }
- return passed;
+ //Invoke abort on con object
+ threadExecutor.submit(task1);
+ threadExecutor.submit(task2);
+ con.abort(threadExecutor);
+ System.out.println("Marked connection for aborting...");
+
+ //Try to use the aborted connection to create a statement. should fail
+ try {
+ con.createStatement();
+ } catch(SQLException ex) {
+ passed = true;
+ System.out.println("Creating statement from con after tx abort : Failed : Expected");
+ }
+ } catch(Exception ex) {
+ passed = false;
+ } finally {
+ if ( stmt != null ) {
+ try { stmt.close(); } catch( Exception e1) {}
+ }
+ if ( con != null ) {
+ try { con.close(); } catch( Exception e1) {}
+ }
+ for(int i=0; i<32; i++) {
+ if(conns[i] != null) {
+ try { conns[i].close(); } catch(Exception ex) {}
+ }
+ }
+ }
+ return passed;
}
/**
- * Testing connection object in a User transaction
+ * Testing connection object in a User transaction
*/
public boolean test2() throws Exception {
- Connection con = null;
- Connection[] conns = new Connection[32];
- Connection[] conns1 = new Connection[32];
- Statement[] stmts1 = new Statement[32];
- Statement stmt = null;
- boolean passed = true;
- try {
- UserTransaction usertx = (UserTransaction) ctxt_.getUserTransaction();
+ Connection con = null;
+ Connection[] conns = new Connection[32];
+ Connection[] conns1 = new Connection[32];
+ Statement[] stmts1 = new Statement[32];
+ Statement stmt = null;
+ boolean passed = true;
+ try {
+ UserTransaction usertx = (UserTransaction) ctxt_.getUserTransaction();
usertx.begin();
- con = ds.getConnection("scott", "tiger");
- //System.out.println("!!!! TEST2 ConHashcode=" + (((com.sun.appserv.jdbc.DataSource)ds).getConnection(con)).hashCode());
- stmt = con.createStatement();
+ con = ds.getConnection("scott", "tiger");
+ //System.out.println("!!!! TEST2 ConHashcode=" + (((com.sun.appserv.jdbc.DataSource)ds).getConnection(con)).hashCode());
+ stmt = con.createStatement();
- //Invoke abort on con object
- threadExecutor.submit(task1);
- threadExecutor.submit(task2);
- con.abort(threadExecutor);
- System.out.println("Marked connection for aborting...");
-
- //Operations on con object after marking for abort in a tx
- //before tx commit, all operations on con pass
+ //Invoke abort on con object
+ threadExecutor.submit(task1);
+ threadExecutor.submit(task2);
+ con.abort(threadExecutor);
+ System.out.println("Marked connection for aborting...");
+
+ //Operations on con object after marking for abort in a tx
+ //before tx commit, all operations on con pass
//Try getting schema from con object
- System.out.println(">>> con.getSchema()=" + con.getSchema());
+ System.out.println(">>> con.getSchema()=" + con.getSchema());
- //try getting network timeout from con object
- try {
- System.out.println(">>> con.getNetworkTimeout=" + con.getNetworkTimeout());
- } catch(Exception ex) {
- passed = true;
- //Expected as this is not implemented in derby 10.8 jdbc41 driver
- }
+ //try getting network timeout from con object
+ try {
+ System.out.println(">>> con.getNetworkTimeout=" + con.getNetworkTimeout());
+ } catch(Exception ex) {
+ passed = true;
+ //Expected as this is not implemented in derby 10.8 jdbc41 driver
+ }
- usertx.commit();
+ usertx.commit();
- //Try to use the aborted connection to create a statement. should fail
- try {
- con.createStatement();
- } catch(SQLException ex) {
- passed = true;
- System.out.println("Creating statement from con after tx abort : Failed : Expected");
- }
- } catch(Exception ex) {
- passed = false;
- } finally {
- if ( stmt != null ) {
- try { stmt.close(); } catch( Exception e1) {}
- }
- if ( con != null ) {
- try { con.close(); } catch( Exception e1) {}
- }
- //Test to get (max pool size-1) no. of connections after a previous abort.
- //should pass as the aborted connection is destroyed
- for(int i=0; i<32; i++) {
- if(i == 31) {
- //Last connection should not be got
- try {
- conns1[i] = ds.getConnection("scott", "tiger");
- } catch(Exception ex) {
- passed = true;
- }
- } else {
+ //Try to use the aborted connection to create a statement. should fail
+ try {
+ con.createStatement();
+ } catch(SQLException ex) {
+ passed = true;
+ System.out.println("Creating statement from con after tx abort : Failed : Expected");
+ }
+ } catch(Exception ex) {
+ passed = false;
+ } finally {
+ if ( stmt != null ) {
+ try { stmt.close(); } catch( Exception e1) {}
+ }
+ if ( con != null ) {
+ try { con.close(); } catch( Exception e1) {}
+ }
+ //Test to get (max pool size-1) no. of connections after a previous abort.
+ //should pass as the aborted connection is destroyed
+ for(int i=0; i<32; i++) {
+ if(i == 31) {
+ //Last connection should not be got
+ try {
+ conns1[i] = ds.getConnection("scott", "tiger");
+ } catch(Exception ex) {
+ passed = true;
+ }
+ } else {
conns1[i] = ds.getConnection("scott", "tiger");
- stmts1[i] = conns1[i].createStatement();
- }
- }
- for(int i=0; i<32; i++) {
- if(stmts1[i] != null) {
- try { stmts1[i].close(); } catch(Exception ex) {}
- }
- }
- for(int i=0; i<32; i++) {
- if(conns1[i] != null) {
- try { conns1[i].close(); } catch(Exception ex) {}
- }
- }
- }
- return passed;
+ stmts1[i] = conns1[i].createStatement();
+ }
+ }
+ for(int i=0; i<32; i++) {
+ if(stmts1[i] != null) {
+ try { stmts1[i].close(); } catch(Exception ex) {}
+ }
+ }
+ for(int i=0; i<32; i++) {
+ if(conns1[i] != null) {
+ try { conns1[i].close(); } catch(Exception ex) {}
+ }
+ }
+ }
+ return passed;
}
//Tests DatabaseMetaData
public boolean test3() throws Exception {
- Connection con = null;
- DatabaseMetaData dmd = null;
- boolean passed = true;
- try {
- con = ds.getConnection("scott", "tiger");
- dmd = con.getMetaData();
- //Testing DatabaseMetaData
- System.out.println(">>> dmd.generatedKeyAlwaysReturned()=" + dmd.generatedKeyAlwaysReturned());
- } catch(Exception ex) {
- passed = false;
- } finally {
- if(con!= null) {
- try { con.close(); } catch(Exception ex) {}
- }
- }
- return passed;
+ Connection con = null;
+ DatabaseMetaData dmd = null;
+ boolean passed = true;
+ try {
+ con = ds.getConnection("scott", "tiger");
+ dmd = con.getMetaData();
+ //Testing DatabaseMetaData
+ System.out.println(">>> dmd.generatedKeyAlwaysReturned()=" + dmd.generatedKeyAlwaysReturned());
+ } catch(Exception ex) {
+ passed = false;
+ } finally {
+ if(con!= null) {
+ try { con.close(); } catch(Exception ex) {}
+ }
+ }
+ return passed;
}
/**
* Testing Statement object within a transaction
*/
public boolean test4() throws Exception {
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = true;
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = true;
- //Now try getting a connection again, but within a transaction
- int size = 0;
- try {
- createTable();
- UserTransaction tx = (UserTransaction) ctxt_.getUserTransaction();
- tx.begin();
- conn1 = ds.getConnection("scott", "tiger");
- System.out.println("!!!! TEST4 ConHashcode=" + (((com.sun.appserv.jdbc.DataSource)ds).getConnection(conn1)).hashCode());
- stmt1 = conn1.createStatement();
- insertRow(stmt1);
-
- threadExecutor.submit(task1);
+ //Now try getting a connection again, but within a transaction
+ int size = 0;
+ try {
+ createTable();
+ UserTransaction tx = (UserTransaction) ctxt_.getUserTransaction();
+ tx.begin();
+ conn1 = ds.getConnection("scott", "tiger");
+ System.out.println("!!!! TEST4 ConHashcode=" + (((com.sun.appserv.jdbc.DataSource)ds).getConnection(conn1)).hashCode());
+ stmt1 = conn1.createStatement();
+ insertRow(stmt1);
+
+ threadExecutor.submit(task1);
threadExecutor.submit(task2);
- //Testing Statement object
- stmt1.closeOnCompletion();
- System.out.println(">>> stmt1.isCloseOnCompletion()=" + stmt1.isCloseOnCompletion());
-
+ //Testing Statement object
+ stmt1.closeOnCompletion();
+ System.out.println(">>> stmt1.isCloseOnCompletion()=" + stmt1.isCloseOnCompletion());
+
conn1.abort(threadExecutor);
- System.out.println("Marked connection for aborting...");
- insertRow(stmt1);
+ System.out.println("Marked connection for aborting...");
+ insertRow(stmt1);
- //After con abort (within the tx)
- size = getCount(stmt1);
+ //After con abort (within the tx)
+ size = getCount(stmt1);
- if(size != 2) {
- passed = false;
- System.out.println("FAILED as size!= 2");
- }
+ if(size != 2) {
+ passed = false;
+ System.out.println("FAILED as size!= 2");
+ }
- tx.commit();
+ tx.commit();
- try {
- //After tx commit, insert data. Should fail because of no current connection
- insertRow(stmt1);
- } catch(SQLException ex) {
- passed = true;
- System.out.println("Trying to insert data after a tx commit (prev. conn abort): Failed with : " + ex + " Expected.");
- }
- } catch (Exception e) {
- passed = false;
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- }
- return passed;
+ try {
+ //After tx commit, insert data. Should fail because of no current connection
+ insertRow(stmt1);
+ } catch(SQLException ex) {
+ passed = true;
+ System.out.println("Trying to insert data after a tx commit (prev. conn abort): Failed with : " + ex + " Expected.");
+ }
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ }
+ return passed;
}
private void createTable() throws SQLException {
String tableName = "JDBC41";
-
+
Connection con = null;
Statement stmt = null;
con = ds.getConnection("scott", "tiger");
stmt = con.createStatement();
-
+
try{
stmt.executeUpdate("drop table " + tableName);
}catch(Exception ex){
@@ -305,12 +305,12 @@
stmt.close();
con.close();
}
-
+
private void insertRow(Statement stmt) throws SQLException {
String tableName = "JDBC41";
stmt.executeUpdate("INSERT INTO " + tableName + " values (100, 'COFFEE')");
}
-
+
private int getCount(Statement stmt) throws SQLException {
String tableName = "JDBC41";
ResultSet rs = null;
@@ -320,7 +320,7 @@
rs.close();
return count;
}
-
+
public void ejbLoad() {}
public void ejbStore() {}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/build.xml
index 02580a2..a6b1374 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/build.xml
@@ -34,15 +34,15 @@
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
</delete>
<delete>
- <fileset dir="${env.APS_HOME}" includes="JDBC41test_results.html"/>
+ <fileset dir="${env.APS_HOME}" includes="JDBC41test_results.html"/>
</delete>
<antcall target="run-tests"/>
- <antcall target="report-41"/>
+ <antcall target="report-41"/>
</target>
<target name="run-tests">
<ant dir="basic" target="all"/>
- <ant dir="closeoncompletion.stmtcaching" target="all"/>
+ <ant dir="closeoncompletion.stmtcaching" target="all"/>
</target>
<target name="report-41">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.properties
index 2213521..3dfeebd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc41-close-on-completion"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.xml
index 17ab836..8e21bee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/build.xml
@@ -19,9 +19,9 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../../../config/run.xml">
+ <!ENTITY run SYSTEM "./../../../../config/run.xml">
]>
<project name="jdbc41-close-on-completion" default="usage" basedir=".">
@@ -69,7 +69,7 @@
</target>
<target name="undeploy" depends="init-common">
- <antcall target="execute-sql-common">
+ <antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
@@ -92,13 +92,13 @@
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching-pool.statement_cache_size=5"/>
- </antcall>
+ </antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching-pool.wrap_jdbc_objects=true"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/application.xml
index a30de7f..a61df17 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/application.xml
@@ -28,7 +28,7 @@
<ejb>jdbc41-close-on-completion-ejb.jar</ejb>
</module>
<module>
- <java>jdbc41-close-on-completion-client.jar</java>
+ <java>jdbc41-close-on-completion-client.jar</java>
</module>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/sun-ejb-jar.xml
index 80cc26c..32a7540 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.stmtcaching.ejb.SimpleBMPHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/jdbc-stmtcaching-res</jndi-name>
+ <jndi-name>jdbc/jdbc-stmtcaching-res</jndi-name>
<default-resource-principal>
<name>DBUSER</name>
<password>DBPASSWORD</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
index 7445272..746e41c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
@@ -39,43 +39,43 @@
}
public boolean testCloseOnCompletion() {
- System.out.println("closeOnCompletion JDBC 41 test Start");
+ System.out.println("closeOnCompletion JDBC 41 test Start");
Connection conn = null;
PreparedStatement stmt = null;
String tableName = "customer_stmt_wrapper";
- ResultSet rs = null;
- ResultSet rs1 = null;
+ ResultSet rs = null;
+ ResultSet rs1 = null;
boolean passed = true;
- try {
+ try {
conn = ds.getConnection();
stmt = conn.prepareStatement("select * from "+ tableName +" where c_phone= ?");
- stmt.setString(1, "shal");
- stmt.closeOnCompletion();
- if(!stmt.isCloseOnCompletion()) {
- passed = false;
- }
- System.out.println(">>> stmt.isCloseOnCompletion()=" + stmt.isCloseOnCompletion());
- rs = stmt.executeQuery();
- rs1 = stmt.executeQuery(); //Got a second rs but not closing it.
- rs.close();
- //After this the isClosed should not be true as another resultSet is still open.
- if(stmt.isClosed()){
- passed = false;
- }
- System.out.println("Statement closed=" + stmt.isClosed());
- rs1.close();
- //Both the resultSets are closed. At this stage isClosed should be true.
- if(!stmt.isClosed()){
- passed = false;
- }
- System.out.println("Statement closed=" + stmt.isClosed());
- try {
- ResultSet rs2 = stmt.executeQuery();
- rs2.close();
- } catch(SQLException ex) {
- System.out.println("Statement object used after closeoncompletion : exception: expected");
- passed = true;
- }
+ stmt.setString(1, "shal");
+ stmt.closeOnCompletion();
+ if(!stmt.isCloseOnCompletion()) {
+ passed = false;
+ }
+ System.out.println(">>> stmt.isCloseOnCompletion()=" + stmt.isCloseOnCompletion());
+ rs = stmt.executeQuery();
+ rs1 = stmt.executeQuery(); //Got a second rs but not closing it.
+ rs.close();
+ //After this the isClosed should not be true as another resultSet is still open.
+ if(stmt.isClosed()){
+ passed = false;
+ }
+ System.out.println("Statement closed=" + stmt.isClosed());
+ rs1.close();
+ //Both the resultSets are closed. At this stage isClosed should be true.
+ if(!stmt.isClosed()){
+ passed = false;
+ }
+ System.out.println("Statement closed=" + stmt.isClosed());
+ try {
+ ResultSet rs2 = stmt.executeQuery();
+ rs2.close();
+ } catch(SQLException ex) {
+ System.out.println("Statement object used after closeoncompletion : exception: expected");
+ passed = true;
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
@@ -84,12 +84,12 @@
try {
conn.close();
} catch (Exception e1) {}
- }
- }
- System.out.println("closeOnCompletion JDBC 41 test End");
- return passed;
+ }
}
-
+ System.out.println("closeOnCompletion JDBC 41 test End");
+ return passed;
+ }
+
public void ejbLoad() {
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/create_pointbase.sql
index 49db4c1..1d4ccfd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-drop table customer_stmt_wrapper;
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(2, 'shal');
+drop table customer_stmt_wrapper;
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(2, 'shal');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/drop_pointbase.sql
index f2ce6e9..abfe149 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/sql/drop_pointbase.sql
@@ -1 +1 @@
-drop table customer_stmt_wrapper;
+drop table customer_stmt_wrapper;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/report.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/report.xml
index d962c50..b183174 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/report.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/report.xml
@@ -22,7 +22,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.properties
index 84f69f3..42211e9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-jdbcjmsauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.xml
index 6853569..dfd7183 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/build.xml
@@ -40,7 +40,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"/>
@@ -52,13 +52,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
- value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class,**/JmsAuthHome.class,**/JmsAuth.class" />
+ <param name="appclientjar.classes"
+ value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class,**/JmsAuthHome.class,**/JmsAuth.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -66,7 +66,7 @@
<antcall target="deploy-jdbc-common"/>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="ql-jdbc-pool"/>
- <param name="jdbc.resource.name" value="jdbc/s1qeDB_CM"/>
+ <param name="jdbc.resource.name" value="jdbc/s1qeDB_CM"/>
</antcall>
<antcall target="deploy-jms-stuff"/>
<antcall target="deploy-common"/>
@@ -80,7 +80,7 @@
<antcall target="runclient-common"/>
<antcall target="reset-derby-for-no-authentication"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -92,7 +92,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-jms-stuff"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
@@ -106,12 +106,12 @@
-->
<antcall target="create-jms-connection-common">
<param name="jms.factory.type" value="jakarta.jms.QueueConnectionFactory"/>
- <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF1"/>
+ <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF1"/>
</antcall>
-
+
<antcall target="create-jms-connection-common">
<param name="jms.factory.type" value="jakarta.jms.QueueConnectionFactory"/>
- <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF2"/>
+ <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF2"/>
</antcall>
</target>
@@ -122,10 +122,10 @@
</antcall>
-->
<antcall target="delete-jms-connection-common">
- <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF1"/>
+ <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF1"/>
</antcall>
<antcall target="delete-jms-connection-common">
- <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF2"/>
+ <param name="jms.factory.name" value="jms/jdbcjmsauth_QCF2"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/client/Client.java
index d7453a3..10a85a3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/client/Client.java
@@ -25,199 +25,199 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- static SimpleReporterAdapter stat =
+ static SimpleReporterAdapter stat =
new SimpleReporterAdapter();
public static void main(String[] args)
throws Exception {
-
+
stat.addDescription("JDBC JMS Authentication tests");
Client c = new Client();
- c.doJdbcTests();
- c.doJmsTests();
+ c.doJdbcTests();
+ c.doJmsTests();
- stat.printSummary();
+ stat.printSummary();
}
private void doJdbcTests() throws Exception {
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
-
+
SimpleBMP simpleBMP = simpleBMPHome.create();
- String testSuite = "JDBCJmsAuth-JDBC ";
- System.out.println(" jdbc tests 3 & 7 will fail with Derby");
- System.out.println("-----------------------------------------------");
- System.out.println(" JDBC Tests ");
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/o user/pass");
- System.out.print("Should NOT get a connection : " );
+ String testSuite = "JDBCJmsAuth-JDBC ";
+ System.out.println(" jdbc tests 3 & 7 will fail with Derby");
+ System.out.println("-----------------------------------------------");
+ System.out.println(" JDBC Tests ");
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/o user/pass");
+ System.out.print("Should NOT get a connection : " );
if ( simpleBMP.test1() ) {
- stat.addStatus(testSuite+" test1 ", stat.PASS);
- //System.out.println("PASS");
- } else {
- stat.addStatus(testSuite+" test1 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ stat.addStatus(testSuite+" test1 ", stat.PASS);
+ //System.out.println("PASS");
+ } else {
+ stat.addStatus(testSuite+" test1 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/ user/pass");
- System.out.print("Should get a connection : " );
- if ( simpleBMP.test2() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite+" test2 ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" test2 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/ user/pass");
+ System.out.print("Should get a connection : " );
+ if ( simpleBMP.test2() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite+" test2 ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" test2 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/ wrong user/pass");
- System.out.print("Should NOT get a connection : " );
- if ( simpleBMP.test3() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test3 ", stat.PASS);
- } else {
- stat.addStatus(testSuite + " test3 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/ wrong user/pass");
+ System.out.print("Should NOT get a connection : " );
+ if ( simpleBMP.test3() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test3 ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite + " test3 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/ correct then wrong user/pass");
- System.out.print("Should get a connection then NOT get a connection : " );
- if ( simpleBMP.test4() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test4 ", stat.PASS);
- } else {
- stat.addStatus(testSuite + " test4 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/ correct then wrong user/pass");
+ System.out.print("Should get a connection then NOT get a connection : " );
+ if ( simpleBMP.test4() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test4 ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite + " test4 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("container auth : getting connection w/o user/pass");
- System.out.print("Should get a connection : " );
+ System.out.println("-----------------------------------------------");
+ System.out.println("container auth : getting connection w/o user/pass");
+ System.out.print("Should get a connection : " );
if ( simpleBMP.test5() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite+" test5 ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" test5 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ //System.out.println("PASS");
+ stat.addStatus(testSuite+" test5 ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" test5 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("container auth : getting connection w/ user/pass");
- System.out.print("Should get a connection : " );
- if ( simpleBMP.test6() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite+" test6 ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" test6 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("container auth : getting connection w/ user/pass");
+ System.out.print("Should get a connection : " );
+ if ( simpleBMP.test6() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite+" test6 ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" test6 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("container auth : getting connection w/ wrong user/pass");
- System.out.print("Should NOT get a connection : " );
- if ( simpleBMP.test7() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test7 ", stat.PASS);
- } else {
- stat.addStatus(testSuite + " test7 ", stat.FAIL);
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("container auth : getting connection w/ wrong user/pass");
+ System.out.print("Should NOT get a connection : " );
+ if ( simpleBMP.test7() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test7 ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite + " test7 ", stat.FAIL);
+ //System.out.println("FAIL");
+ }
}
private void doJmsTests() throws Exception {
InitialContext ic = new InitialContext();
- Object obj = ic.lookup("java:comp/env/ejb/JmsAuthHome");
- JmsAuthHome jmsAuthHome = (JmsAuthHome)
- PortableRemoteObject.narrow( obj, JmsAuthHome.class );
- JmsAuth jmsAuth = jmsAuthHome.create();
+ Object obj = ic.lookup("java:comp/env/ejb/JmsAuthHome");
+ JmsAuthHome jmsAuthHome = (JmsAuthHome)
+ PortableRemoteObject.narrow( obj, JmsAuthHome.class );
+ JmsAuth jmsAuth = jmsAuthHome.create();
- String testSuite = "JDBCJmsAuth-JMS";
-
- System.out.println("-----------------------------------------------");
- System.out.println(" JMS tests ");
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/ user/pass");
- System.out.print("Should get a connection : " );
- if ( jmsAuth.test1() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test1 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test1 ", stat.FAIL );
- //System.out.println("FAIL");
- }
+ String testSuite = "JDBCJmsAuth-JMS";
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/o user/pass");
- System.out.print("Should get a connection : " );
- if ( jmsAuth.test2() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test2 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test2 ", stat.FAIL );
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println(" JMS tests ");
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/ user/pass");
+ System.out.print("Should get a connection : " );
+ if ( jmsAuth.test1() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test1 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test1 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/ wrong user/pass");
- System.out.print("Should NOT get a connection : " );
- if ( jmsAuth.test3() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test3 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test3 ", stat.FAIL );
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/o user/pass");
+ System.out.print("Should get a connection : " );
+ if ( jmsAuth.test2() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test2 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test2 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("app auth : getting connection w/ correct then wrong user/pass");
- System.out.print("Should get a connection then NOT get a connection : " );
- if ( jmsAuth.test4() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test4 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test4 ", stat.FAIL );
- //System.out.println("FAIL");
- }
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/ wrong user/pass");
+ System.out.print("Should NOT get a connection : " );
+ if ( jmsAuth.test3() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test3 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test3 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
- System.out.println("-----------------------------------------------");
- System.out.println("container auth : getting connection w/o user/pass");
- System.out.print("Should get a connection : " );
- if ( jmsAuth.test5() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test5 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test5 ", stat.FAIL );
- //System.out.println("FAIL");
- }
-
- System.out.println("-----------------------------------------------");
- System.out.println("container auth : getting connection w/ user/pass");
- System.out.print("Should get a connection : " );
- if ( jmsAuth.test6() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " test6 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " test6 ", stat.FAIL );
- //System.out.println("FAIL");
- }
-/*
- System.out.println("-----------------------------------------------");
- System.out.println("container auth : getting connection w/ wrong user/pass");
- System.out.print("Should NOT get a connection : " );
- if ( jmsAuth.test7() ) {
- //System.out.println("PASS");
- stat.addStatus(testSuite + " jms-test7 ", stat.PASS );
- } else {
- stat.addStatus(testSuite + " jms-test7 ", stat.FAIL );
- //System.out.println("FAIL");
- }
-*/
- System.out.println("-----------------------------------------------");
+ System.out.println("-----------------------------------------------");
+ System.out.println("app auth : getting connection w/ correct then wrong user/pass");
+ System.out.print("Should get a connection then NOT get a connection : " );
+ if ( jmsAuth.test4() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test4 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test4 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
+
+ System.out.println("-----------------------------------------------");
+ System.out.println("container auth : getting connection w/o user/pass");
+ System.out.print("Should get a connection : " );
+ if ( jmsAuth.test5() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test5 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test5 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
+
+ System.out.println("-----------------------------------------------");
+ System.out.println("container auth : getting connection w/ user/pass");
+ System.out.print("Should get a connection : " );
+ if ( jmsAuth.test6() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " test6 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " test6 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
+/*
+ System.out.println("-----------------------------------------------");
+ System.out.println("container auth : getting connection w/ wrong user/pass");
+ System.out.print("Should NOT get a connection : " );
+ if ( jmsAuth.test7() ) {
+ //System.out.println("PASS");
+ stat.addStatus(testSuite + " jms-test7 ", stat.PASS );
+ } else {
+ stat.addStatus(testSuite + " jms-test7 ", stat.FAIL );
+ //System.out.println("FAIL");
+ }
+*/
+ System.out.println("-----------------------------------------------");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/ejb-jar.xml
index 8d0dfbc..066b12b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/ejb-jar.xml
@@ -35,16 +35,16 @@
<transaction-type>Container</transaction-type>
<resource-ref>
<res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
- <res-type>jakarta.jms.QueueConnectionFactory</res-type>
- <res-auth>Application</res-auth>
- </resource-ref>
+ <res-type>jakarta.jms.QueueConnectionFactory</res-type>
+ <res-auth>Application</res-auth>
+ </resource-ref>
<resource-ref>
<res-ref-name>jms/MyQueueConnectionFactory_CM</res-ref-name>
- <res-type>jakarta.jms.QueueConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
+ <res-type>jakarta.jms.QueueConnectionFactory</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
</session>
-
+
<entity>
<display-name>SimpleBMPEJB</display-name>
<ejb-name>SimpleBMPEJB</ejb-name>
@@ -71,7 +71,7 @@
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
</entity>
-
+
</enterprise-beans>
<assembly-descriptor>
@@ -79,7 +79,7 @@
<container-transaction>
<method>
<ejb-name>JmsAuthEJB</ejb-name>
- <method-name>*</method-name>
+ <method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
@@ -91,6 +91,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/sun-ejb-jar.xml
index 063367e..c7b6eae 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/descriptor/sun-ejb-jar.xml
@@ -35,10 +35,10 @@
<resource-ref>
<res-ref-name>jms/MyQueueConnectionFactory_CM</res-ref-name>
<jndi-name>jms/jdbcjmsauth_QCF2</jndi-name>
- <default-resource-principal>
- <name>guest</name>
- <password>guest</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>guest</name>
+ <password>guest</password>
+ </default-resource-principal>
</resource-ref>
</ejb>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
index 5e1de7c..2b6e1d1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
@@ -27,5 +27,5 @@
public boolean test5() throws RemoteException;
public boolean test6() throws RemoteException;
public boolean test7() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
index 03cd8f4..91b8d52 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
@@ -26,25 +26,25 @@
import javax.naming.InitialContext;
public class JmsAuthBean implements SessionBean {
-
+
private SessionContext ctxt_;
private QueueConnectionFactory qcf_;
private QueueConnectionFactory qcf1_;
public void ejbCreate() throws CreateException {
try {
- InitialContext ic = new InitialContext();
- qcf_ = (QueueConnectionFactory)
- ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
- qcf1_ = (QueueConnectionFactory)
- ic.lookup("java:comp/env/jms/MyQueueConnectionFactory_CM");
- } catch( Exception e ) {
- e.printStackTrace();
- CreateException ce = new CreateException( e.getMessage() );
- ce.initCause( e );
- throw ce;
- }
-
+ InitialContext ic = new InitialContext();
+ qcf_ = (QueueConnectionFactory)
+ ic.lookup("java:comp/env/jms/MyQueueConnectionFactory");
+ qcf1_ = (QueueConnectionFactory)
+ ic.lookup("java:comp/env/jms/MyQueueConnectionFactory_CM");
+ } catch( Exception e ) {
+ e.printStackTrace();
+ CreateException ce = new CreateException( e.getMessage() );
+ ce.initCause( e );
+ throw ce;
+ }
+
}
public void ejbRemove() {
@@ -62,189 +62,189 @@
public boolean test1() {
//application auth - getConnection w/ user/pass - must pass
- boolean passed = true;
+ boolean passed = true;
QueueConnection con = null;
- QueueSession session = null;
+ QueueSession session = null;
- try {
- con = qcf_.createQueueConnection("guest", "guest");
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 1--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = false;
- } finally {
+ try {
+ con = qcf_.createQueueConnection("guest", "guest");
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 1--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = false;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
-
- } catch( Exception e ) {}
- }
- return passed;
+ } catch( Exception e ) {}
+ }
+
+ return passed;
}
public boolean test2() {
//application auth - getConnection w/o user/pass - must fail
- boolean passed = true;
+ boolean passed = true;
QueueConnection con = null;
QueueSession session = null;
- try {
- con = qcf_.createQueueConnection();
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 2--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = false;
- } finally {
+ try {
+ con = qcf_.createQueueConnection();
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 2--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = false;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
} catch( Exception e ) {}
- }
-
- return passed;
}
-
+
+ return passed;
+ }
+
public boolean test3() {
//application auth - getConnection w/ wrong user/pass - must fail
- boolean passed = false;
+ boolean passed = false;
QueueConnection con = null;
QueueSession session = null;
- try {
- con = qcf_.createQueueConnection("xyz", "xyz");
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 3--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = true;
- } finally {
+ try {
+ con = qcf_.createQueueConnection("xyz", "xyz");
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 3--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = true;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
} catch( Exception e ) {}
- }
+ }
- return passed;
+ return passed;
}
public boolean test4() {
- //application auth - getConnection w/ correct user/pass
- //and then wrong - must pass
- boolean passed = false;
+ //application auth - getConnection w/ correct user/pass
+ //and then wrong - must pass
+ boolean passed = false;
QueueConnection con = null;
QueueSession session = null;
- try {
- con = qcf_.createQueueConnection("guest", "guest");
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 4--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- return passed;
- } finally {
+ try {
+ con = qcf_.createQueueConnection("guest", "guest");
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 4--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ return passed;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
} catch( Exception e ) {}
- }
-
- try {
- con = qcf_.createQueueConnection("xyz", "xyz" );
- session = con.createQueueSession( true, Session.AUTO_ACKNOWLEDGE );
- } catch( Exception e ) {
- System.out.println("------------jms test 4--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = true;
- } finally {
- try {
- session.close();
- con.close();
- } catch( Exception e ) {}
- }
-
- return passed;
+ }
+
+ try {
+ con = qcf_.createQueueConnection("xyz", "xyz" );
+ session = con.createQueueSession( true, Session.AUTO_ACKNOWLEDGE );
+ } catch( Exception e ) {
+ System.out.println("------------jms test 4--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = true;
+ } finally {
+ try {
+ session.close();
+ con.close();
+ } catch( Exception e ) {}
+ }
+
+ return passed;
}
public boolean test5() {
//container auth - getConnection w/o user/pass - must pass
- boolean passed = true;
+ boolean passed = true;
QueueConnection con = null;
- QueueSession session = null;
+ QueueSession session = null;
- try {
- con = qcf1_.createQueueConnection();
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 5--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = false;
- } finally {
+ try {
+ con = qcf1_.createQueueConnection();
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 5--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = false;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
-
- } catch( Exception e ) {}
- }
- return passed;
+ } catch( Exception e ) {}
}
-
+
+ return passed;
+ }
+
public boolean test6() {
//container auth - getConnection w/ user/pass - must pass
- boolean passed = true;
+ boolean passed = true;
QueueConnection con = null;
- QueueSession session = null;
+ QueueSession session = null;
- try {
- con = qcf1_.createQueueConnection("guest","guest");
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 6--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = false;
- } finally {
+ try {
+ con = qcf1_.createQueueConnection("guest","guest");
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 6--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = false;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
-
- } catch( Exception e ) {}
- }
- return passed;
+ } catch( Exception e ) {}
+ }
+
+ return passed;
}
public boolean test7() {
//container auth - getConnection w/ wrong user/pass - must fail
- boolean passed = false;
+ boolean passed = false;
QueueConnection con = null;
- QueueSession session = null;
+ QueueSession session = null;
- try {
- con = qcf1_.createQueueConnection("xyz", "xyz");
- session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- } catch( Exception e ) {
- System.out.println("------------jms test 7--------------");
- e.printStackTrace();
- System.out.println("------------------------------------");
- passed = true;
- } finally {
+ try {
+ con = qcf1_.createQueueConnection("xyz", "xyz");
+ session = con.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
+ } catch( Exception e ) {
+ System.out.println("------------jms test 7--------------");
+ e.printStackTrace();
+ System.out.println("------------------------------------");
+ passed = true;
+ } finally {
try {
- session.close();
+ session.close();
con.close();
-
- } catch( Exception e ) {}
- }
- return passed;
+ } catch( Exception e ) {}
+ }
+
+ return passed;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
index 82e4ac1..cb38cf8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
@@ -29,5 +29,5 @@
public boolean test5() throws RemoteException;
public boolean test6() throws RemoteException;
public boolean test7() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
index d1cf55c..8fffa98 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
@@ -32,196 +32,196 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- ds1 = (DataSource) context.lookup("java:comp/env/DataSource_CM");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ ds1 = (DataSource) context.lookup("java:comp/env/DataSource_CM");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1() {
//application auth + user/pwd not specified - should fail
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = true;
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = true;
System.out.println("----------test1------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {
- }
- }
- }
-
- return passed;
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {
+ }
+ }
}
-
+
+ return passed;
+ }
+
public boolean test2() {
//application auth + user/pwd specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD");
- } catch (Exception e) {
- passed = false;
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD");
+ } catch (Exception e) {
+ passed = false;
System.out.println("----------test2------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public boolean test3() {
- //application auth + wrong user/pwd
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection("xyz", "xyz" );
- } catch (Exception e) {
- passed = true;
+ //application auth + wrong user/pwd
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection("xyz", "xyz" );
+ } catch (Exception e) {
+ passed = true;
System.out.println("----------test3------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public boolean test4() {
//application auth + user/pwd specified - right initiall
- //wrong the second time
- Connection conn = null;
- boolean passed = false;
+ //wrong the second time
+ Connection conn = null;
+ boolean passed = false;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD");
- } catch (Exception e) {
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD");
+ } catch (Exception e) {
System.out.println("----------test4------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- return false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ return false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- try {
- conn = ds.getConnection("xyz", "xyz" );
- } catch (Exception e) {
+ try {
+ conn = ds.getConnection("xyz", "xyz" );
+ } catch (Exception e) {
System.out.println("----------test4------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- passed = true;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ passed = true;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public boolean test5() {
//container auth + user/pwd not specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds1.getConnection();
- } catch (Exception e) {
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds1.getConnection();
+ } catch (Exception e) {
System.out.println("----------test5------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+ return passed;
+ }
+
public boolean test6() {
//container auth + user/pwd specified - should still pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD");
- } catch (Exception e) {
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD");
+ } catch (Exception e) {
System.out.println("----------test6------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public boolean test7() {
//container auth + wrong user/pwd should fail
- Connection conn = null;
- boolean passed = false;
- try {
- conn = ds.getConnection("xyz", "xyz" );
- } catch (Exception e) {
+ Connection conn = null;
+ boolean passed = false;
+ try {
+ conn = ds.getConnection("xyz", "xyz" );
+ } catch (Exception e) {
System.out.println("----------test7------------");
- e.printStackTrace();
- System.out.println("---------------------------");
- passed = true;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ e.printStackTrace();
+ System.out.println("---------------------------");
+ passed = true;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
- return passed;
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.properties
index 5d78233..299559b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-ejb30-persistence-tx_propagation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.client.Client"/>
<property name="test.client" value="Client"/>
@@ -26,10 +26,10 @@
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.xml
index 2f5304a..406c42b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/build.xml
@@ -45,7 +45,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"/>
@@ -62,7 +62,7 @@
<param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
<param name="jdbc.resource.name" value="jdbc/xa"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-xa-pool.property.connectionAttributes=;create=true"/>
@@ -92,17 +92,17 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
- <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
+ <jar destfile="${assemble.dir}/lib/${appname}-lib.jar"
basedir="${build.classes.dir}"
includes="**/Person.class">
- </jar>
+ </jar>
<jar destfile="${assemble.dir}/lib/${appname}-par1.jar">
<metainf file="descriptor/persistence.xml"/>
</jar>
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class"/>
</antcall>
<jar destfile="${assemble.dir}/${appname}App.ear" update="yes"
@@ -110,9 +110,9 @@
includes="lib/${appname}-lib.jar, lib/${appname}-par1.jar">
</jar>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -121,10 +121,10 @@
<antcall target="runclient-common"/>
<!-- <antcall target="runclient-standalone"/>-->
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
index d494fdc..940b19b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
@@ -65,7 +65,7 @@
PreparedStatement s = null;
try {
System.err.println("I am in client");
-
+
UserTransaction utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
ds = (DataSource)(new javax.naming.InitialContext()).lookup("java:app/jdbc/xa");
@@ -79,7 +79,7 @@
utx.begin();
System.err.println("utx.begin called ");
-
+
connection = ds.getConnection();
s = connection.prepareStatement("insert into EJB30_PERSISTENCE_EEM_INJECTION_PERSON values('1', '1')");
s.execute();
@@ -95,7 +95,7 @@
utx.rollback();
System.err.println("utx.rollback called ");
}
-
+
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String testName = iter.next();
@@ -126,7 +126,7 @@
}
- return;
+ return;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java
index 14358ff..952cbec 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java
@@ -45,7 +45,7 @@
this.data = data;
}
- @Override
+ @Override
public String toString() {
return "Person: (name=" + name + "; data= " + data + ")";
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
index a8b68a3..b415c3f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
@@ -45,25 +45,25 @@
)
@Stateful
-@EJB(name="ejb/SfulBean",
+@EJB(name="ejb/SfulBean",
beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.SfulDelegate.class)
public class SfulBean
implements Sful {
private String name;
-
+
private @EJB SfulDelegate delegate;
-
+
private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-tx_propagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
+ type=PersistenceContextType.EXTENDED)
EntityManager extendedEM;
-
+
public void setName(String name) {
this.name = name;
try {
String lookupName = "java:comp/env/ejb/SfulBean";
-
+
InitialContext initCtx = new InitialContext();
delegate = (SfulDelegate) initCtx.lookup(lookupName);
} catch (Exception ex) {
@@ -73,7 +73,7 @@
public Map<String, Boolean> doTests() {
Person person = new Person(name);
-
+
String delegateName = "delgname_" + name;
String delegateData= "delgdata: " + name;
delegate.create(delegateName, delegateData);
@@ -82,8 +82,8 @@
extendedEM.persist(person);
Person foundPerson = delegate.find(name);
-
-
+
+
Map<String, Boolean> map = new HashMap<String, Boolean>();
map.put("findDelegateCreatedPerson", (dPerson != null));
map.put("delegateFoundMe", (foundPerson != null));
@@ -111,5 +111,5 @@
}
return removed;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
index 62d2097..337a43f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
@@ -28,7 +28,7 @@
Person find(String name);
boolean remove(String name);
-
+
EntityManager getEM();
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
index 8a96e20..f7a7aad 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
@@ -37,12 +37,12 @@
public EntityManager getEM() {
return extendedEM;
}
-
+
public Person create(String name, String data) {
Person p = new Person(name);
p.setData(data);
-
+
extendedEM.persist(p);
return p;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/create.sql b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/create.sql
index fa60742..c0ab43f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/create.sql
@@ -1,4 +1,4 @@
-CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
- NAME VARCHAR(256) NOT NULL PRIMARY KEY,
- DATA VARCHAR(256)
-);
+CREATE TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON (
+ NAME VARCHAR(256) NOT NULL PRIMARY KEY,
+ DATA VARCHAR(256)
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/drop.sql b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/drop.sql
index 5eb136f..d012c69 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/drop.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/sql/drop.sql
@@ -1 +1 @@
-DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
+DROP TABLE EJB30_PERSISTENCE_EEM_INJECTION_PERSON;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.properties
index f4ebfb9..f5b4c0b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-lazyassoc"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.xml
index 16c3abc..b311459 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,20 +48,20 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
-
+
<antcall target="deploy-jdbc-common"/>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.lazy-connection-enlistment=true"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.lazy-connection-enlistment=true"/>
</antcall>
<antcall target="asadmin-common">
@@ -71,24 +71,24 @@
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
<antcall target="undeploy-jdbc-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/client/Client.java
index 6c737a4..03bd7f1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/client/Client.java
@@ -25,27 +25,27 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "LazyAssoc ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "LazyAssoc ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
- stat.addDescription("Running lazyassoc testSuite1 ");
+ stat.addDescription("Running lazyassoc testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
-
+
boolean passed = true;
for( int i = 0; i < 50;i++ ) {
try {
if ( simpleSession.test1() == false ) {
passed = false;
break;
- }
+ }
} catch( Exception e ) {
passed = false;
break;
@@ -63,7 +63,7 @@
if ( simpleSession.test2() == false ) {
passed = false;
break;
- }
+ }
} catch( Exception e ) {
passed = false;
break;
@@ -74,6 +74,6 @@
} else {
stat.addStatus( testSuite + " test2 : ", stat.FAIL );
}
- stat.printSummary();
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/descriptor/ejb-jar.xml
index a0fb740..808d3a9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/descriptor/ejb-jar.xml
@@ -52,6 +52,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
index 58ac355..cc054b1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
@@ -27,54 +27,54 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
private DataSource ds;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
}
public boolean test1() throws Exception {
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return false;
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
}
-
- return true;
+
+ return true;
}
public boolean test2() throws Exception {
- Connection conn1 = null;
+ Connection conn1 = null;
Statement stmt = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
stmt = conn1.createStatement();
stmt.executeQuery( "SELECT * FROM TXLEVELSWITCH");
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
if (stmt != null ) {
try { stmt.close(); }catch( Exception e ) {}
}
}
-
- return true;
+
+ return true;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/create_pointbase.sql
index b227cac..42d5a16 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
-INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
+INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/build.properties
index d26b1b4..8892c44 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-markconnectionasbad.local"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
index 5f72871..274cf1f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
@@ -29,6 +29,6 @@
public boolean test3() throws RemoteException;
public boolean test4() throws RemoteException;
-
+
public boolean test5(int count, boolean expectSuccess) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
index 8619ce3..ceb7e45 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
@@ -207,7 +207,7 @@
Statement stmt = conns[i].createStatement();
stmt.executeUpdate("insert into o_customer values (" + i + ",'a')");
}
- } catch (Exception e) {
+ } catch (Exception e) {
if(expectSuccess){
passed = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/build.properties
index af24daf..20bc85d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-markconnectionasbad.xa"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/client/Client.java
index 5ddf549..8be8a2e 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/client/Client.java
@@ -117,14 +117,14 @@
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Write] : ", stat.FAIL);
}
- if (simpleBMP.test11() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 15 &&
+ if (simpleBMP.test11() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 15 &&
getMonitorablePropertyOfConnectionPool("jdbc-local-pool") == 3) {
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Read] : ", stat.PASS);
} else {
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Read-Read] : ", stat.FAIL);
}
- if (simpleBMP.test12() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 16 &&
+ if (simpleBMP.test12() && getMonitorablePropertyOfConnectionPool("jdbc-shareable-pool") == 16 &&
getMonitorablePropertyOfConnectionPool("jdbc-local-pool") == 4) {
stat.addStatus(" Mark-Connection-As-Bad [Local-XA -Shareable-Shareable - Write-Read] : ", stat.PASS);
} else {
@@ -139,18 +139,18 @@
public int getMonitorablePropertyOfConnectionPool(String poolName) throws Exception {
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
new ObjectName("amx:pp=/mon/server-mon[server],type=jdbc-connection-pool-mon,name=resources/" + poolName);
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, NUM_CON_DESTROYED_COUNT);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, NUM_CON_DESTROYED_COUNT);
return new Integer(returnValue.get("count").toString());
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/create_pointbase.sql
index 46be39f..6d9a7c4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (id integer , description char(50));
-
-drop table owner;
-
-create table owner ( id integer, description char(50));
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (id integer , description char(50));
+
+drop table owner;
+
+create table owner ( id integer, description char(50));
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/drop_pointbase.sql
index a5ea2f8..d87d5de 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table O_Customer;
-drop table owner;
+Drop table O_Customer;
+drop table owner;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/build.properties
index b3df7fd..dda80dc 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-maxconnectionusage"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/client/Client.java
index f85bb19..b626af4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/client/Client.java
@@ -67,7 +67,7 @@
//Commented as this test is not valid.
//physical connection (ds.getConnection(conn)) will be different each time.
-
+
/*useXA = true;
status = connectionSharingTest(simpleBMP, useXA, 12221);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/create_pointbase.sql
index 51b0735..396c566 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table max_connection_usage;
-
-CREATE TABLE max_connection_usage (
- id integer not null,
- value char(16)
-);
-
+Drop table max_connection_usage;
+
+CREATE TABLE max_connection_usage (
+ id integer not null,
+ value char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/drop_pointbase.sql
index 4e577a3..b3c8b97 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table max_connection_usage;
+Drop table max_connection_usage;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/build.properties
index 6bae31b..f0c28bd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-multiplecloseconnection"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/create_pointbase.sql
index b227cac..42d5a16 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
-INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
+INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/build.properties
index fc48ac9..16136dc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-multipleusercredentials"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/sql/create_pointbase.sql
index 87073ca..a71dd8a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
-CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
- 'derby.user.derby',
- 'derby') ;
-
-CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
- 'derby.user.javadb',
- 'javadb') ;
-
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+ 'derby.user.derby',
+ 'derby') ;
+
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+ 'derby.user.javadb',
+ 'javadb') ;
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nonacc/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/nonacc/build.xml
index 523477d..1a40e07 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nonacc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nonacc/build.xml
@@ -24,7 +24,7 @@
]>
<project name="nonacc" basedir="." default="usage">
-
+
&commonSetup;
&commonBuild;
&testProperties;
@@ -60,24 +60,24 @@
<antcall target="setup-sql"/>
<java classname="com.sun.s1asdev.jdbc.nonacc.SimpleJdbcClient" fork="true">
<arg value="jdbc/nonacc"/>
-
+
<sysproperty key="org.omg.CORBA.ORBInitialHost" value="localhost"/>
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="3700"/>
-
+
<classpath>
<pathelement location="${build.classes.dir}"/>
<!-- <pathelement path="${s1astest.classpath}"/>-->
-<!-- <pathelement location="${env.S1AS_HOME}/lib/install/applications/jmsra/imqjmsra.jar"/>-->
- <pathelement location="${env.S1AS_HOME}/lib/gf-client.jar"/>
+<!-- <pathelement location="${env.S1AS_HOME}/lib/install/applications/jmsra/imqjmsra.jar"/>-->
+ <pathelement location="${env.S1AS_HOME}/lib/gf-client.jar"/>
<pathelement location="${assemble.dir}"/>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
</classpath>
</java>
</target>
-
+
<target name="usage">
</target>
-
+
<target name="setup-sql" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create.sql"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nonacc/client/SimpleJdbcClient.java b/appserver/tests/appserv-tests/devtests/jdbc/nonacc/client/SimpleJdbcClient.java
index 08f5be0..aaa8045 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nonacc/client/SimpleJdbcClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nonacc/client/SimpleJdbcClient.java
@@ -23,7 +23,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class SimpleJdbcClient {
-
+
public static void main( String argv[] ) throws Exception {
String testSuite = "NonACC ";
SimpleReporterAdapter stat = new SimpleReporterAdapter();
@@ -39,7 +39,7 @@
stmt = con.createStatement();
stmt.executeQuery("SELECT * FROM NONACC");
- stat.addStatus(testSuite + "test1 ", stat.PASS );
+ stat.addStatus(testSuite + "test1 ", stat.PASS );
} catch( Exception e) {
e.printStackTrace();
stat.addStatus(testSuite + "test1 ", stat.FAIL );
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nonacc/sql/create.sql b/appserver/tests/appserv-tests/devtests/jdbc/nonacc/sql/create.sql
index 97d4721..5c33862 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nonacc/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nonacc/sql/create.sql
@@ -1,5 +1,5 @@
DROP TABLE NONACC;
CREATE TABLE NONACC(
- name char(20),
+ name char(20),
num integer
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.properties
index 1bb00f5..f489b97 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-nopasswdfordb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.xml
index 85fa2db..76f5add 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,47 +48,47 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
-
+
<!-- set up non xa pools -->
<antcall target="deploy-jdbc-common"/>
-
+
<antcall target="create-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB1"/>
</antcall>
-
+
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-pool"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-nopasswdfordb-pool.property.Password="/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-nopasswdfordb-pool.property.Password="/>
</antcall>
<antcall target="create-jdbc-resource-common">
- <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-pool"/>
+ <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-pool"/>
<param name="jdbc.resource.name" value="jdbc/s1qeDB2"/>
</antcall>
-
+
<!-- Set up XA pools -->
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-1"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
</antcall>
-
+
<antcall target="create-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB-xa"/>
<param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-1"/>
</antcall>
-
+
<antcall target="create-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB1-xa"/>
<param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-1"/>
@@ -96,30 +96,30 @@
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-2"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
</antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-nopasswdfordb-xa-pool-2.property.Password="/>
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-nopasswdfordb-xa-pool-2.property.Password="/>
</antcall>
<antcall target="create-jdbc-resource-common">
- <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-2"/>
+ <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-2"/>
<param name="jdbc.resource.name" value="jdbc/s1qeDB2-xa"/>
</antcall>
-
+
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -128,27 +128,27 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB1"/>
</antcall>
-
+
<antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-pool"/>
+ <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-pool"/>
<param name="jdbc.resource.name" value="jdbc/s1qeDB2"/>
</antcall>
-
+
<antcall target="undeploy-jdbc-common"/>
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB1-xa"/>
</antcall>
<antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-1"/>
+ <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-1"/>
<param name="jdbc.resource.name" value="jdbc/s1qeDB-xa"/>
</antcall>
<antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-2"/>
+ <param name="jdbc.conpool.name" value="jdbc-nopasswdfordb-xa-pool-2"/>
<param name="jdbc.resource.name" value="jdbc/s1qeDB2-xa"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/client/Client.java
index 9a00929..43eb9ba 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/client/Client.java
@@ -25,58 +25,58 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "NoPasswordforDB ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "NoPasswordforDB ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
System.out.println(" Will fail till Derby gets a better XA driver");
- stat.addDescription("No Password for DB tests");
+ stat.addDescription("No Password for DB tests");
SimpleSession simpleSession = simpleSessionHome.create();
-
- if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
+
+ if (simpleSession.test1() ) {
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
if (simpleSession.test2() ) {
- stat.addStatus( testSuite + " test2 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test2 : " , stat.FAIL );
- }
-
- if (simpleSession.test3() ) {
- stat.addStatus( testSuite + " test3 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test3 : " , stat.FAIL );
- }
+ stat.addStatus( testSuite + " test2 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test2 : " , stat.FAIL );
+ }
- if (simpleSession.test4() ) {
- stat.addStatus( testSuite + " test4 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test4 : " , stat.FAIL );
- }
+ if (simpleSession.test3() ) {
+ stat.addStatus( testSuite + " test3 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test3 : " , stat.FAIL );
+ }
+
+ if (simpleSession.test4() ) {
+ stat.addStatus( testSuite + " test4 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test4 : " , stat.FAIL );
+ }
if (simpleSession.test5() ) {
- stat.addStatus( testSuite + " test5 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test5 : " , stat.FAIL );
- }
-
- if (simpleSession.test6() ) {
- stat.addStatus( testSuite + " test6 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test6 : " , stat.FAIL );
- }
+ stat.addStatus( testSuite + " test5 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test5 : " , stat.FAIL );
+ }
-
- stat.printSummary();
+ if (simpleSession.test6() ) {
+ stat.addStatus( testSuite + " test6 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test6 : " , stat.FAIL );
+ }
+
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/ejb-jar.xml
index 476881e..9ef4ded 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/ejb-jar.xml
@@ -82,6 +82,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/sun-ejb-jar.xml
index 50cf396..1a8eea4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/descriptor/sun-ejb-jar.xml
@@ -28,48 +28,48 @@
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<jndi-name>jdbc/s1qeDB</jndi-name>
- <default-resource-principal>
- <name>DBUSER</name>
- <password></password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>DBUSER</name>
+ <password></password>
+ </default-resource-principal>
</resource-ref>
<resource-ref>
<res-ref-name>DataSource1</res-ref-name>
<jndi-name>jdbc/s1qeDB1</jndi-name>
- <default-resource-principal>
- <name>DBUSER</name>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>DBUSER</name>
+ </default-resource-principal>
</resource-ref>
<resource-ref>
<res-ref-name>DataSource2</res-ref-name>
<jndi-name>jdbc/s1qeDB2</jndi-name>
- <default-resource-principal>
- <name>DBUSER</name>
- <password>DBPASSWORD</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>DBUSER</name>
+ <password>DBPASSWORD</password>
+ </default-resource-principal>
</resource-ref>
<resource-ref>
<res-ref-name>XADataSource</res-ref-name>
<jndi-name>jdbc/s1qeDB-xa</jndi-name>
- <default-resource-principal>
- <name>DBUSER</name>
- <password></password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>DBUSER</name>
+ <password></password>
+ </default-resource-principal>
</resource-ref>
<resource-ref>
<res-ref-name>XADataSource1</res-ref-name>
<jndi-name>jdbc/s1qeDB1-xa</jndi-name>
- <default-resource-principal>
- <name>DBUSER</name>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>DBUSER</name>
+ </default-resource-principal>
</resource-ref>
<resource-ref>
<res-ref-name>XADataSource2</res-ref-name>
<jndi-name>jdbc/s1qeDB2-xa</jndi-name>
- <default-resource-principal>
- <name>DBUSER</name>
- <password>DBPASSWORD</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>DBUSER</name>
+ <password>DBPASSWORD</password>
+ </default-resource-principal>
</resource-ref>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
index c73367e..57bcdf5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
@@ -27,14 +27,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -49,61 +49,61 @@
* <password></password>
* </default-resource-principal>
* </resource-ref>
- *
+ *
* Note that the pool still has a valid password set in it
*/
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
+ return false;
}
/**
- * Lookup a datasource without resource-ref specifying
+ * Lookup a datasource without resource-ref specifying
* password in default-resource-principal
* <resource-ref>
* <default-resource-principal>
* <name>DBUSER</name>
* </default-resource-principal>
* </resource-ref>
- *
+ *
* Note that the pool still has a valid password set in it
*/
public boolean test2() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource1");
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource1");
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
+ return false;
}
/**
- * Lookup a datasource with resource-ref specifying
+ * Lookup a datasource with resource-ref specifying
* password in default-resource-principal but no password
* in the pool
* <resource-ref>
@@ -112,27 +112,27 @@
* <password>DBPASSWORD</password>
* </default-resource-principal>
* </resource-ref>
- *
+ *
* Note that the pool has no password set in it
*/
public boolean test3() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return true;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
+ return true;
}
/**
@@ -144,61 +144,61 @@
* <password></password>
* </default-resource-principal>
* </resource-ref>
- *
+ *
* Note that the pool still has a valid password set in it
*/
public boolean test4() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/XADataSource");
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/XADataSource");
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
+ return false;
}
/**
- * Lookup a datasource without resource-ref specifying
+ * Lookup a datasource without resource-ref specifying
* password in default-resource-principal
* <resource-ref>
* <default-resource-principal>
* <name>DBUSER</name>
* </default-resource-principal>
* </resource-ref>
- *
+ *
* Note that the pool still has a valid password set in it
*/
public boolean test5() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/XADataSource1");
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/XADataSource1");
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
+ return false;
}
/**
- * Lookup a datasource with resource-ref specifying
+ * Lookup a datasource with resource-ref specifying
* password in default-resource-principal but no password
* in the pool
* <resource-ref>
@@ -207,27 +207,27 @@
* <password>DBPASSWORD</password>
* </default-resource-principal>
* </resource-ref>
- *
+ *
* Note that the pool has no password set in it
*/
public boolean test6() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/XADataSource2");
- Connection conn1 = null;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return true;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/XADataSource2");
+ Connection conn1 = null;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
+ return true;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/create_pointbase.sql
index b227cac..42d5a16 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
-INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
+INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/build.xml
index cef436d..c12fa40 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/build.xml
@@ -32,8 +32,8 @@
<fileset dir="." includes="*.output"/>
</delete>
<record name="notxconn.output" action="start" />
- <ant dir="test1" target="all"/>
- <ant dir="test2" target="all"/>
+ <ant dir="test1" target="all"/>
+ <ant dir="test2" target="all"/>
<record name="notxconn.output" action="stop" />
</target>
@@ -49,9 +49,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the reconfig tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the reconfig tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.properties
index 9aa1445..24d0793 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-notxconn"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.xml
index c46e388..6efee12 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
-
+
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,26 +51,26 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-oracle-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -78,7 +78,7 @@
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/ejb-jar.xml
index b891642..c99937b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/ejb-jar.xml
@@ -49,6 +49,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/sun-ejb-jar.xml
index 54c6784..0621cfb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/descriptor/sun-ejb-jar.xml
@@ -28,10 +28,10 @@
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<jndi-name>jdbc/oracleres</jndi-name>
- <default-resource-principal>
- <name>scott</name>
- <password>tiger</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>scott</name>
+ <password>tiger</password>
+ </default-resource-principal>
</resource-ref>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
index 6d6a7d1..accbdc1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
@@ -56,27 +56,27 @@
ds = (com.sun.appserv.jdbc.DataSource) ic_.lookup("java:comp/env/DataSource");
UserTransaction tx =(UserTransaction)ctxt_.getUserTransaction();
- tx.begin();
+ tx.begin();
conn = ds.getConnection();
- noTxConn = ds.getNonTxConnection();
+ noTxConn = ds.getNonTxConnection();
stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
+ stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
String query1 = "SELECT * FROM NOTXCONNTABLE";
rs = stmt.executeQuery(query1);
- stmt2 = noTxConn.createStatement();
+ stmt2 = noTxConn.createStatement();
rs2 = stmt2.executeQuery("SELECT * FROM NOTXCONNTABLE");
-
+
if ( rs2.next() ) {
- return false;
- }
-
- tx.commit();
- return true;
-
+ return false;
+ }
+
+ tx.commit();
+ return true;
+
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -87,72 +87,72 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
-
+
if (rs2 != null ) {
try {rs2.close();} catch( Exception e1 ) {}
}
if (stmt2 != null ) {
try {stmt2.close(); } catch( Exception e1) {}
}
-
+
if (noTxConn != null ) {
try { noTxConn.close(); }catch( Exception e1) {}
}
- }
+ }
-
+
}
public boolean test2() throws Exception {
- Connection conn = null;
- Connection noTxConn = null;
+ Connection conn = null;
+ Connection noTxConn = null;
try {
ds = (com.sun.appserv.jdbc.DataSource)ic_.lookup("java:comp/env/DataSource");
UserTransaction tx =(UserTransaction)ctxt_.getUserTransaction();
- tx.begin();
+ tx.begin();
System.out.println("Getting TRANSACTIONAL connection");
conn = ds.getConnection();
System.out.println("Autocommit => " + conn.getAutoCommit());
- if (conn.getAutoCommit() == true ) {
- return false;
- }
+ if (conn.getAutoCommit() == true ) {
+ return false;
+ }
- conn.close();
- for (int i = 0; i < 20; i++ ) {
- System.out.println("Getting NonTx connection");
- noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
- System.out.println("Autocommit => " + noTxConn.getAutoCommit());
- if (noTxConn.getAutoCommit() == false ) {
- return false;
- }
- noTxConn.close();
- }
+ conn.close();
+ for (int i = 0; i < 20; i++ ) {
+ System.out.println("Getting NonTx connection");
+ noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
+ System.out.println("Autocommit => " + noTxConn.getAutoCommit());
+ if (noTxConn.getAutoCommit() == false ) {
+ return false;
+ }
+ noTxConn.close();
+ }
System.out.println("Getting TRANSACTIONAL connection");
conn = ds.getConnection();
System.out.println("Autocommit => " + conn.getAutoCommit());
- if (conn.getAutoCommit() == true ) {
- return false;
- }
- conn.close();
- tx.commit();
+ if (conn.getAutoCommit() == true ) {
+ return false;
+ }
+ conn.close();
+ tx.commit();
- return true;
-
+ return true;
+
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
- try {
- if (noTxConn != null ) {
- noTxConn.close();
- }
- } catch( Exception e1 ) {}
- }
+ try {
+ if (noTxConn != null ) {
+ noTxConn.close();
+ }
+ } catch( Exception e1 ) {}
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/create_pointbase.sql
index 00eb96c..2d3d1a2 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
-DROP TABLE NOTXCONNTABLE;
-CREATE TABLE NOTXCONNTABLE(
- name char(20),
- num integer
-);
+DROP TABLE NOTXCONNTABLE;
+CREATE TABLE NOTXCONNTABLE(
+ name char(20),
+ num integer
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/drop_pointbase.sql
index 03490d0..762a0f6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table NOTXCONNTABLE;
+Drop table NOTXCONNTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.properties
index 9aa1445..24d0793 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-notxconn"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.xml
index c46e388..6efee12 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
-
+
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,26 +51,26 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-oracle-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -78,7 +78,7 @@
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/descriptor/ejb-jar.xml
index 7d709cd..372a4ca 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/descriptor/ejb-jar.xml
@@ -49,6 +49,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>-->
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
index 61c3b0f..2d2982b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
@@ -56,28 +56,28 @@
ds = (com.sun.appserv.jdbc.DataSource) ic_.lookup("java:comp/env/DataSource");
UserTransaction tx =(UserTransaction)ctxt_.getUserTransaction();
- tx.begin();
+ tx.begin();
conn = ds.getConnection("scott", "tiger");
stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
+ stmt.executeUpdate("INSERT INTO NOTXCONNTABLE VALUES('method1',3)");
String query1 = "SELECT * FROM NOTXCONNTABLE";
rs = stmt.executeQuery(query1);
- noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection("scott", "tiger");
+ noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection("scott", "tiger");
- stmt2 = noTxConn.createStatement();
+ stmt2 = noTxConn.createStatement();
rs2 = stmt2.executeQuery("SELECT * FROM NOTXCONNTABLE");
- tx.commit();
+ tx.commit();
if ( rs2.next() ) {
- return false;
- }
-
-
- return true;
-
+ return false;
+ }
+
+
+ return true;
+
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -88,20 +88,20 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
-
+
if (rs2 != null ) {
try {rs2.close();} catch( Exception e1 ) {}
}
if (stmt2 != null ) {
try {stmt2.close(); } catch( Exception e1) {}
}
-
+
if (noTxConn != null ) {
try { noTxConn.close(); }catch( Exception e1) {}
}
- }
+ }
-
+
}
public void ejbLoad() {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/create_pointbase.sql
index 00eb96c..2d3d1a2 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
-DROP TABLE NOTXCONNTABLE;
-CREATE TABLE NOTXCONNTABLE(
- name char(20),
- num integer
-);
+DROP TABLE NOTXCONNTABLE;
+CREATE TABLE NOTXCONNTABLE(
+ name char(20),
+ num integer
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/drop_pointbase.sql
index 03490d0..762a0f6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table NOTXCONNTABLE;
+Drop table NOTXCONNTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.properties
index 40056f6..8b80794 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-notxops"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.xml
index f549f0e..33992f4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,44 +48,44 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-notxops-pool"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-notxops-pool.steady_pool_size=1"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-notxops-pool.steady_pool_size=1"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-notxops-pool.max_pool_size=1"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-notxops-pool.max_pool_size=1"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-notxops-pool"/>
- <param name="jdbc.resource.name" value="jdbc/notxops"/>
+ <param name="jdbc.resource.name" value="jdbc/notxops"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -94,13 +94,13 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/notxops"/>
</antcall>
-
+
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-notxops-pool"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/client/Client.java
index 39861c5..dacbfa0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/client/Client.java
@@ -25,28 +25,28 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "NoTxOps ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "NoTxOps ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
+
System.out.println(" Will fail till a better XA driver is integrated with Derby");
- stat.addDescription("Running notxops testSuite1 ");
+ stat.addDescription("Running notxops testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
-
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
+
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/notxops/descriptor/ejb-jar.xml
index f207a82..e419afd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/descriptor/ejb-jar.xml
@@ -62,12 +62,12 @@
<container-transaction>
<method>
<ejb-name>SimpleSessionEJB</ejb-name>
- <method-name>updateDb</method-name>
+ <method-name>updateDb</method-name>
</method>
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
-->
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
index d23d6f5..71db479 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
@@ -28,14 +28,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -47,55 +47,55 @@
* did not happen
*/
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery( "SELECT * FROM NOTXOPS");
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
-
- //Now try getting a connection again, but within a transaction
- UserTransaction tx = (UserTransaction) ic_.lookup("java:comp/UserTransaction");
- try {
- tx.begin();
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- rs1 = stmt1.executeQuery("SELECT * FROM NOTXOPS");
- tx.commit();
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- }
-
- return true;
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery( "SELECT * FROM NOTXOPS");
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+
+
+ //Now try getting a connection again, but within a transaction
+ UserTransaction tx = (UserTransaction) ic_.lookup("java:comp/UserTransaction");
+ try {
+ tx.begin();
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ rs1 = stmt1.executeQuery("SELECT * FROM NOTXOPS");
+ tx.commit();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return true;
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/create_pointbase.sql
index b1f0337..5d88dff 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table NOTXOPS;
-
-CREATE TABLE NOTXOPS (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO NOTXOPS VALUES(1, 'wxyz');
-INSERT INTO NOTXOPS VALUES(2, 'pqrs');
+Drop table NOTXOPS;
+
+CREATE TABLE NOTXOPS (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO NOTXOPS VALUES(1, 'wxyz');
+INSERT INTO NOTXOPS VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/drop_pointbase.sql
index 223fa1d..762c010 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table NOTXOPS;
-Drop table NOTXOPS;
+Drop table NOTXOPS;
+Drop table NOTXOPS;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.properties
index 85ad1ee..4062f5a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-onlygetconnection"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="2000"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.xml
index 9daedc7..1f779f1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
-
+
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -66,28 +66,28 @@
<!--
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-pointbase-pool.property.associatewiththread=true"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-pointbase-pool.property.associatewiththread=true"/>
</antcall>
-->
</target>
-
-
+
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
</target>
-
-
+
+
<target name="run">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create.sql"/>
- </antcall>
+ </antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/client/Client.java
index 24a1084..ce1ce31 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private SimpleReporterAdapter stat = new SimpleReporterAdapter();
private String testSuite = "jdbc-onlygetconnection ";
private NoTxConnTest bean;
@@ -33,22 +33,22 @@
public static void main(String[] args)
throws Exception {
-// SimpleReporterAdapter stat = new SimpleReporterAdapter();
+// SimpleReporterAdapter stat = new SimpleReporterAdapter();
//
// InitialContext ic = new InitialContext();
// Object objRef = ic.lookup("java:comp/env/ejb/NoTxConnTestEJB");
-// NoTxConnTestHome home = (NoTxConnTestHome)
+// NoTxConnTestHome home = (NoTxConnTestHome)
// javax.rmi.PortableRemoteObject.narrow(objRef, NoTxConnTestHome.class);
//
// NoTxConnTest bean = home.create();
// if ( bean.test1() ) {
-// stat.addStatus(testSuite+" test1 : ", stat.PASS);
-// } else {
-// stat.addStatus(testSuite+" test1 : ", stat.FAIL);
-// }
-// stat.printSummary();
-
+// stat.addStatus(testSuite+" test1 : ", stat.PASS);
+// } else {
+// stat.addStatus(testSuite+" test1 : ", stat.FAIL);
+// }
+// stat.printSummary();
+
if ( args.length == 0 ) {
(new Client()).runSingleThreaded();
} else {
@@ -60,35 +60,35 @@
(new Client()).runMultiThreaded( numRuns );
}
}
-
+
}
public Client() throws Exception {
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/NoTxConnTestEJB");
- NoTxConnTestHome home = (NoTxConnTestHome)
+ NoTxConnTestHome home = (NoTxConnTestHome)
javax.rmi.PortableRemoteObject.narrow(objRef, NoTxConnTestHome.class);
bean = home.create();
}
-
+
public void runSingleThreaded() throws Exception {
if ( bean.test1() ) {
- stat.addStatus(testSuite+" test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" test1 : ", stat.FAIL);
- }
- stat.printSummary();
-
+ stat.addStatus(testSuite+" test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" test1 : ", stat.FAIL);
+ }
+ stat.printSummary();
+
}
-
+
public void runMultiThreaded( int numThreads ) throws Exception {
MTClient[] mtc = new MTClient[ numThreads ];
boolean result = true;
int failCount = 0;
- for ( int i = 0; i < numThreads; i++) {
+ for ( int i = 0; i < numThreads; i++) {
mtc[i] = new MTClient( i );
mtc[i].start();
}
@@ -97,15 +97,15 @@
for ( int i = 0; i < numThreads; i++ ) {
mtc[i].join();
}
-
+
for ( int i = 0; i < numThreads; i++ ) {
result &= mtc[i].result;
if ( !mtc[i].result ) {
failCount++;
}
-
+
}
-
+
System.out.println("Total Threads: " + numThreads );
System.out.println("Total Passed : " + (numThreads - failCount ) );
System.out.println("Total Failed : " + failCount );
@@ -115,7 +115,7 @@
} else {
stat.addStatus( testSuite + " multithreaded-test : " , stat.FAIL );
}
-
+
stat.printSummary();
}
@@ -126,7 +126,7 @@
MTClient( int id ) {
id_ = id;
}
-
+
public void run() {
try {
result = bean.test1();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/descriptor/sun-ejb-jar.xml
index 460f67d..cea59ee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/descriptor/sun-ejb-jar.xml
@@ -25,11 +25,11 @@
<resource-ref>
<res-ref-name>jdbc/onlygetconnection</res-ref-name>
<jndi-name>jdbc/s1qeDB</jndi-name>
- <default-resource-principal>
- <name>dbuser</name>
- <password>dbpassword</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>dbuser</name>
+ <password>dbpassword</password>
+ </default-resource-principal>
</resource-ref>
- </ejb>
+ </ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
index a5b7c20..0eefa7e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
@@ -30,7 +30,7 @@
private EJBContext ejbcontext;
private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
-
+
public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
@@ -45,13 +45,13 @@
public void ejbPassivate() {}
public boolean test1() {
- Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Connection conn = null;
+ Statement stmt = null;
+ ResultSet rs = null;
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
try {
@@ -61,25 +61,25 @@
stmt = conn.createStatement();
String query1 = "SELECT * FROM ONLYGETCONNECTION";
rs = stmt.executeQuery(query1);
-
+
/*
rs.close();
- stmt.close();
- conn.close();
- conn1 = ds.getConnection();
+ stmt.close();
+ conn.close();
+ conn1 = ds.getConnection();
stmt1 = conn1.createStatement();
rs1 = stmt1.executeQuery(query1);
rs1.close();
- stmt1.close();
- conn1.close();
+ stmt1.close();
+ conn1.close();
*/
- return true;
+ return true;
} catch (Exception e) {
- System.out.println("Caught Exception---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -90,8 +90,8 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
-
- }
+
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/sql/create.sql b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/sql/create.sql
index c58a6e3..ae9f569 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/sql/create.sql
@@ -1,5 +1,5 @@
DROP TABLE ONLYGETCONNECTION;
CREATE TABLE ONLYGETCONNECTION(
- name char(20),
+ name char(20),
num integer
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/test-validation-reconfig.sh b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/test-validation-reconfig.sh
index 06bdfd3..5856d07 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/test-validation-reconfig.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/test-validation-reconfig.sh
@@ -18,10 +18,10 @@
echo "S1AS_HOME is => " $S1AS_HOME
echo " APS_HOME is =? " $APS_HOME
-$S1AS_HOME/lib/ant/bin/ant run
+$S1AS_HOME/lib/ant/bin/ant run
cd $APS_HOME
-gmake stopPB
-gmake startPB
-cd -
-#$S1AS_HOME/bin/asadmin set domain.resources.jdbc-connection-pool.jdbc-pointbase-pool.is_connection_validation_required=true
+gmake stopPB
+gmake startPB
+cd -
+#$S1AS_HOME/bin/asadmin set domain.resources.jdbc-connection-pool.jdbc-pointbase-pool.is_connection_validation_required=true
$S1AS_HOME/lib/ant/bin/ant run
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.properties
index c5c6ac1..065ed88 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.properties
@@ -15,16 +15,16 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc"/>
-<property name="appname" value="${module}-onlygetconnection-servlet"/>
+<property name="appname" value="${module}-onlygetconnection-servlet"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="app.type" value="application"/>
+<property name="app.type" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="onlygetconnectionservlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.xml
index a76a572..e66c28f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,13 +48,13 @@
<property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/servlet/*.class"/>
+ <param name="webclient.war.classes" value="**/servlet/*.class"/>
</antcall>
<antcall target="appclient-jar-common"/>
<antcall target="ear-common"/>
-
- </target>
-
+
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-common">
<param name="jdbc.resource.name" value="jdbc/onlygetconnectionservlet"/>
@@ -62,15 +62,15 @@
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-onlygetconnectionservlet-pool.property.associatewiththread=true"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-onlygetconnectionservlet-pool.property.associatewiththread=true"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create.sql"/>
- </antcall>
+ </antcall>
<java classname="com.sun.s1asdev.jdbc.onlygetconnectionservlet.client.Client">
<classpath>
@@ -78,17 +78,17 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop.sql"/>
- </antcall>
+ </antcall>
<antcall target="undeploy-jdbc-common">
<param name="jdbc.resource.name" value="jdbc/onlygetconnectionservlet"/>
<param name="jdbc.connpool.name" value="jdbc-onlygetconnectionservlet-pool"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/client/Client.java
index 35d56bd..8151364 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/client/Client.java
@@ -29,19 +29,19 @@
public static void main(String[] args)
throws Exception {
-
- //SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "jdbc-onlygetconnection ";
-
+
+ //SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "jdbc-onlygetconnection ";
+
HttpURLConnection conn =(HttpURLConnection) new URL("http://localhost:8080/" +
"onlygetconnectionservlet/onlygetconnectionservlet").openConnection();
/*
- InputStream sis = conn.getInputStream();
+ InputStream sis = conn.getInputStream();
BufferedReader in = new BufferedReader( new InputStreamReader(sis) );
System.out.println( conn.getResponseMessage() );
String op = null;
- System.out.println(" Reading response");
+ System.out.println(" Reading response");
while( (op = in.readLine()) != null ) {
System.out.println(op);
}
@@ -49,17 +49,17 @@
Client c = new Client();
c.multiThreadedTest( 40 );
-
+
/*
if ( bean.test1() ) {
- stat.addStatus(testSuite+" test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" test1 : ", stat.FAIL);
- }
-
- stat.printSummary();
+ stat.addStatus(testSuite+" test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" test1 : ", stat.FAIL);
+ }
+
+ stat.printSummary();
*/
-
+
}
public void multiThreadedTest( int numThreads ) throws Exception {
@@ -72,11 +72,11 @@
conn =(HttpURLConnection) new URL("http://localhost:8080/" +
"onlygetconnectionservlet/onlygetconnectionservlet").openConnection();
- InputStream sis = conn.getInputStream();
+ InputStream sis = conn.getInputStream();
BufferedReader in = new BufferedReader( new InputStreamReader(sis) );
System.out.println( conn.getResponseMessage() );
String op = null;
- System.out.println(" Reading response");
+ System.out.println(" Reading response");
while( (op = in.readLine()) != null ) {
//System.out.println(op);
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
index 5fc92d9..02fa081 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/servlet/OnlyGetConnectionServlet.java
@@ -26,9 +26,9 @@
/**
* Collection of getConnection tests using a servlet
- *
+ *
* @author aditya.gore@sun.com
- */
+ */
public class OnlyGetConnectionServlet extends HttpServlet {
@@ -36,10 +36,10 @@
private PrintWriter out;
private UserTransaction utx;
- public void doGet( HttpServletRequest req, HttpServletResponse resp )
+ public void doGet( HttpServletRequest req, HttpServletResponse resp )
throws IOException, ServletException
{
-System.out.println(" @@@@ in doGet");
+System.out.println(" @@@@ in doGet");
out = resp.getWriter();
writeHeader();
@@ -72,9 +72,9 @@
con = ds.getConnection();
stmt = con.createStatement();
rs = stmt.executeQuery("SELECT * FROM ONLYGETCONNECTION");
- out.println("test1 :: PASSED");
+ out.println("test1 :: PASSED");
} catch(Exception e) {
- e.printStackTrace( out );
+ e.printStackTrace( out );
return;
} finally {
if ( rs != null ) { try { rs.close(); }catch( Exception e) {} }
@@ -92,15 +92,15 @@
utx.begin();
con = ds.getConnection();
try {
- Thread.sleep( 5000 );
+ Thread.sleep( 5000 );
} catch(Exception e) {
}
stmt = con.createStatement();
rs = stmt.executeQuery("SELECT * FROM ONLYGETCONNECTION");
utx.commit();
- out.println("test2 :: PASSED");
+ out.println("test2 :: PASSED");
} catch(Exception e) {
- e.printStackTrace( out );
+ e.printStackTrace( out );
return;
} finally {
if ( rs != null ) { try { rs.close(); }catch( Exception e) {} }
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/sql/create.sql b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/sql/create.sql
index eb9516e..55cfc02 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnectionservlet/sql/create.sql
@@ -1,6 +1,6 @@
DROP TABLE ONLYGETCONNECTION;
CREATE TABLE ONLYGETCONNECTION(
- name char(20),
+ name char(20),
num integer
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.properties
index 40b27a2..837faa9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-pooling"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.xml
index 4acc67b..99c5e9b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,15 +48,15 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
-
+
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="jdbc-derby-pool"/>
<param name="jdbc.resource.name" value="jdbc/nonxaresource"/>
@@ -92,17 +92,17 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-pool.pooling=false"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-pool.pooling=false"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-pool-container.pooling=false"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-pool-container.pooling=false"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-xa-pool.pooling=false"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-xa-pool.pooling=false"/>
</antcall>
<antcall target="deploy-common"/>
@@ -110,19 +110,19 @@
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/nonxaresource"/>
</antcall>
@@ -130,7 +130,7 @@
<param name="jdbc.conpool.name" value="jdbc-derby-pool"/>
</antcall>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/nonxaresource-container"/>
</antcall>
@@ -138,7 +138,7 @@
<param name="jdbc.conpool.name" value="jdbc-derby-pool-container"/>
</antcall>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/xaresource"/>
</antcall>
@@ -146,7 +146,7 @@
<param name="jdbc.conpool.name" value="jdbc-derby-xa-pool"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/client/Client.java
index d23ad7b..10e6b6c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/client/Client.java
@@ -25,7 +25,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
private static boolean rollback;
private static boolean isXA;
@@ -34,32 +34,32 @@
private static InitialContext ic;
public static void main(String[] args)
throws Exception {
-
+
try {
- ic = new InitialContext();
- } catch(NamingException ex) {
- ex.printStackTrace();
- }
+ ic = new InitialContext();
+ } catch(NamingException ex) {
+ ex.printStackTrace();
+ }
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
- stat.addDescription("Running pooling testSuite ");
+ stat.addDescription("Running pooling testSuite ");
SimpleSession simpleSession = simpleSessionHome.create();
-
+
System.out.println("verifying uniqueness of all connection");
if(simpleSession.openAndCloseConnection(40)) {
stat.addStatus( testSuite + " openAndCloseConnection (non-xa) : ", stat.PASS );
- } else {
+ } else {
stat.addStatus( testSuite + " openAndCloseConnection (non-xa) : ", stat.PASS );
- }
+ }
System.out.println("creating connection upto max-pool-size of 32");
if(simpleSession.openMaxConnections(32)) {
stat.addStatus( testSuite + " openMaxConnections (non-xa) : ", stat.PASS );
- } else {
+ } else {
stat.addStatus( testSuite + " openMaxConnections (non-xa) : ", stat.PASS );
- }
+ }
rollback = false;
@@ -72,9 +72,9 @@
stat.printSummary();
}
-
+
private static void runTest(SimpleSession simpleSession, boolean rollback) {
- try {
+ try {
//Connection opened and closed within transaction
//non-xa resource
isXA = false;
@@ -91,8 +91,8 @@
} else {
stat.addStatus( testSuite + " test1 rollback=" + rollback + " (xa. con opened closed within tx) : ", stat.FAIL );
}
-
- //Connection opened within transaction
+
+ //Connection opened within transaction
//but closed after transaction
isXA = false;
//non-xa resource
@@ -109,16 +109,16 @@
} else {
stat.addStatus( testSuite + " test2 rollback=" + rollback + " (xa. con opened closed after tx) : ", stat.FAIL );
}
-
+
//XA and Non-XA resource within same transaction
//non-xa resource and xa resource together
if ( simpleSession.test3(rollback) ) {
stat.addStatus( testSuite + " test3 rollback=" + rollback + " (xa non-xa within same tx) : ", stat.PASS );
} else {
stat.addStatus( testSuite + " test3 rollback=" + rollback + " (xa non-xa within same tx) : ", stat.FAIL );
- }
- }catch(Exception ex) {
- ex.printStackTrace();
- }
+ }
+ }catch(Exception ex) {
+ ex.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/ejb-jar.xml
index 4794970..96664ea 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/ejb-jar.xml
@@ -64,6 +64,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/sun-ejb-jar.xml
index cdb0228..a4ca4b7 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/descriptor/sun-ejb-jar.xml
@@ -27,15 +27,15 @@
<jndi-name>com.sun.s1asdev.jdbc.pooling.ejb.SimpleSessionHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/nonxaresource</jndi-name>
+ <jndi-name>jdbc/nonxaresource</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>ContainerDataSource</res-ref-name>
- <jndi-name>jdbc/nonxaresource-container</jndi-name>
+ <jndi-name>jdbc/nonxaresource-container</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>XADataSource</res-ref-name>
- <jndi-name>jdbc/xaresource</jndi-name>
+ <jndi-name>jdbc/xaresource</jndi-name>
</resource-ref>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
index 8688975..d20dd6d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
@@ -34,62 +34,62 @@
private static String tableName = "COFFEE";
private InitialContext ic;
private DataSource ds;
- private DataSource xads;
+ private DataSource xads;
private DataSource contds;
private static boolean isXA=false;
public void setSessionContext(SessionContext ctxt) {
this.context = ctxt;
- try {
- ic = new InitialContext();
- ds = (DataSource)ic.lookup("java:comp/env/DataSource");
- xads = (DataSource)ic.lookup("java:comp/env/XADataSource");
- contds = (DataSource) ic.lookup("java:comp/env/ContainerDataSource");
- } catch( Exception ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic = new InitialContext();
+ ds = (DataSource)ic.lookup("java:comp/env/DataSource");
+ xads = (DataSource)ic.lookup("java:comp/env/XADataSource");
+ contds = (DataSource) ic.lookup("java:comp/env/ContainerDataSource");
+ } catch( Exception ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
}
public boolean test1(boolean isXa, boolean rollback) {
- boolean passed = false;
- this.isXA = isXa;
- this.rollback = rollback;
- DataSource ds = null;
- if(isXA) {
- ds = this.xads;
- } else {
- ds = this.ds;
- }
+ boolean passed = false;
+ this.isXA = isXa;
+ this.rollback = rollback;
+ DataSource ds = null;
+ if(isXA) {
+ ds = this.xads;
+ } else {
+ ds = this.ds;
+ }
UserTransaction ut = null;
try {
-
+
createTable(ds);
-
+
int count1 = getCount(ds);
System.out.println("count1 : " + count1);
-
+
ut = (UserTransaction) context.getUserTransaction();
ut.begin();
-
+
for(int i=0; i< count; i++)
insertRow(ds);
if(rollback)
ut.rollback();
else
ut.commit();
-
+
int count2=getCount(ds);
-
+
System.out.println("count2 : " + count2);
-
+
int diff = count2 - count1;
if(( diff == count && !rollback) || (diff == 0 && rollback))
passed = true;
else
passed = false;
-
+
} catch(Exception e){
passed = false;
e.printStackTrace();
@@ -105,51 +105,51 @@
}
}
};
- return passed;
-
+ return passed;
+
}
-
+
public boolean test2(boolean isXa, boolean rollback) {
- boolean passed = false;
- this.isXA = isXa;
- this.rollback = rollback;
- DataSource ds = null;
- if(isXA) {
- ds = this.xads;
- } else {
- ds = this.ds;
- }
+ boolean passed = false;
+ this.isXA = isXa;
+ this.rollback = rollback;
+ DataSource ds = null;
+ if(isXA) {
+ ds = this.xads;
+ } else {
+ ds = this.ds;
+ }
UserTransaction ut = null;
try {
Connection[] con;
createTable(ds);
-
+
int count1 = getCount(ds);
System.out.println("count1 : " + count1);
-
+
ut = (UserTransaction) context.getUserTransaction();
ut.begin();
-
+
con = openConnections(ds, count);
insertRow(con);
closeConnections(con);
-
+
if(rollback)
ut.rollback();
else
ut.commit();
-
+
int count2=getCount(ds);
-
+
System.out.println("count2 : " + count2);
-
+
int diff = count2 - count1;
if(( diff == count && !rollback) || (diff == 0 && rollback))
passed = true;
else
passed = false;
-
+
} catch(Exception e){
passed = false;
e.printStackTrace();
@@ -165,52 +165,52 @@
}
}
}
- return passed;
+ return passed;
}
public boolean test3(boolean rollback) {
- boolean passed = false;
- this.rollback = rollback;
+ boolean passed = false;
+ this.rollback = rollback;
UserTransaction ut = null;
- DataSource ds1 = this.ds;
- DataSource ds2 = this.xads;
+ DataSource ds1 = this.ds;
+ DataSource ds2 = this.xads;
try {
-
+
isXA = false;
createTable(ds1);
isXA = true;
createTable(ds2);
-
+
isXA = false;
int count1 = getCount(ds1);
isXA = true;
int count3 = getCount(ds2);
System.out.println("count1 : " + count1);
System.out.println("count3 : " + count3);
-
+
ut = (UserTransaction) context.getUserTransaction();
ut.begin();
-
+
isXA = false;
for(int i=0; i< count; i++)
insertRow(ds1);
isXA = true;
for(int i=0; i< count; i++)
insertRow(ds2);
-
+
if(rollback)
ut.rollback();
else
ut.commit();
-
+
isXA = false;
int count2=getCount(ds1);
isXA = true;
int count4=getCount(ds2);
-
+
System.out.println("count2 : " + count2);
System.out.println("count4 : " + count4);
-
+
int diff1 = count2 - count1;
int diff2 = count4 - count3;
if((( diff1 == count && !rollback) || (diff1 == 0 && rollback))
@@ -218,7 +218,7 @@
passed=true;
else
passed=false;
-
+
} catch(Exception e){
passed=false;
e.printStackTrace();
@@ -234,21 +234,21 @@
}
}
};
- return passed;
+ return passed;
}
-
+
private void createTable(final DataSource ds) throws SQLException {
String tableName;
if(isXA)
tableName = "COFFEE_XA";
else
tableName = "COFFEE";
-
+
Connection con;
Statement stmt;
con = ds.getConnection("scott", "tiger");
stmt = con.createStatement();
-
+
try{
stmt.executeUpdate("drop table " + tableName);
}catch(Exception ex){
@@ -258,7 +258,7 @@
stmt.close();
con.close();
}
-
+
private int getCount(final DataSource ds) throws SQLException {
String tableName;
if(isXA)
@@ -278,7 +278,7 @@
con.close();
return count;
}
-
+
private void insertRow(final DataSource ds) throws SQLException {
String tableName;
if(isXA)
@@ -293,7 +293,7 @@
stmt.close();
con.close();
}
-
+
private void insertRow(final Connection[] con) throws SQLException {
String tableName;
if(isXA)
@@ -304,98 +304,98 @@
for(int i=0; i < con.length; i++){
stmt = con[i].createStatement();
stmt.executeUpdate("INSERT INTO " + tableName + " values ('COFFEE', 100)");
- stmt.close();
+ stmt.close();
}
}
-
-
+
+
private void printConnection(final DataSource ds) throws SQLException{
com.sun.appserv.jdbc.DataSource dsTyped = (com.sun.appserv.jdbc.DataSource) ds;
Connection wrapper = dsTyped.getConnection("scott", "tiger");
System.out.println("Connection type : " + dsTyped.getConnection(wrapper));
wrapper.close();
}
-
+
public boolean openAndCloseConnection(int count) {
- boolean status = true;
- DataSource ds = contds;
+ boolean status = true;
+ DataSource ds = contds;
try {
com.sun.appserv.jdbc.DataSource dsTyped = (com.sun.appserv.jdbc.DataSource) ds;
- HashSet<String> connections = new HashSet<String>();
+ HashSet<String> connections = new HashSet<String>();
Connection con;
- String conType;
- int i = 0;
+ String conType;
+ int i = 0;
for(; i < count; i++){
con = ds.getConnection();
- conType = dsTyped.getConnection(con).toString();
- System.out.println("Connection type : " + conType);
+ conType = dsTyped.getConnection(con).toString();
+ System.out.println("Connection type : " + conType);
con.close();
- if(!connections.add(conType)){
- status = false;
- break;
- }
+ if(!connections.add(conType)){
+ status = false;
+ break;
+ }
}
- System.out.println("Total connection requested : " + count);
- System.out.println("Total connection created : " + i);
- System.out.println("Total number of unique connection : " + connections.size());
+ System.out.println("Total connection requested : " + count);
+ System.out.println("Total connection created : " + i);
+ System.out.println("Total number of unique connection : " + connections.size());
}catch(Exception ex){
ex.printStackTrace();
}
- return status;
+ return status;
}
-
- public boolean openMaxConnections(int count) {
- boolean status = false;
- DataSource ds = contds;
- Connection[] con = new Connection[count];
- int i = 0;
- for(; i < count; i++){
- try{
- con[i] = ds.getConnection();
- }catch(SQLException ex){
- System.out.println("Unable to create max connections");
- status = false;
- }
- }
- if(i == count){
- System.out.println("Able to create max connections");
- status=true;
- try{
- ds.getConnection();
- System.out.println("Able to create beyond max connections");
- status=false;
- }catch(SQLException ex){
- System.out.println("Unable to create beyond max connections");
- status=true;
- }
- }
-
+ public boolean openMaxConnections(int count) {
+ boolean status = false;
+ DataSource ds = contds;
+ Connection[] con = new Connection[count];
+ int i = 0;
+ for(; i < count; i++){
+ try{
+ con[i] = ds.getConnection();
+ }catch(SQLException ex){
+ System.out.println("Unable to create max connections");
+ status = false;
+ }
+ }
+
+ if(i == count){
+ System.out.println("Able to create max connections");
+ status=true;
+ try{
+ ds.getConnection();
+ System.out.println("Able to create beyond max connections");
+ status=false;
+ }catch(SQLException ex){
+ System.out.println("Unable to create beyond max connections");
+ status=true;
+ }
+ }
+
for(; i > 0; i--){
- try{
- con[i - 1].close();
- }catch(SQLException ex){
- System.out.println("Unable to close connection");
- }
- }
- return status;
+ try{
+ con[i - 1].close();
+ }catch(SQLException ex){
+ System.out.println("Unable to close connection");
+ }
+ }
+ return status;
}
private Connection[] openConnections(DataSource ds, int count) throws NamingException, SQLException {
-
+
Connection[] con = new Connection[count];
for(int i=0; i < count; i++)
con[i] = ds.getConnection("scott", "tiger");
-
+
return con;
}
-
+
private void closeConnections(Connection[] con) throws SQLException {
for(int i=0; i < count; i++)
con[i].close();
}
-
+
public void ejbLoad() {}
public void ejbStore() {}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/create_pointbase.sql
index b227cac..42d5a16 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
-INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
+INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/build.xml
index aff4edd..e13a6d9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/build.xml
@@ -29,9 +29,9 @@
<target name="all">
<record name="reconfig.output" action="start" />
- <ant dir="maxpoolsize" target="all"/>
- <ant dir="poolauth" target="all"/>
- <ant dir="poolauth-2" target="all"/>
+ <ant dir="maxpoolsize" target="all"/>
+ <ant dir="poolauth" target="all"/>
+ <ant dir="poolauth-2" target="all"/>
<record name="reconfig.output" action="stop" />
</target>
@@ -60,9 +60,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the reconfig tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the reconfig tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.properties
index b096d8c..15f223d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-reconfig-maxpoolsize"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="maxpoolsize-poolName" value="jdbc-maxpoolsize-pool"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.xml
index e8b2a27..7c765a0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/build.xml
@@ -27,7 +27,7 @@
]>
<project name="mix" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&run;
@@ -42,7 +42,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,13 +54,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="${maxpoolsize-poolName}"/>
@@ -68,32 +68,32 @@
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="${maxpoolsize-poolName}"/>
- <param name="jdbc.resource.name" value="jdbc/maxpoolsize"/>
+ <param name="jdbc.resource.name" value="jdbc/maxpoolsize"/>
</antcall>
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="${maxpoolsize-poolName}-xa"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="${maxpoolsize-poolName}-xa"/>
- <param name="jdbc.resource.name" value="jdbc/maxpoolsize-xa"/>
+ <param name="jdbc.resource.name" value="jdbc/maxpoolsize-xa"/>
</antcall>
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<!-- set the maxpoolsize to 10 before running -->
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}.max_pool_size=10"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}.max_pool_size=10"/>
</antcall>
<!-- also set the max-wait-time to a smaller value so the tests executes faster -->
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}.max_wait_time_in_millis=1000"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}.max_wait_time_in_millis=1000"/>
</antcall>
<antcall target="runclient-common">
@@ -103,23 +103,23 @@
<!-- set the maxpoolsize to 15 -->
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}.max_pool_size=20"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}.max_pool_size=20"/>
</antcall>
-
+
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
</antcall>
-
+
<!--- XA -->
<!-- set the maxpoolsize to 10 before running -->
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}-xa.max_pool_size=10"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}-xa.max_pool_size=10"/>
</antcall>
<!-- also set the max-wait-time to a smaller value so the tests executes faster -->
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}-xa.max_wait_time_in_millis=1000"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}-xa.max_wait_time_in_millis=1000"/>
</antcall>
<antcall target="runclient-common">
@@ -128,7 +128,7 @@
<!-- set the maxpoolsize to 15 -->
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}-xa.max_pool_size=20"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${maxpoolsize-poolName}-xa.max_pool_size=20"/>
</antcall>
<antcall target="runclient-common">
@@ -136,7 +136,7 @@
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
@@ -147,9 +147,9 @@
<antcall target="undeploy-jdbc-common">
<param name="jdbc.resource.name" value="jdbc/maxpoolsize-xa"/>
- <param name="jdbc.conpool.name" value="${maxpoolsize-poolName}-xa"/>
+ <param name="jdbc.conpool.name" value="${maxpoolsize-poolName}-xa"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/client/Client.java
index 645cc18..cfec288 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/client/Client.java
@@ -27,51 +27,51 @@
import java.io.*;
public class Client {
-
+
public static void main(String[] argv)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "ReconfigMaxPoolSize ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "ReconfigMaxPoolSize ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("Reconfig MaxPoolSize tests");
+ stat.addDescription("Reconfig MaxPoolSize tests");
/*
- * Tests 1,2 use non-xa pool - so the 3rd param "useXA" is false
- * Tests 3,4 use xa pool - so the 3rd param "useXA" is true
- */
+ * Tests 1,2 use non-xa pool - so the 3rd param "useXA" is false
+ * Tests 3,4 use xa pool - so the 3rd param "useXA" is true
+ */
if ("1".equals(argv[0]) ) {
if (simpleBMP.test1(10, true, false ) ) {
- stat.addStatus(testSuite+" test1 : ", stat.PASS);
+ stat.addStatus(testSuite+" test1 : ", stat.PASS);
} else {
- stat.addStatus(testSuite+" test1 : ", stat.FAIL);
+ stat.addStatus(testSuite+" test1 : ", stat.FAIL);
}
} else if ("2".equals(argv[0])) {
- if (simpleBMP.test1(19, false, false) ) {
- stat.addStatus(testSuite+" test2 : ", stat.PASS);
+ if (simpleBMP.test1(19, false, false) ) {
+ stat.addStatus(testSuite+" test2 : ", stat.PASS);
} else {
- stat.addStatus(testSuite+" test2 : ", stat.FAIL);
+ stat.addStatus(testSuite+" test2 : ", stat.FAIL);
}
} else if ("3".equals(argv[0])) {
- if (simpleBMP.test1(10, false, true) ) {
- stat.addStatus(testSuite+" test3 : ", stat.PASS);
+ if (simpleBMP.test1(10, false, true) ) {
+ stat.addStatus(testSuite+" test3 : ", stat.PASS);
} else {
- stat.addStatus(testSuite+" test3 : ", stat.FAIL);
+ stat.addStatus(testSuite+" test3 : ", stat.FAIL);
}
} else if ("4".equals(argv[0])) {
- if (simpleBMP.test1(19, false, true) ) {
- stat.addStatus(testSuite+" test4 : ", stat.PASS);
+ if (simpleBMP.test1(19, false, true) ) {
+ stat.addStatus(testSuite+" test4 : ", stat.PASS);
} else {
- stat.addStatus(testSuite+" test4 : ", stat.FAIL);
+ stat.addStatus(testSuite+" test4 : ", stat.FAIL);
}
}
- System.out.println("jdbc reconfig-maxpoolsize status: ");
- stat.printSummary();
+ System.out.println("jdbc reconfig-maxpoolsize status: ");
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/descriptor/ejb-jar.xml
index e7d6e88..9d9227e 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/descriptor/ejb-jar.xml
@@ -63,6 +63,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
index e2a768d..d5e9fac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
@@ -20,6 +20,6 @@
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
- public boolean test1(int maxPoolSize, boolean expectToPass, boolean useXA )
+ public boolean test1(int maxPoolSize, boolean expectToPass, boolean useXA )
throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
index 2049315..5c9c281 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
@@ -32,10 +32,10 @@
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
- /**
+ /**
* The basic strategy here is that we try to get 1 more connection
* than the maxpoolsize. This single extra getConnection should not
* pass. If this happens, the test has passed.
@@ -43,56 +43,56 @@
public boolean test1( int maxPoolSize, boolean throwException, boolean useXA ) {
try {
- InitialContext ic = new InitialContext();
- if ( useXA ) {
- ds = (DataSource) ic.lookup("java:comp/env/DataSource_xa");
- } else {
- ds = (DataSource) ic.lookup("java:comp/env/DataSource");
- }
- } catch( Exception e ) {
- e.printStackTrace();
- return false;
- }
- boolean passed = true;
- Connection[] conns = new Connection[maxPoolSize];
+ InitialContext ic = new InitialContext();
+ if ( useXA ) {
+ ds = (DataSource) ic.lookup("java:comp/env/DataSource_xa");
+ } else {
+ ds = (DataSource) ic.lookup("java:comp/env/DataSource");
+ }
+ } catch( Exception e ) {
+ e.printStackTrace();
+ return false;
+ }
+ boolean passed = true;
+ Connection[] conns = new Connection[maxPoolSize];
for( int i = 0; i < maxPoolSize; i++ ) {
- System.out.println("throwException is : " + throwException );
- try {
- System.out.println("########Getting connection : " + i );
- conns[i] = ds.getConnection();
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
+ System.out.println("throwException is : " + throwException );
+ try {
+ System.out.println("########Getting connection : " + i );
+ conns[i] = ds.getConnection();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
- }
- //try getting an extra connection
- System.out.println("---Try getting extra connection");
- Connection con = null;
- try {
- con = ds.getConnection();
- } catch( Exception e) {
- System.out.print("Caught exception : " ) ;
- if ( throwException ) {
- System.out.println("Setting passed to true");
- passed = true;
+ }
+ //try getting an extra connection
+ System.out.println("---Try getting extra connection");
+ Connection con = null;
+ try {
+ con = ds.getConnection();
+ } catch( Exception e) {
+ System.out.print("Caught exception : " ) ;
+ if ( throwException ) {
+ System.out.println("Setting passed to true");
+ passed = true;
} else {
- passed = false;
- }
+ passed = false;
+ }
} finally {
try { con.close(); } catch ( Exception e ) {}
}
-
- for (int i = 0 ; i < maxPoolSize;i++ ) {
- try {
- conns[i].close();
- } catch( Exception e) {
- //passed = false;
- }
- }
-
- return passed;
+
+ for (int i = 0 ; i < maxPoolSize;i++ ) {
+ try {
+ conns[i].close();
+ } catch( Exception e) {
+ //passed = false;
+ }
+ }
+
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.properties
index 7d8511f..4724652 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-poolauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.xml
index 8de7b94..48b39d3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/build.xml
@@ -25,7 +25,7 @@
<project name="mix" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,54 +47,54 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleSession*.class, **/*Client.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
-
+
<!-- set up non xa pools -->
-
+
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
</antcall>
<antcall target="create-jdbc-resource-common">
- <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
+ <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
<param name="jdbc.resource.name" value="jdbc/poolauth"/>
</antcall>
-
-
+
+
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="create-sql"/>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=dbuser"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=dbuser"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=dbpassword"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=dbpassword"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="1"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=pbpublic"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=pbpublic"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=pbpublic"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=pbpublic"/>
</antcall>
<antcall target="asadmin-common">
@@ -112,43 +112,43 @@
<param name="appclient.application.args" value="2"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
-
+
<antcall target="drop-sql"/>
<antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
+ <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
<param name="jdbc.resource.name" value="jdbc/poolauth"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
-
+ </target>
+
<target name="create-sql">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_dbuser_tables.sql"/>
- <param name="db.user" value="dbuser"/>
- <param name="db.pwd" value="dbpassword"/>
+ <param name="db.user" value="dbuser"/>
+ <param name="db.pwd" value="dbpassword"/>
</antcall>
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pbpublic_tables.sql"/>
- <param name="db.user" value="pbpublic"/>
- <param name="db.pwd" value="pbpublic"/>
+ <param name="db.user" value="pbpublic"/>
+ <param name="db.pwd" value="pbpublic"/>
</antcall>
</target>
-
- <target name="drop-sql">
+
+ <target name="drop-sql">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_dbuser_tables.sql"/>
- <param name="db.user" value="dbuser"/>
- <param name="db.pwd" value="dbpassword"/>
+ <param name="db.user" value="dbuser"/>
+ <param name="db.pwd" value="dbpassword"/>
</antcall>
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pbpublic_tables.sql"/>
- <param name="db.user" value="pbpublic"/>
- <param name="db.pwd" value="pbpublic"/>
+ <param name="db.user" value="pbpublic"/>
+ <param name="db.pwd" value="pbpublic"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/client/Client.java
index 7c4f7a7..ea8eba0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/client/Client.java
@@ -25,35 +25,35 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "reconfig.poolauth-test1 ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "reconfig.poolauth-test1 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running reconfig.poolauth testSuite1 ");
+
+ stat.addDescription("Running reconfig.poolauth testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if ( "1".equals(args[0]) ) {
- if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
+ if (simpleSession.test1() ) {
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
} else {
if (simpleSession.test2() ) {
- stat.addStatus( testSuite + " test2 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test2 : " , stat.FAIL );
- }
- }
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test2 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test2 : " , stat.FAIL );
+ }
+ }
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/descriptor/ejb-jar.xml
index eecdd12..20a4463 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/descriptor/ejb-jar.xml
@@ -52,6 +52,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
index 67cd654..c63a299 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
@@ -31,105 +31,105 @@
private DataSource ds;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
+ try {
+ ic_ = new InitialContext();
ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
}
public boolean test1() throws Exception {
- //DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- boolean passed = false;
- //Get a connection with user,password = dbuser,dbpassword
- //and access a table that only this principal can
- //access
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ //DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ boolean passed = false;
+ //Get a connection with user,password = dbuser,dbpassword
+ //and access a table that only this principal can
+ //access
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- //Now try querying a table owned by another principal and
- //expect an exception
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ //Now try querying a table owned by another principal and
+ //expect an exception
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- return false;
+ return false;
}
public boolean test2() throws Exception {
- //DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- boolean passed = false;
- //Get a connection with user,password = pbpublic,pbpublic
- //and access a table that only this principal can
- //access
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ //DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ boolean passed = false;
+ //Get a connection with user,password = pbpublic,pbpublic
+ //and access a table that only this principal can
+ //access
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- //Now try querying a table owned by another principal and
- //expect an exception
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ //Now try querying a table owned by another principal and
+ //expect an exception
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- return false;
+ return false;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_dbuser_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_dbuser_tables.sql
index f91aa17..e64065e 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_dbuser_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_dbuser_tables.sql
@@ -1,9 +1,9 @@
-Drop table DBUSERTABLE;
-
-CREATE TABLE DBUSERTABLE (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO DBUSERTABLE VALUES(1, 'wxyz');
-INSERT INTO DBUSERTABLE VALUES(2, 'pqrs');
+Drop table DBUSERTABLE;
+
+CREATE TABLE DBUSERTABLE (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO DBUSERTABLE VALUES(1, 'wxyz');
+INSERT INTO DBUSERTABLE VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_pbpublic_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_pbpublic_tables.sql
index 79ea72a..379e047 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_pbpublic_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/create_pbpublic_tables.sql
@@ -1,9 +1,9 @@
-Drop table PBPUBLICTABLE;
-
-CREATE TABLE PBPUBLICTABLE (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO PBPUBLICTABLE VALUES(1, 'wxyz');
-INSERT INTO PBPUBLICTABLE VALUES(2, 'pqrs');
+Drop table PBPUBLICTABLE;
+
+CREATE TABLE PBPUBLICTABLE (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO PBPUBLICTABLE VALUES(1, 'wxyz');
+INSERT INTO PBPUBLICTABLE VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_dbuser_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_dbuser_tables.sql
index 255700d..1933064 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_dbuser_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_dbuser_tables.sql
@@ -1 +1 @@
-Drop table DBUSERTABLE;
+Drop table DBUSERTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_pbpublic_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_pbpublic_tables.sql
index ff40a19..b023993 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_pbpublic_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/sql/drop_pbpublic_tables.sql
@@ -1 +1 @@
-Drop table PBPUBLICTABLE;
+Drop table PBPUBLICTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.properties
index 7d8511f..4724652 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-poolauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.xml
index 531c329..2a7672f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/build.xml
@@ -25,7 +25,7 @@
<project name="mix" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
@@ -35,7 +35,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -47,97 +47,97 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleSession*.class, **/*Client.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
-
+
<!-- set up non xa pools -->
-
+
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
</antcall>
<antcall target="create-jdbc-resource-common">
- <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
+ <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
<param name="jdbc.resource.name" value="jdbc/poolauth"/>
</antcall>
-
-
+
+
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="create-sql"/>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=dbuser"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=dbuser"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=dbpassword"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=dbpassword"/>
</antcall>
<antcall target="runclient-common">
<param name="appclient.application.args" value="1"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=pbpublic"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.User=pbpublic"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=pbpublic"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-poolauth-pool.property.Password=pbpublic"/>
</antcall>
-
+
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
-
+
<antcall target="drop-sql"/>
<antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
+ <param name="jdbc.conpool.name" value="jdbc-poolauth-pool"/>
<param name="jdbc.resource.name" value="jdbc/poolauth"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
-
+ </target>
+
<target name="create-sql">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_dbuser_tables.sql"/>
- <param name="db.user" value="dbuser"/>
- <param name="db.pwd" value="dbpassword"/>
+ <param name="db.user" value="dbuser"/>
+ <param name="db.pwd" value="dbpassword"/>
</antcall>
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pbpublic_tables.sql"/>
- <param name="db.user" value="pbpublic"/>
- <param name="db.pwd" value="pbpublic"/>
+ <param name="db.user" value="pbpublic"/>
+ <param name="db.pwd" value="pbpublic"/>
</antcall>
</target>
-
- <target name="drop-sql">
+
+ <target name="drop-sql">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_dbuser_tables.sql"/>
- <param name="db.user" value="dbuser"/>
- <param name="db.pwd" value="dbpassword"/>
+ <param name="db.user" value="dbuser"/>
+ <param name="db.pwd" value="dbpassword"/>
</antcall>
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pbpublic_tables.sql"/>
- <param name="db.user" value="pbpublic"/>
- <param name="db.pwd" value="pbpublic"/>
+ <param name="db.user" value="pbpublic"/>
+ <param name="db.pwd" value="pbpublic"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/client/Client.java
index 7c4f7a7..ea8eba0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/client/Client.java
@@ -25,35 +25,35 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "reconfig.poolauth-test1 ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "reconfig.poolauth-test1 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running reconfig.poolauth testSuite1 ");
+
+ stat.addDescription("Running reconfig.poolauth testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if ( "1".equals(args[0]) ) {
- if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
+ if (simpleSession.test1() ) {
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
} else {
if (simpleSession.test2() ) {
- stat.addStatus( testSuite + " test2 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test2 : " , stat.FAIL );
- }
- }
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test2 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test2 : " , stat.FAIL );
+ }
+ }
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/descriptor/ejb-jar.xml
index eecdd12..20a4463 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/descriptor/ejb-jar.xml
@@ -52,6 +52,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
index 782bdc4..8d16527 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
@@ -27,107 +27,107 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
}
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- boolean passed = false;
- //Get a connection with user,password = dbuser,dbpassword
- //and access a table that only this principal can
- //access
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ boolean passed = false;
+ //Get a connection with user,password = dbuser,dbpassword
+ //and access a table that only this principal can
+ //access
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- //Now try querying a table owned by another principal and
- //expect an exception
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ //Now try querying a table owned by another principal and
+ //expect an exception
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- return false;
+ return false;
}
public boolean test2() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- boolean passed = false;
- //Get a connection with user,password = pbpublic,pbpublic
- //and access a table that only this principal can
- //access
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ boolean passed = false;
+ //Get a connection with user,password = pbpublic,pbpublic
+ //and access a table that only this principal can
+ //access
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM PBPUBLICTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- //Now try querying a table owned by another principal and
- //expect an exception
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
- } catch( Exception e) {
- e.printStackTrace();
- return true;
- } finally {
- if (stmt1 != null ) {
- try { stmt1.close(); } catch(Exception e) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
+ //Now try querying a table owned by another principal and
+ //expect an exception
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeQuery("SELECT * FROM DBUSERTABLE");
+ } catch( Exception e) {
+ e.printStackTrace();
+ return true;
+ } finally {
+ if (stmt1 != null ) {
+ try { stmt1.close(); } catch(Exception e) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
- return false;
+ return false;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_dbuser_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_dbuser_tables.sql
index f91aa17..e64065e 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_dbuser_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_dbuser_tables.sql
@@ -1,9 +1,9 @@
-Drop table DBUSERTABLE;
-
-CREATE TABLE DBUSERTABLE (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO DBUSERTABLE VALUES(1, 'wxyz');
-INSERT INTO DBUSERTABLE VALUES(2, 'pqrs');
+Drop table DBUSERTABLE;
+
+CREATE TABLE DBUSERTABLE (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO DBUSERTABLE VALUES(1, 'wxyz');
+INSERT INTO DBUSERTABLE VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_pbpublic_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_pbpublic_tables.sql
index 79ea72a..379e047 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_pbpublic_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/create_pbpublic_tables.sql
@@ -1,9 +1,9 @@
-Drop table PBPUBLICTABLE;
-
-CREATE TABLE PBPUBLICTABLE (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO PBPUBLICTABLE VALUES(1, 'wxyz');
-INSERT INTO PBPUBLICTABLE VALUES(2, 'pqrs');
+Drop table PBPUBLICTABLE;
+
+CREATE TABLE PBPUBLICTABLE (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO PBPUBLICTABLE VALUES(1, 'wxyz');
+INSERT INTO PBPUBLICTABLE VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_dbuser_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_dbuser_tables.sql
index 255700d..1933064 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_dbuser_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_dbuser_tables.sql
@@ -1 +1 @@
-Drop table DBUSERTABLE;
+Drop table DBUSERTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_pbpublic_tables.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_pbpublic_tables.sql
index ff40a19..b023993 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_pbpublic_tables.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/sql/drop_pbpublic_tables.sql
@@ -1 +1 @@
-Drop table PBPUBLICTABLE;
+Drop table PBPUBLICTABLE;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.properties
index 835fee5..fd16aa3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-appauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="oracle.user.1" value="scott"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.xml
index d30a398..428395a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/build.xml
@@ -40,7 +40,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"/>
@@ -52,23 +52,23 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
- <param name="oracle.user" value="${oracle.user.1}"/>
- <param name="oracle.password" value="${oracle.password.1}"/>
- <param name="sql.file" value="sql/create_pointbase.sql"/>
+ <param name="oracle.user" value="${oracle.user.1}"/>
+ <param name="oracle.password" value="${oracle.password.1}"/>
+ <param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="execute-sql-oracle-common">
- <param name="oracle.user" value="${oracle.user.2}"/>
- <param name="oracle.password" value="${oracle.password.2}"/>
- <param name="sql.file" value="sql/create_pointbase1.sql"/>
+ <param name="oracle.user" value="${oracle.user.2}"/>
+ <param name="oracle.password" value="${oracle.password.2}"/>
+ <param name="sql.file" value="sql/create_pointbase1.sql"/>
</antcall>
<antcall target="deploy-jdbc-oracle-common">
<param name="oracle.conpool.name" value="jdbc-oracle-pool"/>
@@ -76,11 +76,11 @@
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -88,12 +88,12 @@
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase1.sql"/>
</antcall>
- <antcall target="undeploy-jdbc-oracle-common">
+ <antcall target="undeploy-jdbc-oracle-common">
<param name="oracle.pool.name" value="jdbc-oracle-pool"/>
- <param name="oracle.resource.name" value="jdbc/s1qeDB-oracle"/>
+ <param name="oracle.resource.name" value="jdbc/s1qeDB-oracle"/>
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/client/SimpleBMPClient.java
index 65b2630..8ecf79d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/client/SimpleBMPClient.java
@@ -30,35 +30,35 @@
public static void main(String[] args)
throws Exception {
-
+
SimpleReporterAdapter stat = new SimpleReporterAdapter();
String testSuite = "Reconfig User/Pass";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
stat.addDescription("Reconfig user/pass tests");
SimpleBMP simpleBMP = simpleBMPHome.create();
-
- System.out.println("----------------------------");
- System.out.print(" test1: ");
- if ( simpleBMP.test1("scott","tiger", "A_Customer") ) {
+
+ System.out.println("----------------------------");
+ System.out.print(" test1: ");
+ if ( simpleBMP.test1("scott","tiger", "A_Customer") ) {
stat.addStatus(testSuite + " user1Test : ", stat.PASS);
System.out.println("Calling test again");
- if ( simpleBMP.test1("shal", "shal", "B_Customer") ) {
- System.out.println("Passed");
- stat.addStatus(testSuite + " user2Test : ", stat.PASS);
- } else {
- System.out.println("Failed");
+ if ( simpleBMP.test1("shal", "shal", "B_Customer") ) {
+ System.out.println("Passed");
+ stat.addStatus(testSuite + " user2Test : ", stat.PASS);
+ } else {
+ System.out.println("Failed");
stat.addStatus(testSuite + " user2Test : ", stat.FAIL);
- }
-
- } else {
- System.out.println("Failed");
- stat.addStatus(testSuite + " user1Test : ", stat.FAIL);
- }
- System.out.println("----------------------------");
+ }
+
+ } else {
+ System.out.println("Failed");
+ stat.addStatus(testSuite + " user1Test : ", stat.FAIL);
+ }
+ System.out.println("----------------------------");
stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/descriptor/ejb-jar.xml
index 31ff6d6..cb0ff7b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
index 3a64bea..c31db0e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
@@ -32,46 +32,46 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource1");
- } catch (NamingException e) {
- e.printStackTrace();
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource1");
+ } catch (NamingException e) {
+ e.printStackTrace();
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1(String user, String password, String tableName) {
//access User1's table and push some data then read it out
- boolean passed = false;
- Connection conn = null;
- try {
- System.out.println("Called with " + user + ":"+password);
- conn = ds.getConnection(user, password);
- //conn = ds.getConnection();
- insertData( conn, tableName );
- queryTable( conn, tableName );
- //emptyTable( conn, tableName );
+ boolean passed = false;
+ Connection conn = null;
+ try {
+ System.out.println("Called with " + user + ":"+password);
+ conn = ds.getConnection(user, password);
+ //conn = ds.getConnection();
+ insertData( conn, tableName );
+ queryTable( conn, tableName );
+ //emptyTable( conn, tableName );
conn.close();
- passed = true;
- } catch (Exception e) {
- //e.printStackTrace();
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ passed = true;
+ } catch (Exception e) {
+ //e.printStackTrace();
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+ return passed;
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
@@ -82,46 +82,46 @@
public void ejbPostCreate() {}
//Insert some arbitrary data into the table
- private void insertData( Connection con, String tableName )
+ private void insertData( Connection con, String tableName )
throws SQLException
{
PreparedStatement stmt = con.prepareStatement(
- "insert into " + tableName + " values (?, ?)" );
+ "insert into " + tableName + " values (?, ?)" );
- for (int i = 0; i < 5; i++ ) {
+ for (int i = 0; i < 5; i++ ) {
stmt.setInt(1, i);
- stmt.setString(2, "abcd-"+i);
- stmt.executeUpdate();
- }
-
- stmt.close();
+ stmt.setString(2, "abcd-"+i);
+ stmt.executeUpdate();
}
- private void emptyTable( Connection con, String tableName )
+ stmt.close();
+ }
+
+ private void emptyTable( Connection con, String tableName )
throws SQLException
{
try {
Statement stmt = con.createStatement();
-
- stmt.execute("delete * from "+ tableName);
- stmt.close();
+
+ stmt.execute("delete * from "+ tableName);
+ stmt.close();
} catch( Exception e) {
- }
-
}
- private void queryTable( Connection con, String tableName )
+ }
+
+ private void queryTable( Connection con, String tableName )
throws SQLException
{
try {
- Statement stmt = con.createStatement();
- ResultSet rs = stmt.executeQuery("select * from "+ tableName);
- while( rs.next() ) {
- System.out.println( rs );
- }
- rs.close();
- } catch( Exception e) {
- }
+ Statement stmt = con.createStatement();
+ ResultSet rs = stmt.executeQuery("select * from "+ tableName);
+ while( rs.next() ) {
+ System.out.println( rs );
+ }
+ rs.close();
+ } catch( Exception e) {
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase.sql
index be66744..e9406fc 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table A_Customer;
-
-CREATE TABLE A_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table A_Customer;
+
+CREATE TABLE A_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase1.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase1.sql
index cb74cb4..4253633 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase1.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/create_pointbase1.sql
@@ -1,7 +1,7 @@
-Drop table B_Customer;
-
-CREATE TABLE B_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table B_Customer;
+
+CREATE TABLE B_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase.sql
index 0c8171d..6dd688a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table A_Customer;
+Drop table A_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase1.sql b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase1.sql
index fd35fa7..abcaacc 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase1.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/sql/drop_pointbase1.sql
@@ -1 +1 @@
-Drop table B_Customer;
+Drop table B_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/report.xml b/appserver/tests/appserv-tests/devtests/jdbc/report.xml
index f56765f..8f75ae4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/report.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh b/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
index c7a3fa0..cb4ae09 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
@@ -18,7 +18,7 @@
list_test_ids(){
echo jdbc_all
}
-
+
test_run(){
${S1AS_HOME}/bin/asadmin start-domain domain1
${S1AS_HOME}/bin/asadmin start-database
@@ -38,13 +38,13 @@
generate_junit_report ${1}
change_junit_report_class_names
}
-
+
get_test_target(){
- case ${1} in
- jdbc_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ jdbc_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/simple/build.properties
index a78caea..fdd4e36 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simple"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/simple/build.xml
index 981b347..a32a183 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/build.xml
@@ -42,7 +42,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,13 +54,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -69,14 +69,14 @@
<antcall target="create-persistence-resource-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -85,7 +85,7 @@
<antcall target="delete-persistence-resource-common"/>
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/client/SimpleBMPClient.java
index 413fe65..4648f91 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/client/SimpleBMPClient.java
@@ -29,66 +29,66 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "jdbcsimple ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "jdbcsimple ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
-
+
if ( simpleBMP.test1(10) ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
-
- if ( simpleBMP.test3() ) {
- stat.addStatus(testSuite+"test3 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test3 : ", stat.FAIL);
- }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- if ( simpleBMP.test4() ) {
- stat.addStatus(testSuite+"test4 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test4 : ", stat.FAIL);
- }
+ if ( simpleBMP.test3() ) {
+ stat.addStatus(testSuite+"test3 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test3 : ", stat.FAIL);
+ }
- if ( simpleBMP.test5() ) {
- stat.addStatus(testSuite+"test5 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test5 : ", stat.FAIL);
- }
+ if ( simpleBMP.test4() ) {
+ stat.addStatus(testSuite+"test4 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test4 : ", stat.FAIL);
+ }
- if ( simpleBMP.test6() ) {
- stat.addStatus(testSuite+"test6 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test6 : ", stat.FAIL);
- }
+ if ( simpleBMP.test5() ) {
+ stat.addStatus(testSuite+"test5 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test5 : ", stat.FAIL);
+ }
- if ( simpleBMP.test7() ) {
- stat.addStatus(testSuite+"test7 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test7 : ", stat.FAIL);
- }
+ if ( simpleBMP.test6() ) {
+ stat.addStatus(testSuite+"test6 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test6 : ", stat.FAIL);
+ }
- if ( simpleBMP.test8() ) {
- stat.addStatus(testSuite+"test8 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test8 : ", stat.FAIL);
- }
+ if ( simpleBMP.test7() ) {
+ stat.addStatus(testSuite+"test7 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test7 : ", stat.FAIL);
+ }
- stat.printSummary();
-
-
+ if ( simpleBMP.test8() ) {
+ stat.addStatus(testSuite+"test8 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test8 : ", stat.FAIL);
+ }
+
+ stat.printSummary();
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/simple/descriptor/ejb-jar.xml
index e09c276..ffe0509 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
index 0222cd7..5cb9448 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
@@ -31,175 +31,175 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
/* Get 10 connections in a bunch and then close them*/
public boolean test1( int numRuns ) {
- boolean passed = true;
- Connection[] conns = new Connection[10];
+ boolean passed = true;
+ Connection[] conns = new Connection[10];
for( int i = 0; i < numRuns; i++ ) {
- try {
- conns[i] = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } /*finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- } */
+ try {
+ conns[i] = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } /*finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ } */
}
-
- for (int i = 0 ; i < numRuns;i++ ) {
- try {
- conns[i].close();
- } catch( Exception e) {
- passed = false;
- }
- }
- return passed;
+
+ for (int i = 0 ; i < numRuns;i++ ) {
+ try {
+ conns[i].close();
+ } catch( Exception e) {
+ passed = false;
+ }
+ }
+ return passed;
}
/* Get a single connection and close it */
public boolean test2() {
Connection conn = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
-
- /* Use the getConnection API in the ConnectorRuntime
+
+ /* Use the getConnection API in the ConnectorRuntime
* Use a jdbc resource jndi name
*/
public boolean test3() {
- System.out.println("---------------Running test3---------------");
+ System.out.println("---------------Running test3---------------");
Connection con = null;
- ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
-
- try {
- con = runtime.getConnection( "jdbc/s1qeDB" );
- } catch( SQLException sqle ) {
- sqle.printStackTrace();
- return false;
- }
+ ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
- return true;
+ try {
+ con = runtime.getConnection( "jdbc/s1qeDB" );
+ } catch( SQLException sqle ) {
+ sqle.printStackTrace();
+ return false;
}
- /* Use the getConnection API in the ConnectorRuntime
+ return true;
+ }
+
+ /* Use the getConnection API in the ConnectorRuntime
* Use a PMF resource
*/
public boolean test4() {
- System.out.println("---------------Running test4-------------");
+ System.out.println("---------------Running test4-------------");
Connection con = null;
- ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
-
- try {
- con = runtime.getConnection( "jdo/s1qePM" );
- } catch( Exception sqle ) {
- sqle.printStackTrace();
- return false;
- }
+ ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
- return true;
+ try {
+ con = runtime.getConnection( "jdo/s1qePM" );
+ } catch( Exception sqle ) {
+ sqle.printStackTrace();
+ return false;
}
- /* Use the getConnection API in the ConnectorRuntime
+ return true;
+ }
+
+ /* Use the getConnection API in the ConnectorRuntime
* Use a jdbc resource jndi name
*/
public boolean test5() {
- System.out.println("---------------Running test5---------------");
+ System.out.println("---------------Running test5---------------");
Connection con = null;
- ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
-
- try {
- con = runtime.getConnection( "jdbc/s1qeDB", "pbpublic", "pbpublic" );
- } catch( Exception sqle ) {
- sqle.printStackTrace();
- return false;
- }
+ ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
- return true;
+ try {
+ con = runtime.getConnection( "jdbc/s1qeDB", "pbpublic", "pbpublic" );
+ } catch( Exception sqle ) {
+ sqle.printStackTrace();
+ return false;
}
- /* Use the getConnection API in the ConnectorRuntime
+ return true;
+ }
+
+ /* Use the getConnection API in the ConnectorRuntime
* Use a PMF resource
*/
public boolean test6() {
- System.out.println("---------------Running test6-------------");
+ System.out.println("---------------Running test6-------------");
Connection con = null;
- ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
-
- try {
- con = runtime.getConnection( "jdo/s1qePM", "pbpublic", "pbpublic" );
- } catch( Exception sqle ) {
- sqle.printStackTrace();
- return false;
- }
+ ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
- return true;
+ try {
+ con = runtime.getConnection( "jdo/s1qePM", "pbpublic", "pbpublic" );
+ } catch( Exception sqle ) {
+ sqle.printStackTrace();
+ return false;
}
- /* Use the getConnection API in the ConnectorRuntime
+ return true;
+ }
+
+ /* Use the getConnection API in the ConnectorRuntime
* Use a jdbc resource jndi name
*/
public boolean test7() {
- System.out.println("---------------Running test7---------------");
+ System.out.println("---------------Running test7---------------");
Connection con = null;
- ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
-
- try {
- con = runtime.getConnection( "jdbc/notpresent" );
- } catch( Exception sqle ) {
- System.out.println("Caught expected exception");
- sqle.printStackTrace();
- return true;
- }
+ ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
- return false;
+ try {
+ con = runtime.getConnection( "jdbc/notpresent" );
+ } catch( Exception sqle ) {
+ System.out.println("Caught expected exception");
+ sqle.printStackTrace();
+ return true;
}
- /* Use the getConnection API in the ConnectorRuntime
+ return false;
+ }
+
+ /* Use the getConnection API in the ConnectorRuntime
* Use a PMF resource
*/
public boolean test8() {
- System.out.println("---------------Running test8-------------");
+ System.out.println("---------------Running test8-------------");
Connection con = null;
- ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
-
- try {
- con = runtime.getConnection( "jdo/notpresent" );
- } catch( Exception sqle ) {
- System.out.println("Caught expected exception");
- sqle.printStackTrace();
- return true;
- }
+ ConnectorRuntime runtime = ConnectorRuntime.getRuntime();
- return false;
+ try {
+ con = runtime.getConnection( "jdo/notpresent" );
+ } catch( Exception sqle ) {
+ System.out.println("Caught expected exception");
+ sqle.printStackTrace();
+ return true;
+ }
+
+ return false;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.properties
index f124eeb..b6841be 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simplemysql"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.xml
index 5bdafa6..4d24c89 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/build.xml
@@ -40,7 +40,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"/>
@@ -52,13 +52,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-mysql-common">
<param name="sql.file" value="sql/create_mysql.sql"/>
@@ -66,14 +66,14 @@
<antcall target="deploy-jdbc-mysql-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-mysql-common">
<param name="sql.file" value="sql/create_mysql.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-mysql-common">
<param name="sql.file" value="sql/drop_mysql.sql"/>
@@ -81,7 +81,7 @@
<antcall target="undeploy-jdbc-mysql-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/client/SimpleBMPClient.java
index b2a2a1a..6eb254d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/client/SimpleBMPClient.java
@@ -29,37 +29,37 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "jdbcsimplemysql ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "jdbcsimplemysql ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simplemysqlBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simplemysqlBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simplemysqlBMP = simplemysqlBMPHome.create();
if ( simplemysqlBMP.test1(10) ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
- if ( simplemysqlBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ if ( simplemysqlBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- if ( simplemysqlBMP.test3() ) {
- stat.addStatus(testSuite+"test3 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test3 : ", stat.FAIL);
- }
+ if ( simplemysqlBMP.test3() ) {
+ stat.addStatus(testSuite+"test3 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test3 : ", stat.FAIL);
+ }
- System.out.println("jdbc simplemysql status: ");
- stat.printSummary();
-
-
+ System.out.println("jdbc simplemysql status: ");
+ stat.printSummary();
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/descriptor/ejb-jar.xml
index 36623a5..af16c8b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
index 2556bf7..1270faa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
@@ -30,102 +30,102 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
/* Get 10 connections in a bunch and then close them*/
public boolean test1( int numRuns ) {
- boolean passed = true;
- Connection[] conns = new Connection[10];
+ boolean passed = true;
+ Connection[] conns = new Connection[10];
for( int i = 0; i < numRuns; i++ ) {
- try {
- conns[i] = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } /*finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- } */
+ try {
+ conns[i] = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } /*finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ } */
}
-
- for (int i = 0 ; i < numRuns;i++ ) {
- try {
- conns[i].close();
- } catch( Exception e) {
- passed = false;
- }
- }
- return passed;
+
+ for (int i = 0 ; i < numRuns;i++ ) {
+ try {
+ conns[i].close();
+ } catch( Exception e) {
+ passed = false;
+ }
+ }
+ return passed;
}
/* Get a single connection and close it */
public boolean test2() {
Connection conn = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
-
+
/* Get a single connection and do some DB operations */
public boolean test3() {
Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Statement stmt = null;
+ ResultSet rs = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO O_CUSTOMER VALUES (0,'abcd')");
- stmt.executeUpdate("INSERT INTO O_CUSTOMER VALUES (1,'pqrs')");
+ try {
+ conn = ds.getConnection();
+ stmt = conn.createStatement();
+ stmt.executeUpdate("INSERT INTO O_CUSTOMER VALUES (0,'abcd')");
+ stmt.executeUpdate("INSERT INTO O_CUSTOMER VALUES (1,'pqrs')");
System.out.println("Inserted values OK");
- rs = stmt.executeQuery("SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getInt("c_id"));
- System.out.println(rs.getString("c_phone"));
- }
-
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if (rs != null) {
- try { rs.close(); }catch( Exception e1) {}
- }
- if (stmt != null) {
- try { stmt.close(); }catch(Exception e1) {}
- }
- if ( conn != null ) {
- try { conn.close(); } catch( Exception e1) {}
- }
- }
-
- return passed;
+ rs = stmt.executeQuery("SELECT * FROM O_CUSTOMER");
+ while( rs.next() ) {
+ System.out.println(rs.getInt("c_id"));
+ System.out.println(rs.getString("c_phone"));
+ }
+
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if (rs != null) {
+ try { rs.close(); }catch( Exception e1) {}
+ }
+ if (stmt != null) {
+ try { stmt.close(); }catch(Exception e1) {}
+ }
+ if ( conn != null ) {
+ try { conn.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/create_mysql.sql b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/create_mysql.sql
index dd31599..f13ff8b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/create_mysql.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/create_mysql.sql
@@ -1,7 +1,7 @@
-Drop table O_CUSTOMER;
-
-CREATE TABLE O_CUSTOMER (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_CUSTOMER;
+
+CREATE TABLE O_CUSTOMER (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/drop_mysql.sql b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/drop_mysql.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/drop_mysql.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/sql/drop_mysql.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.properties
index 8cdd5ac..50ac500 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simpleora"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.xml
index b302dcf..ecdfdac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/build.xml
@@ -40,7 +40,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"/>
@@ -52,13 +52,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-oracle-common"/>
@@ -71,14 +71,14 @@
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/client/SimpleBMPClient.java
index 1d54ecf..7309060 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/client/SimpleBMPClient.java
@@ -29,39 +29,39 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "jdbcsimpleora ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "jdbcsimpleora ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("Simple Oracle test ");
+ stat.addDescription("Simple Oracle test ");
-
+
if ( simpleBMP.test1(10) ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
-
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
- if ( simpleBMP.test3() ) {
- stat.addStatus(testSuite+"test3 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test3 : ", stat.FAIL);
- }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc simpleora status: ");
- stat.printSummary();
-
-
+ if ( simpleBMP.test3() ) {
+ stat.addStatus(testSuite+"test3 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test3 : ", stat.FAIL);
+ }
+
+ System.out.println("jdbc simpleora status: ");
+ stat.printSummary();
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/ejb-jar.xml
index 20d716e..5ac9a4b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/ejb-jar.xml
@@ -63,6 +63,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/sun-ejb-jar.xml
index 6f4a404..f3a4375 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.simpleora.ejb.SimpleBMPHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/oracleres</jndi-name>
+ <jndi-name>jdbc/oracleres</jndi-name>
<default-resource-principal>
<name>scott</name>
<password>tiger</password>
@@ -35,7 +35,7 @@
</resource-ref>
<resource-ref>
<res-ref-name>DataSource1</res-ref-name>
- <jndi-name>jdbc/oracleres</jndi-name>
+ <jndi-name>jdbc/oracleres</jndi-name>
<default-resource-principal>
<name>scott</name>
<password>tiger</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
index fd2dd44..7d4f169 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
@@ -31,121 +31,121 @@
protected DataSource ds1;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- ds1 = (DataSource) context.lookup("java:comp/env/DataSource1");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ ds1 = (DataSource) context.lookup("java:comp/env/DataSource1");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
/* Get 10 connections in a bunch and then close them*/
public boolean test1( int numRuns ) {
- boolean passed = true;
- Connection[] conns = new Connection[10];
+ boolean passed = true;
+ Connection[] conns = new Connection[10];
for( int i = 0; i < numRuns; i++ ) {
- try {
- conns[i] = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- }
+ try {
+ conns[i] = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
}
-
- for (int i = 0 ; i < numRuns;i++ ) {
- try {
- conns[i].close();
- } catch( Exception e) {
- passed = false;
- }
- }
- return passed;
+ }
+
+ for (int i = 0 ; i < numRuns;i++ ) {
+ try {
+ conns[i].close();
+ } catch( Exception e) {
+ passed = false;
+ }
+ }
+ return passed;
}
/* Get a single connection and close it */
public boolean test2() {
Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Statement stmt = null;
+ ResultSet rs = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- conn.setTransactionIsolation( conn.getTransactionIsolation() );
- stmt = conn.createStatement();
- rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getString(1));
- }
- stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
+ try {
+ conn = ds.getConnection();
+ conn.setTransactionIsolation( conn.getTransactionIsolation() );
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
+ while( rs.next() ) {
+ System.out.println(rs.getString(1));
+ }
+ stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getString(1));
- }
+ while( rs.next() ) {
+ System.out.println(rs.getString(1));
+ }
stmt.executeUpdate("DELETE FROM O_CUSTOMER WHERE c_id=100");
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if (rs != null ) {
- try { rs.close(); } catch( Exception e1 ) {}
- }
- if (stmt != null ) {
- try { stmt.close(); } catch( Exception e1 ) {}
- }
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
-
- }
-
- return passed;
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if (rs != null ) {
+ try { rs.close(); } catch( Exception e1 ) {}
+ }
+ if (stmt != null ) {
+ try { stmt.close(); } catch( Exception e1 ) {}
+ }
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+
+ }
+
+ return passed;
}
/** Application auth */
public boolean test3() {
Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Statement stmt = null;
+ ResultSet rs = null;
boolean passed = true;
- try {
- conn = ds1.getConnection("scott", "tiger");
- stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
+ try {
+ conn = ds1.getConnection("scott", "tiger");
+ stmt = conn.createStatement();
+ stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getString(1));
- }
+ while( rs.next() ) {
+ System.out.println(rs.getString(1));
+ }
stmt.executeUpdate("DELETE FROM O_CUSTOMER WHERE c_id=100");
rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- System.out.println( rs );
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if (rs != null ) {
- try { rs.close(); } catch( Exception e1 ) {}
- }
- if (stmt != null ) {
- try { stmt.close(); } catch( Exception e1 ) {}
- }
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ System.out.println( rs );
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if (rs != null ) {
+ try { rs.close(); } catch( Exception e1 ) {}
+ }
+ if (stmt != null ) {
+ try { stmt.close(); } catch( Exception e1 ) {}
+ }
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
-
+
public void ejbLoad() {}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/create_pointbase.sql
index dd31599..f13ff8b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_CUSTOMER;
-
-CREATE TABLE O_CUSTOMER (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_CUSTOMER;
+
+CREATE TABLE O_CUSTOMER (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.properties
index 8cdd5ac..50ac500 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-simpleora"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.xml
index b302dcf..ecdfdac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/build.xml
@@ -40,7 +40,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"/>
@@ -52,13 +52,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-oracle-common"/>
@@ -71,14 +71,14 @@
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-oracle-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="undeploy-jdbc-oracle-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/client/SimpleBMPClient.java
index 93a503f..85a2442 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/client/SimpleBMPClient.java
@@ -29,39 +29,39 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "jdbcsimpleora ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "jdbcsimpleora ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("Simple OracleDD test ");
+ stat.addDescription("Simple OracleDD test ");
-
+
if ( simpleBMP.test1(10) ) {
- stat.addStatus(testSuite+"test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test1 : ", stat.FAIL);
- }
-
- if ( simpleBMP.test2() ) {
- stat.addStatus(testSuite+"test2 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test2 : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+"test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test1 : ", stat.FAIL);
+ }
- if ( simpleBMP.test3() ) {
- stat.addStatus(testSuite+"test3 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+"test3 : ", stat.FAIL);
- }
+ if ( simpleBMP.test2() ) {
+ stat.addStatus(testSuite+"test2 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test2 : ", stat.FAIL);
+ }
- System.out.println("jdbc simpleora status: ");
- stat.printSummary();
-
-
+ if ( simpleBMP.test3() ) {
+ stat.addStatus(testSuite+"test3 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+"test3 : ", stat.FAIL);
+ }
+
+ System.out.println("jdbc simpleora status: ");
+ stat.printSummary();
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/ejb-jar.xml
index 20d716e..5ac9a4b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/ejb-jar.xml
@@ -63,6 +63,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/sun-ejb-jar.xml
index 6f4a404..f3a4375 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.simpleora.ejb.SimpleBMPHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/oracleres</jndi-name>
+ <jndi-name>jdbc/oracleres</jndi-name>
<default-resource-principal>
<name>scott</name>
<password>tiger</password>
@@ -35,7 +35,7 @@
</resource-ref>
<resource-ref>
<res-ref-name>DataSource1</res-ref-name>
- <jndi-name>jdbc/oracleres</jndi-name>
+ <jndi-name>jdbc/oracleres</jndi-name>
<default-resource-principal>
<name>scott</name>
<password>tiger</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
index f20cc0f..f2e6d56 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
@@ -31,120 +31,120 @@
protected DataSource ds1;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- ds1 = (DataSource) context.lookup("java:comp/env/DataSource1");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ ds1 = (DataSource) context.lookup("java:comp/env/DataSource1");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
/* Get 10 connections in a bunch and then close them*/
public boolean test1( int numRuns ) {
- boolean passed = true;
- Connection[] conns = new Connection[10];
+ boolean passed = true;
+ Connection[] conns = new Connection[10];
for( int i = 0; i < numRuns; i++ ) {
- try {
- conns[i] = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- }
+ try {
+ conns[i] = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
}
-
- for (int i = 0 ; i < numRuns;i++ ) {
- try {
- conns[i].close();
- } catch( Exception e) {
- passed = false;
- }
- }
- return passed;
+ }
+
+ for (int i = 0 ; i < numRuns;i++ ) {
+ try {
+ conns[i].close();
+ } catch( Exception e) {
+ passed = false;
+ }
+ }
+ return passed;
}
/* Get a single connection and close it */
public boolean test2() {
Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Statement stmt = null;
+ ResultSet rs = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- stmt = conn.createStatement();
- rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getString(1));
- }
- stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
+ try {
+ conn = ds.getConnection();
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
+ while( rs.next() ) {
+ System.out.println(rs.getString(1));
+ }
+ stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getString(1));
- }
+ while( rs.next() ) {
+ System.out.println(rs.getString(1));
+ }
stmt.executeUpdate("DELETE FROM O_CUSTOMER WHERE c_id=100");
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if (rs != null ) {
- try { rs.close(); } catch( Exception e1 ) {}
- }
- if (stmt != null ) {
- try { stmt.close(); } catch( Exception e1 ) {}
- }
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
-
- }
-
- return passed;
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if (rs != null ) {
+ try { rs.close(); } catch( Exception e1 ) {}
+ }
+ if (stmt != null ) {
+ try { stmt.close(); } catch( Exception e1 ) {}
+ }
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+
+ }
+
+ return passed;
}
/** Application auth */
public boolean test3() {
Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ Statement stmt = null;
+ ResultSet rs = null;
boolean passed = true;
- try {
- conn = ds1.getConnection("scott", "tiger");
- stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
+ try {
+ conn = ds1.getConnection("scott", "tiger");
+ stmt = conn.createStatement();
+ stmt.executeUpdate("INSERT INTO O_CUSTOMER values (100, 'new phone')");
rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- while( rs.next() ) {
- System.out.println(rs.getString(1));
- }
+ while( rs.next() ) {
+ System.out.println(rs.getString(1));
+ }
stmt.executeUpdate("DELETE FROM O_CUSTOMER WHERE c_id=100");
rs = stmt.executeQuery( "SELECT * FROM O_CUSTOMER");
- System.out.println( rs );
- } catch (Exception e) {
- passed = false;
- e.printStackTrace();
- } finally {
- if (rs != null ) {
- try { rs.close(); } catch( Exception e1 ) {}
- }
- if (stmt != null ) {
- try { stmt.close(); } catch( Exception e1 ) {}
- }
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ System.out.println( rs );
+ } catch (Exception e) {
+ passed = false;
+ e.printStackTrace();
+ } finally {
+ if (rs != null ) {
+ try { rs.close(); } catch( Exception e1 ) {}
+ }
+ if (stmt != null ) {
+ try { stmt.close(); } catch( Exception e1 ) {}
+ }
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
-
+
public void ejbLoad() {}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/create_pointbase.sql
index dd31599..f13ff8b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_CUSTOMER;
-
-CREATE TABLE O_CUSTOMER (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_CUSTOMER;
+
+CREATE TABLE O_CUSTOMER (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.properties
index 05a29ca..37e3ca6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementwrapper"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.xml
index 26e31a7..8e26589 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/build.xml
@@ -42,7 +42,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -54,13 +54,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -89,9 +89,9 @@
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="server.monitoring-service.module-monitoring-levels.jdbc-connection-pool=OFF"/>
@@ -108,7 +108,7 @@
<param name="appclient.application.args" value="2"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -121,7 +121,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/client/SimpleBMPClient.java
index b7bb9ca..910d6b2 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/client/SimpleBMPClient.java
@@ -33,22 +33,22 @@
public static SimpleReporterAdapter stat = new SimpleReporterAdapter();
public static final Object lock = new Object();
- public static int NO_OF_THREADS = 5;
+ public static int NO_OF_THREADS = 5;
public static final int JMX_PORT = 8686;
public static final String HOST_NAME = "localhost";
public long sumTotal = 0;
public boolean successExecuting = true;
public SimpleBMPClient(int option){
- if(option == 1) {
+ if(option == 1) {
execute();
- } else if(option == 2) {
- try {
- getMonitorablePropertyOfConnectionPool("ql-jdbc-pool", "frequsedsqlqueries");
- } catch(Exception ex) {
+ } else if(option == 2) {
+ try {
+ getMonitorablePropertyOfConnectionPool("ql-jdbc-pool", "frequsedsqlqueries");
+ } catch(Exception ex) {
ex.printStackTrace();
- }
- }
+ }
+ }
}
private void execute() {
@@ -65,40 +65,40 @@
}
if(successExecuting) {
- stat.addStatus("SQL Trace monitoring Test1 ", stat.PASS);
- } else {
- stat.addStatus("SQL Trace monitoring Test1 ", stat.FAIL);
- }
+ stat.addStatus("SQL Trace monitoring Test1 ", stat.PASS);
+ } else {
+ stat.addStatus("SQL Trace monitoring Test1 ", stat.FAIL);
+ }
stat.printSummary();
}
public static void main(String[] args)
throws Exception {
- stat.addDescription("SQL Tracing tests");
+ stat.addDescription("SQL Tracing tests");
if (args != null && args.length > 0) {
String param = args[0];
switch (Integer.parseInt(param)) {
case 1: {//run the threads
- new SimpleBMPClient(1);
- break;
- }
- case 2: { //compare monitoring stats
+ new SimpleBMPClient(1);
+ break;
+ }
+ case 2: { //compare monitoring stats
new SimpleBMPClient(2);
- break;
- }
- }
- }
+ break;
+ }
+ }
+ }
}
class WorkerThread extends Thread{
- private int timesToExecuteQuery = 0;
+ private int timesToExecuteQuery = 0;
public WorkerThread(int noExecs, String name){
- super(name);
- timesToExecuteQuery = noExecs;
+ super(name);
+ timesToExecuteQuery = noExecs;
}
public void run() {
@@ -109,62 +109,62 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- String tableName = Thread.currentThread().getName();
- String tableValue = "iiop";
- for(int i=0; i<timesToExecuteQuery; i++) {
+ String tableName = Thread.currentThread().getName();
+ String tableValue = "iiop";
+ for(int i=0; i<timesToExecuteQuery; i++) {
simpleBMP.preparedStatementTest1(tableName, tableValue);
- }
+ }
}catch(Exception e){
System.out.println("Thread : " + Thread.currentThread().getName() + "did not run ");
e.printStackTrace();
- SimpleBMPClient.this.successExecuting = false;
+ SimpleBMPClient.this.successExecuting = false;
}
}
}
public void getMonitorablePropertyOfConnectionPool(String poolName, String monitoringStat) throws Exception {
- boolean passed = false;
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ boolean passed = false;
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
new ObjectName("amx:pp=/mon/server-mon[server],type=jdbcra-mon,name=resources/" + poolName);
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, monitoringStat);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, monitoringStat);
- String freqUsedQueries = (String) returnValue.get("current");
- String delimiter = "%%%EOL%%%";
- StringTokenizer st = new StringTokenizer(freqUsedQueries, delimiter);
+ String freqUsedQueries = (String) returnValue.get("current");
+ String delimiter = "%%%EOL%%%";
+ StringTokenizer st = new StringTokenizer(freqUsedQueries, delimiter);
- List<String> queryList = new LinkedList<String>();
- List<String> expectedQueryList = new LinkedList<String>();
- expectedQueryList.add("select * from customer_stmt_wrapper5 where c_phone= ?");
- expectedQueryList.add("select * from customer_stmt_wrapper4 where c_phone= ?");
- expectedQueryList.add("select * from customer_stmt_wrapper3 where c_phone= ?");
+ List<String> queryList = new LinkedList<String>();
+ List<String> expectedQueryList = new LinkedList<String>();
+ expectedQueryList.add("select * from customer_stmt_wrapper5 where c_phone= ?");
+ expectedQueryList.add("select * from customer_stmt_wrapper4 where c_phone= ?");
+ expectedQueryList.add("select * from customer_stmt_wrapper3 where c_phone= ?");
- while(st.hasMoreTokens()) {
- String query = st.nextToken().trim();
- if(!query.equals("")) {
- queryList.add(query);
- }
- }
- /*for(int k=0; k<queryList.size(); k++) {
- System.out.println(">>>>> query=" + queryList.get(k));
- }*/
+ while(st.hasMoreTokens()) {
+ String query = st.nextToken().trim();
+ if(!query.equals("")) {
+ queryList.add(query);
+ }
+ }
+ /*for(int k=0; k<queryList.size(); k++) {
+ System.out.println(">>>>> query=" + queryList.get(k));
+ }*/
- passed = expectedQueryList.equals(queryList);
-
- if(passed) {
- stat.addStatus("SQL Trace monitoring Test2 ", stat.PASS);
- } else {
- stat.addStatus("SQL Trace monitoring Test2 ", stat.FAIL);
- }
+ passed = expectedQueryList.equals(queryList);
+
+ if(passed) {
+ stat.addStatus("SQL Trace monitoring Test2 ", stat.PASS);
+ } else {
+ stat.addStatus("SQL Trace monitoring Test2 ", stat.FAIL);
+ }
stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/descriptor/ejb-jar.xml
index 375993e..7b24b38 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
index 2d0cf8b..affd530 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
@@ -27,17 +27,17 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/jdbc/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/jdbc/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean preparedStatementTest1(String tableName, String value){
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/sql/create_pointbase.sql
index cb74e26..684e27c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/sql/create_pointbase.sql
@@ -1,46 +1,46 @@
-Drop table customer_stmt_wrapper1;
-
-CREATE TABLE customer_stmt_wrapper1 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop');
-
-Drop table customer_stmt_wrapper2;
-
-CREATE TABLE customer_stmt_wrapper2 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop');
-
-Drop table customer_stmt_wrapper3;
-
-CREATE TABLE customer_stmt_wrapper3 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop');
-
-Drop table customer_stmt_wrapper4;
-
-CREATE TABLE customer_stmt_wrapper4 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop');
-
-Drop table customer_stmt_wrapper5;
-
-CREATE TABLE customer_stmt_wrapper5 (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop');
-
+Drop table customer_stmt_wrapper1;
+
+CREATE TABLE customer_stmt_wrapper1 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop');
+
+Drop table customer_stmt_wrapper2;
+
+CREATE TABLE customer_stmt_wrapper2 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop');
+
+Drop table customer_stmt_wrapper3;
+
+CREATE TABLE customer_stmt_wrapper3 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop');
+
+Drop table customer_stmt_wrapper4;
+
+CREATE TABLE customer_stmt_wrapper4 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop');
+
+Drop table customer_stmt_wrapper5;
+
+CREATE TABLE customer_stmt_wrapper5 (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop');
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.properties
index 05a29ca..37e3ca6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementwrapper"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.xml
index 2e0cbe5..4518c8c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -79,9 +79,9 @@
<!-- Creating another ds for comparison of records -->
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="second-pool"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientDataSource"/>
- <param name="jdbc.resource.type" value="javax.sql.DataSource"/>
- <param name="jdbc.resource.name" value="jdbc/compareDS"/>
+ <param name="db.class" value="org.apache.derby.jdbc.ClientDataSource"/>
+ <param name="jdbc.resource.type" value="javax.sql.DataSource"/>
+ <param name="jdbc.resource.name" value="jdbc/compareDS"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -91,9 +91,9 @@
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <!--<antcall target="execute-sql-common">
+ <!--<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>-->
<antcall target="asadmin-common">
@@ -108,7 +108,7 @@
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -121,7 +121,7 @@
</antcall>
<antcall target="undeploy-jdbc-common"/>
<antcall target="delete-jdbc-resource-common">
- <param name="jdbc.resource.name" value="jdbc/compareDS"/>
+ <param name="jdbc.resource.name" value="jdbc/compareDS"/>
</antcall>
<antcall target="delete-jdbc-connpool-common">
@@ -129,7 +129,7 @@
</antcall>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/client/SimpleBMPClient.java
index 64d2e1f..e2124a1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/client/SimpleBMPClient.java
@@ -64,11 +64,11 @@
stat.addStatus(testSuite + " statementTest : ", stat.FAIL);
}
- if(getMonitorablePropertyOfConnectionPool() == 2) {
+ if(getMonitorablePropertyOfConnectionPool() == 2) {
stat.addStatus(testSuite + " Monitoring after statementTest : ", stat.PASS);
- } else {
+ } else {
stat.addStatus(testSuite + " Monitoring after statementTest : ", stat.FAIL);
- }
+ }
//Testing PreparedStatement object
for (int i = 0; i < 2; i++) {
SimpleBMPHome simpleBMPHome = (SimpleBMPHome) javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
@@ -90,11 +90,11 @@
stat.addStatus(testSuite + " preparedStatementTest : ", stat.FAIL);
}
- if(getMonitorablePropertyOfConnectionPool() == 4) {
+ if(getMonitorablePropertyOfConnectionPool() == 4) {
stat.addStatus(testSuite + " Monitoring after preparedStatementTest : ", stat.PASS);
- } else {
+ } else {
stat.addStatus(testSuite + " Monitoring after preparedStatementTest : ", stat.FAIL);
- }
+ }
//Testing CallableStatement objects
for (int i = 0; i < 2; i++) {
SimpleBMPHome simpleBMPHome = (SimpleBMPHome) javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
@@ -116,30 +116,30 @@
stat.addStatus(testSuite + " callableStatementTest : ", stat.FAIL);
}
- if(getMonitorablePropertyOfConnectionPool() == 6) {
+ if(getMonitorablePropertyOfConnectionPool() == 6) {
stat.addStatus(testSuite + " Monitoring after callableStatementTest : ", stat.PASS);
- } else {
+ } else {
stat.addStatus(testSuite + " Monitoring after callableStatementTest : ", stat.FAIL);
- }
+ }
stat.printSummary();
}
public static int getMonitorablePropertyOfConnectionPool() throws Exception {
- final String monitoringStat = "numpotentialstatementleak";
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ final String monitoringStat = "numpotentialstatementleak";
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
new ObjectName("amx:pp=/mon/server-mon[server],type=jdbcra-mon,name=resources/" + poolName);
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, monitoringStat);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, monitoringStat);
- System.out.println(">>>" + monitoringStat + "=" + returnValue.get("count"));
+ System.out.println(">>>" + monitoringStat + "=" + returnValue.get("count"));
return new Integer(returnValue.get("count").toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/descriptor/ejb-jar.xml
index 29cf2ae..6c1a37b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/descriptor/ejb-jar.xml
@@ -63,6 +63,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
index 74aa810..53104c7 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
@@ -137,7 +137,7 @@
Connection conFromDS = null;
Connection conFromCompareDS = null;
CallableStatement stmt = null;
- PreparedStatement stmt1 = null;
+ PreparedStatement stmt1 = null;
try {
conFromDS = ds.getConnection();
conFromCompareDS = compareDs.getConnection();
@@ -150,7 +150,7 @@
stmt1.executeUpdate();
} catch (SQLException sqe) {
- result = false;
+ result = false;
} finally {
try {
if (stmt1 != null) {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/sql/create_pointbase.sql
index b50ddec..c199783 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/sql/create_pointbase.sql
@@ -1,17 +1,17 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
-INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
-
-Drop table COMPARE_RECORDS;
-
-CREATE TABLE COMPARE_RECORDS(
- REC_STMT_TYPE char(5),
- REC_STMT integer
-);
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
+
+Drop table COMPARE_RECORDS;
+
+CREATE TABLE COMPARE_RECORDS(
+ REC_STMT_TYPE char(5),
+ REC_STMT integer
+);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.properties
index 45073d5..15f7f51 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementtimeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.xml
index 35ce7a0..7d73134 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/build.xml
@@ -70,7 +70,7 @@
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
- <antcall target="deploy-jdbc-common"/>
+ <antcall target="deploy-jdbc-common"/>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/client/SimpleBMPClient.java
index c7d48fa..491bfc4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/client/SimpleBMPClient.java
@@ -36,7 +36,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("JDBC Statement Timeout Tests");
+ stat.addDescription("JDBC Statement Timeout Tests");
if (simpleBMP.statementTest()) {
stat.addStatus(testSuite + " statementTest : ", SimpleReporterAdapter.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/sql/create_pointbase.sql
index dd4c5e5..11e61ee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/sql/create_pointbase.sql
@@ -1,10 +1,10 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.properties
index 05a29ca..37e3ca6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementwrapper"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.xml
index f1caeb8..ac44fac 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -63,14 +63,14 @@
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -78,7 +78,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/client/SimpleBMPClient.java
index dcbe04e..86d7a7a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/client/SimpleBMPClient.java
@@ -29,28 +29,28 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "StatementWrapper ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "StatementWrapper ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
stat.addDescription("JDBC Statement Wrapper Tests");
if ( simpleBMP.statementTest() ) {
- stat.addStatus(testSuite+" statementTest : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" statementTest : ", stat.FAIL);
- }
+ stat.addStatus(testSuite+" statementTest : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" statementTest : ", stat.FAIL);
+ }
- if ( simpleBMP.preparedStatementTest() ) {
- stat.addStatus(testSuite+" preparedStatementTest : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" preparedStatementTest : ", stat.FAIL);
- }
+ if ( simpleBMP.preparedStatementTest() ) {
+ stat.addStatus(testSuite+" preparedStatementTest : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" preparedStatementTest : ", stat.FAIL);
+ }
if ( simpleBMP.callableStatementTest() ) {
stat.addStatus(testSuite+" callableStatementTest : ", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/descriptor/ejb-jar.xml
index c90e9be..a568b82 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
index 97aead0..38a8c77 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
@@ -28,18 +28,18 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean statementTest() {
@@ -52,8 +52,8 @@
stmt = conFromDS.createStatement();
conFromStatement = stmt.getConnection();
- System.out.println("statement Test : conFromDS : " + conFromDS);
- System.out.println("statement Test : conFromStatement : " + conFromStatement);
+ System.out.println("statement Test : conFromDS : " + conFromDS);
+ System.out.println("statement Test : conFromStatement : " + conFromStatement);
if( conFromDS==conFromStatement || conFromDS.equals(conFromStatement) ){
result = true;
@@ -84,8 +84,8 @@
stmt = conFromDS.prepareStatement("select * from customer_stmt_wrapper");
conFromStatement = stmt.getConnection();
- System.out.println("Prepared statement Test : conFromDS : " + conFromDS);
- System.out.println("Prepared statement Test : conFromStatement : " + conFromStatement);
+ System.out.println("Prepared statement Test : conFromDS : " + conFromDS);
+ System.out.println("Prepared statement Test : conFromStatement : " + conFromStatement);
if( conFromDS==conFromStatement || conFromDS.equals(conFromStatement) ){
result = true;
}
@@ -115,8 +115,8 @@
stmt = conFromDS.prepareCall("select * from customer_stmt_wrapper");
conFromStatement = stmt.getConnection();
- System.out.println("Callable statement Test : conFromDS : " + conFromDS);
- System.out.println("Callable statement Test : conFromStatement : " + conFromStatement);
+ System.out.println("Callable statement Test : conFromDS : " + conFromDS);
+ System.out.println("Callable statement Test : conFromStatement : " + conFromStatement);
if( conFromDS==conFromStatement || conFromDS.equals(conFromStatement) ){
result = true;
}
@@ -146,8 +146,8 @@
dbmd = conFromDS.getMetaData();
conFromMetaData = dbmd.getConnection();
- System.out.println("statementTest : conFromDS : " + conFromDS);
- System.out.println("statementTest : conFromDbMetadata : " + conFromMetaData);
+ System.out.println("statementTest : conFromDS : " + conFromDS);
+ System.out.println("statementTest : conFromDbMetadata : " + conFromMetaData);
if( conFromDS==conFromMetaData || conFromDS.equals(conFromMetaData) ){
result = true;
}
@@ -173,8 +173,8 @@
rs = stmt.executeQuery("select * from customer_stmt_wrapper");
conFromResultSet = rs.getStatement().getConnection();
- System.out.println("ResultSet test : conFromDS : " + conFromDS);
- System.out.println("ResultSet test : conFromResultSet: " + conFromResultSet);
+ System.out.println("ResultSet test : conFromDS : " + conFromDS);
+ System.out.println("ResultSet test : conFromResultSet: " + conFromResultSet);
if( conFromDS==conFromResultSet || conFromDS.equals(conFromResultSet) ){
result = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/sql/create_pointbase.sql
index dd4c5e5..11e61ee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/sql/create_pointbase.sql
@@ -1,10 +1,10 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.properties
index 74a2979..102f15c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-stmtcaching_hit_miss"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.xml
index e96f49e..e42b779 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/build.xml
@@ -69,7 +69,7 @@
</target>
<target name="undeploy" depends="init-common">
- <antcall target="execute-sql-common">
+ <antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
@@ -92,18 +92,18 @@
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.statement_cache_size=5"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.statement_cache_type=FIXED"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.wrap_jdbc_objects=true"/>
@@ -115,10 +115,10 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.idle_timeout_in_seconds=3000"/>
</antcall>
- <!--<antcall target="asadmin-common">
+ <!--<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.property.StatementCacheType="/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.property.StatementCacheType="/>
</antcall>-->
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/ejb-jar.xml
index 9247e9e..8ecdb32 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/ejb-jar.xml
@@ -43,8 +43,8 @@
<res-ref-name>DataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
+ <res-sharing-scope>Unshareable</res-sharing-scope>
+ </resource-ref>
</entity>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/sun-ejb-jar.xml
index f33f641..25c9ef5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.stmtcaching.ejb.SimpleBMPHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/jdbc-stmtcaching_hit_miss</jndi-name>
+ <jndi-name>jdbc/jdbc-stmtcaching_hit_miss</jndi-name>
<default-resource-principal>
<name>DBUSER</name>
<password>DBPASSWORD</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
index bcf3676..a535415 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
@@ -41,100 +41,100 @@
}
public boolean testHit() {
- System.out.println("Statement caching Hit test Start");
+ System.out.println("Statement caching Hit test Start");
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- System.out.println(">>>> conn = " + conn.hashCode());
- }catch(Exception ex) {
- }
+ System.out.println(">>>> conn = " + conn.hashCode());
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?");
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
- int[] columnIndexes = {i+1, i+2};
+ if(i == 6) {
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?");
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
+ int[] columnIndexes = {i+1, i+2};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
/* if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }*/
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit test End");
- return passed;
+ }*/
+ } catch(Exception ex) {
+ ex.printStackTrace();
}
-
+ System.out.println("Statement caching Hit test End");
+ return passed;
+ }
+
public boolean testMiss() {
- System.out.println("Statement caching Hit after Miss test Start");
+ System.out.println("Statement caching Hit after Miss test Start");
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
Connection conn = null;
try {
conn = ds.getConnection();
- System.out.println(">>>> conn = " + conn.hashCode());
+ System.out.println(">>>> conn = " + conn.hashCode());
} catch(Exception ex) {}
boolean passed = false;
for (int i = 1; i < 8; i++) {
try {
- if(i == 6) {
- //stmt = conn.prepareStatement("select * from " + tableName + tableIndex + " where c_phone=?");
+ if(i == 6) {
+ //stmt = conn.prepareStatement("select * from " + tableName + tableIndex + " where c_phone=?");
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
@@ -142,155 +142,155 @@
}
}
passed = firstStatement != lastStatement;
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
-/* if(conn != null) {
- conn.close();
- }*/
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit after Miss test End");
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
+/* if(conn != null) {
+ conn.close();
+ }*/
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit after Miss test End");
return passed;
}
public boolean testHitColumnNames() {
- System.out.println("Statement caching Hit (Column Names) test Start");
+ System.out.println("Statement caching Hit (Column Names) test Start");
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- System.out.println(">>>> conn = " + conn.hashCode());
- }catch(Exception ex) {
- }
+ System.out.println(">>>> conn = " + conn.hashCode());
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- String[] columnNames = {"c_id", "c_phone"};
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else if(i ==1) {
- String[] columnNames = {"c_id", "c_phone"};
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- } else {
- int j = i + 2;
+ if(i == 6) {
+ String[] columnNames = {"c_id", "c_phone"};
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else if(i ==1) {
+ String[] columnNames = {"c_id", "c_phone"};
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ } else {
+ int j = i + 2;
int k = j + 1;
- String[] columnNames = {"c_id"+j, "c_id"+k};
+ String[] columnNames = {"c_id"+j, "c_id"+k};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?", columnNames);
- }
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
/* if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }*/
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit (Column names) test End");
- return passed;
+ }*/
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit (Column names) test End");
+ return passed;
}
public boolean testHitColumnIndexes() {
- System.out.println("Statement caching Hit (Column indexes) test Start");
+ System.out.println("Statement caching Hit (Column indexes) test Start");
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- System.out.println(">>>> conn = " + conn.hashCode());
- }catch(Exception ex) {
- }
+ System.out.println(">>>> conn = " + conn.hashCode());
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnIndexes6);
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
- //First stmt executed would have {2,3} same as columnIndexes6
- int[] columnIndexes = {i+1, i+2};
+ if(i == 6) {
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnIndexes6);
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
+ //First stmt executed would have {2,3} same as columnIndexes6
+ int[] columnIndexes = {i+1, i+2};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?", columnIndexes);
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
/*if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
} */
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit (Column indexes) test End");
- return passed;
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit (Column indexes) test End");
+ return passed;
}
public void ejbLoad() {
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/create_pointbase.sql
index 82f34a6..988d2e9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/create_pointbase.sql
@@ -1,161 +1,161 @@
-drop table customer_stmt_wrapper1;
-drop table customer_stmt_wrapper2;
-drop table customer_stmt_wrapper3;
-drop table customer_stmt_wrapper4;
-drop table customer_stmt_wrapper5;
-drop table customer_stmt_wrapper6;
-drop table customer_stmt_wrapper7;
-drop table customer_stmt_wrapper8;
-drop table customer_stmt_wrapper9;
-drop table customer_stmt_wrapper10;
-CREATE TABLE customer_stmt_wrapper1 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-
-);
-
-INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper2 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper3 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-CREATE TABLE customer_stmt_wrapper4 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper5 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-
-
-CREATE TABLE customer_stmt_wrapper6 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper6 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper7 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper7 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper8 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper8 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper9 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper9 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper10 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper10 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+drop table customer_stmt_wrapper1;
+drop table customer_stmt_wrapper2;
+drop table customer_stmt_wrapper3;
+drop table customer_stmt_wrapper4;
+drop table customer_stmt_wrapper5;
+drop table customer_stmt_wrapper6;
+drop table customer_stmt_wrapper7;
+drop table customer_stmt_wrapper8;
+drop table customer_stmt_wrapper9;
+drop table customer_stmt_wrapper10;
+CREATE TABLE customer_stmt_wrapper1 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+
+);
+
+INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper2 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper3 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+CREATE TABLE customer_stmt_wrapper4 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper5 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+
+
+CREATE TABLE customer_stmt_wrapper6 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper6 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper7 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper7 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper8 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper8 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper9 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper9 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper10 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper10 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/drop_pointbase.sql
index cb98378..f64c6e4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/sql/drop_pointbase.sql
@@ -1,10 +1,10 @@
-drop table customer_stmt_wrapper1;
-drop table customer_stmt_wrapper2;
-drop table customer_stmt_wrapper3;
-drop table customer_stmt_wrapper4;
-drop table customer_stmt_wrapper5;
-drop table customer_stmt_wrapper6;
-drop table customer_stmt_wrapper7;
-drop table customer_stmt_wrapper8;
-drop table customer_stmt_wrapper9;
-drop table customer_stmt_wrapper10;
+drop table customer_stmt_wrapper1;
+drop table customer_stmt_wrapper2;
+drop table customer_stmt_wrapper3;
+drop table customer_stmt_wrapper4;
+drop table customer_stmt_wrapper5;
+drop table customer_stmt_wrapper6;
+drop table customer_stmt_wrapper7;
+drop table customer_stmt_wrapper8;
+drop table customer_stmt_wrapper9;
+drop table customer_stmt_wrapper10;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.properties
index 74a2979..102f15c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-stmtcaching_hit_miss"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.xml
index d235bde..4892811 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/build.xml
@@ -79,7 +79,7 @@
</target>
<target name="undeploy" depends="init-common">
- <antcall target="execute-sql-common">
+ <antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
@@ -100,13 +100,13 @@
<param name="jdbc.resource.name" value="jdbc/jdbc-stmtcaching_hit_miss"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc/jdbc-stmtcaching_hit_miss-pool.statement_cache_size=5"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc/jdbc-stmtcaching_hit_miss-pool.wrap_jdbc_objects=true"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/client/Client.java
index 49f5205..df2c8f1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/client/Client.java
@@ -54,34 +54,34 @@
stat.addDescription("Statement Caching Hit miss tests");
if (simpleBMP.testHit() && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_HITS) == 1 && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_MISSES) == 5) {
- System.out.println("HIT pass");
+ System.out.println("HIT pass");
stat.addStatus(" Statement Caching - (Hit): ", stat.PASS);
} else {
- System.out.println("HIT fail");
+ System.out.println("HIT fail");
stat.addStatus(" Statement Caching - (Hit): ", stat.FAIL);
}
if (simpleBMP.testMiss() && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_HITS) == 6 && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_MISSES) == 7) {
- System.out.println("MISS pass");
+ System.out.println("MISS pass");
stat.addStatus(" Statement Caching - (Miss): ", stat.PASS);
} else {
- System.out.println("MISS fail");
+ System.out.println("MISS fail");
stat.addStatus(" Statement Caching - (Miss): ", stat.FAIL);
}
if (simpleBMP.testHitColumnIndexes() && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_HITS) == 7 && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_MISSES) == 12) {
- System.out.println("columnIndexes pass");
+ System.out.println("columnIndexes pass");
stat.addStatus(" Statement Caching - (hit columnIndexes) : ", stat.PASS);
} else {
- System.out.println("columnIndexes fail");
+ System.out.println("columnIndexes fail");
stat.addStatus(" Statement Caching - (hit columnIndexes) : ", stat.FAIL);
}
if (simpleBMP.testHitColumnNames() && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_HITS) == 8 && getMonitorablePropertyOfConnectionPool("jdbc/jdbc-stmtcaching_hit_miss-pool",NUM_MISSES) == 17) {
- System.out.println("columnNames pass");
+ System.out.println("columnNames pass");
stat.addStatus(" Statement Caching - (hit columnNames) : ", stat.PASS);
} else {
- System.out.println("columnNames fail");
+ System.out.println("columnNames fail");
stat.addStatus(" Statement Caching - (hit columnNames) : ", stat.FAIL);
}
stat.printSummary();
@@ -89,20 +89,20 @@
public int getMonitorablePropertyOfConnectionPool(String poolName, String monitoringStat) throws Exception {
- final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
+ final String urlStr = "service:jmx:rmi:///jndi/rmi://" + HOST_NAME + ":" + JMX_PORT + "/jmxrmi";
final JMXServiceURL url = new JMXServiceURL(urlStr);
- final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
- final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
+ final JMXConnector jmxConn = JMXConnectorFactory.connect(url);
+ final MBeanServerConnection connection = jmxConn.getMBeanServerConnection();
ObjectName objectName =
new ObjectName("amx:pp=/mon/server-mon[server],type=jdbcra-mon,name=resources/" + poolName);
- javax.management.openmbean.CompositeDataSupport returnValue =
- (javax.management.openmbean.CompositeDataSupport)
- connection.getAttribute(objectName, monitoringStat);
+ javax.management.openmbean.CompositeDataSupport returnValue =
+ (javax.management.openmbean.CompositeDataSupport)
+ connection.getAttribute(objectName, monitoringStat);
- System.out.println(">>>" + monitoringStat + "=" + returnValue.get("count"));
+ System.out.println(">>>" + monitoringStat + "=" + returnValue.get("count"));
return new Integer(returnValue.get("count").toString());
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/descriptor/sun-ejb-jar.xml
index f33f641..25c9ef5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.stmtcaching.ejb.SimpleBMPHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/jdbc-stmtcaching_hit_miss</jndi-name>
+ <jndi-name>jdbc/jdbc-stmtcaching_hit_miss</jndi-name>
<default-resource-principal>
<name>DBUSER</name>
<password>DBPASSWORD</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
index f81bde8..418099f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
@@ -41,83 +41,83 @@
}
public boolean testHit() {
- System.out.println("Statement caching Hit test Start");
+ System.out.println("Statement caching Hit test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- }catch(Exception ex) {
- }
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- System.out.println(">>> Last");
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?");
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
- int[] columnIndexes = {i+1, i+2};
+ if(i == 6) {
+ System.out.println(">>> Last");
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?");
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
+ int[] columnIndexes = {i+1, i+2};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- }
- if(i == 1) {
- System.out.println(">>> First");
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ System.out.println(">>> First");
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit test End");
- return passed;
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
}
-
+ System.out.println("Statement caching Hit test End");
+ return passed;
+ }
+
public boolean testMiss() {
- System.out.println("Statement caching Miss test Start");
+ System.out.println("Statement caching Miss test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
Connection conn = null;
try {
@@ -127,17 +127,17 @@
for (int i = 1; i < 8; i++) {
try {
- if(i ==7) {
- stmt = conn.prepareStatement("select * from " + tableName + tableIndex + " where c_phone=?");
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
+ if(i ==7) {
+ stmt = conn.prepareStatement("select * from " + tableName + tableIndex + " where c_phone=?");
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
@@ -145,157 +145,157 @@
}
}
passed = firstStatement != lastStatement;
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
- if(conn != null) {
- conn.close();
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Miss test End");
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
+ if(conn != null) {
+ conn.close();
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Miss test End");
return passed;
}
public boolean testHitColumnNames() {
- System.out.println("Statement caching Hit (Column Names) test Start");
+ System.out.println("Statement caching Hit (Column Names) test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- }catch(Exception ex) {
- }
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- String[] columnNames = {"c_id", "c_phone"};
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else if(i ==1) {
- String[] columnNames = {"c_id", "c_phone"};
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- } else {
- int j = i + 2;
+ if(i == 6) {
+ String[] columnNames = {"c_id", "c_phone"};
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else if(i ==1) {
+ String[] columnNames = {"c_id", "c_phone"};
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ } else {
+ int j = i + 2;
int k = j + 1;
- String[] columnNames = {"c_id"+j, "c_id"+k};
+ String[] columnNames = {"c_id"+j, "c_id"+k};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?", columnNames);
- }
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit (Column names) test End");
- return passed;
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit (Column names) test End");
+ return passed;
}
public boolean testHitColumnIndexes() {
- System.out.println("Statement caching Hit (Column indexes) test Start");
+ System.out.println("Statement caching Hit (Column indexes) test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- }catch(Exception ex) {
- }
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnIndexes6);
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
- //First stmt executed would have {2,3} same as columnIndexes6
- int[] columnIndexes = {i+1, i+2};
+ if(i == 6) {
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnIndexes6);
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
+ //First stmt executed would have {2,3} same as columnIndexes6
+ int[] columnIndexes = {i+1, i+2};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?", columnIndexes);
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit (Column indexes) test End");
- return passed;
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit (Column indexes) test End");
+ return passed;
}
public void ejbLoad() {
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/create_pointbase.sql
index 82f34a6..988d2e9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/create_pointbase.sql
@@ -1,161 +1,161 @@
-drop table customer_stmt_wrapper1;
-drop table customer_stmt_wrapper2;
-drop table customer_stmt_wrapper3;
-drop table customer_stmt_wrapper4;
-drop table customer_stmt_wrapper5;
-drop table customer_stmt_wrapper6;
-drop table customer_stmt_wrapper7;
-drop table customer_stmt_wrapper8;
-drop table customer_stmt_wrapper9;
-drop table customer_stmt_wrapper10;
-CREATE TABLE customer_stmt_wrapper1 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-
-);
-
-INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper2 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper3 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-CREATE TABLE customer_stmt_wrapper4 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper5 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-
-
-CREATE TABLE customer_stmt_wrapper6 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper6 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper7 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper7 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper8 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper8 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper9 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper9 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper10 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper10 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+drop table customer_stmt_wrapper1;
+drop table customer_stmt_wrapper2;
+drop table customer_stmt_wrapper3;
+drop table customer_stmt_wrapper4;
+drop table customer_stmt_wrapper5;
+drop table customer_stmt_wrapper6;
+drop table customer_stmt_wrapper7;
+drop table customer_stmt_wrapper8;
+drop table customer_stmt_wrapper9;
+drop table customer_stmt_wrapper10;
+CREATE TABLE customer_stmt_wrapper1 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+
+);
+
+INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper2 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper3 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+CREATE TABLE customer_stmt_wrapper4 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper5 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+
+
+CREATE TABLE customer_stmt_wrapper6 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper6 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper7 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper7 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper8 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper8 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper9 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper9 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper10 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper10 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/drop_pointbase.sql
index cb98378..f64c6e4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/sql/drop_pointbase.sql
@@ -1,10 +1,10 @@
-drop table customer_stmt_wrapper1;
-drop table customer_stmt_wrapper2;
-drop table customer_stmt_wrapper3;
-drop table customer_stmt_wrapper4;
-drop table customer_stmt_wrapper5;
-drop table customer_stmt_wrapper6;
-drop table customer_stmt_wrapper7;
-drop table customer_stmt_wrapper8;
-drop table customer_stmt_wrapper9;
-drop table customer_stmt_wrapper10;
+drop table customer_stmt_wrapper1;
+drop table customer_stmt_wrapper2;
+drop table customer_stmt_wrapper3;
+drop table customer_stmt_wrapper4;
+drop table customer_stmt_wrapper5;
+drop table customer_stmt_wrapper6;
+drop table customer_stmt_wrapper7;
+drop table customer_stmt_wrapper8;
+drop table customer_stmt_wrapper9;
+drop table customer_stmt_wrapper10;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.properties
index 74a2979..102f15c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-stmtcaching_hit_miss"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.xml
index d5ccc01..910f397 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/build.xml
@@ -69,7 +69,7 @@
</target>
<target name="undeploy" depends="init-common">
- <antcall target="execute-sql-common">
+ <antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
@@ -92,13 +92,13 @@
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.statement_cache_size=5"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.wrap_jdbc_objects=true"/>
@@ -110,10 +110,10 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.idle_timeout_in_seconds=3000"/>
</antcall>
- <!--<antcall target="asadmin-common">
+ <!--<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.property.StatementCacheType="/>
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stmtcaching_hit_miss-pool.property.StatementCacheType="/>
</antcall>-->
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/descriptor/sun-ejb-jar.xml
index f33f641..25c9ef5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/descriptor/sun-ejb-jar.xml
@@ -27,7 +27,7 @@
<jndi-name>com.sun.s1asdev.jdbc.stmtcaching.ejb.SimpleBMPHome</jndi-name>
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
- <jndi-name>jdbc/jdbc-stmtcaching_hit_miss</jndi-name>
+ <jndi-name>jdbc/jdbc-stmtcaching_hit_miss</jndi-name>
<default-resource-principal>
<name>DBUSER</name>
<password>DBPASSWORD</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
index 49a798f..f8d24b8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
@@ -41,81 +41,81 @@
}
public boolean testHit() {
- System.out.println("Statement caching Hit test Start");
+ System.out.println("Statement caching Hit test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- }catch(Exception ex) {
- }
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?");
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
- int[] columnIndexes = {i+1, i+2};
+ if(i == 6) {
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?");
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
+ int[] columnIndexes = {i+1, i+2};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit test End");
- return passed;
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
}
-
+ System.out.println("Statement caching Hit test End");
+ return passed;
+ }
+
public boolean testMiss() {
- System.out.println("Statement caching Miss test Start");
+ System.out.println("Statement caching Miss test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
Connection conn = null;
try {
@@ -125,17 +125,17 @@
for (int i = 1; i < 8; i++) {
try {
- if(i ==7) {
- stmt = conn.prepareStatement("select * from " + tableName + tableIndex + " where c_phone=?");
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
+ if(i ==7) {
+ stmt = conn.prepareStatement("select * from " + tableName + tableIndex + " where c_phone=?");
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?");
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
@@ -143,157 +143,157 @@
}
}
passed = firstStatement != lastStatement;
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
- if(conn != null) {
- conn.close();
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Miss test End");
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
+ if(conn != null) {
+ conn.close();
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Miss test End");
return passed;
}
public boolean testHitColumnNames() {
- System.out.println("Statement caching Hit (Column Names) test Start");
+ System.out.println("Statement caching Hit (Column Names) test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- }catch(Exception ex) {
- }
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- String[] columnNames = {"c_id", "c_phone"};
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else if(i ==1) {
- String[] columnNames = {"c_id", "c_phone"};
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- } else {
- int j = i + 2;
+ if(i == 6) {
+ String[] columnNames = {"c_id", "c_phone"};
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else if(i ==1) {
+ String[] columnNames = {"c_id", "c_phone"};
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnNames);
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ } else {
+ int j = i + 2;
int k = j + 1;
- String[] columnNames = {"c_id"+j, "c_id"+k};
+ String[] columnNames = {"c_id"+j, "c_id"+k};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?", columnNames);
- }
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit (Column names) test End");
- return passed;
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit (Column names) test End");
+ return passed;
}
public boolean testHitColumnIndexes() {
- System.out.println("Statement caching Hit (Column indexes) test Start");
+ System.out.println("Statement caching Hit (Column indexes) test Start");
Connection firstConnection = null;
Connection lastConnection = null;
com.sun.appserv.jdbc.DataSource ds = null;
PreparedStatement stmt = null;
- PreparedStatement firstStatement = null;
- PreparedStatement lastStatement = null;
+ PreparedStatement firstStatement = null;
+ PreparedStatement lastStatement = null;
String tableName = "customer_stmt_wrapper";
ds = this.ds;
- int tableIndex = 1;
+ int tableIndex = 1;
boolean passed = false;
Connection conn = null;
- try {
+ try {
conn = ds.getConnection();
- }catch(Exception ex) {
- }
+ }catch(Exception ex) {
+ }
for (int i = 1; i < 7; i++) {
- System.out.println("Index = " + i);
+ System.out.println("Index = " + i);
try {
- if(i == 6) {
- stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnIndexes6);
- lastStatement = stmt;
- System.out.println("lastStatement : " + lastStatement);
- } else {
- //First stmt executed would have {2,3} same as columnIndexes6
- int[] columnIndexes = {i+1, i+2};
+ if(i == 6) {
+ stmt = conn.prepareStatement("select * from "+ tableName + tableIndex + " where c_phone= ?", columnIndexes6);
+ lastStatement = stmt;
+ System.out.println("lastStatement : " + lastStatement);
+ } else {
+ //First stmt executed would have {2,3} same as columnIndexes6
+ int[] columnIndexes = {i+1, i+2};
stmt = conn.prepareStatement("select * from "+ tableName+i +" where c_phone= ?", columnIndexes);
- }
- if(i == 1) {
- firstStatement = stmt;
- System.out.println("firstStatement : " + firstStatement);
- }
+ }
+ if(i == 1) {
+ firstStatement = stmt;
+ System.out.println("firstStatement : " + firstStatement);
+ }
} catch (Exception e) {
e.printStackTrace();
passed = false;
} finally {
- if(stmt != null) {
- try {
- stmt.close();
- } catch(Exception ex) {}
- }
+ if(stmt != null) {
+ try {
+ stmt.close();
+ } catch(Exception ex) {}
+ }
}
}
- passed = (firstStatement == lastStatement);
- try {
- if(firstStatement != null) {
- firstStatement.close();
- }
- if(lastStatement != null) {
- lastStatement.close();
- }
+ passed = (firstStatement == lastStatement);
+ try {
+ if(firstStatement != null) {
+ firstStatement.close();
+ }
+ if(lastStatement != null) {
+ lastStatement.close();
+ }
if (conn != null) {
try {
conn.close();
} catch (Exception e1) {
}
- }
- } catch(Exception ex) {
- ex.printStackTrace();
- }
- System.out.println("Statement caching Hit (Column indexes) test End");
- return passed;
+ }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ System.out.println("Statement caching Hit (Column indexes) test End");
+ return passed;
}
public void ejbLoad() {
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/create_pointbase.sql
index 82f34a6..988d2e9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/create_pointbase.sql
@@ -1,161 +1,161 @@
-drop table customer_stmt_wrapper1;
-drop table customer_stmt_wrapper2;
-drop table customer_stmt_wrapper3;
-drop table customer_stmt_wrapper4;
-drop table customer_stmt_wrapper5;
-drop table customer_stmt_wrapper6;
-drop table customer_stmt_wrapper7;
-drop table customer_stmt_wrapper8;
-drop table customer_stmt_wrapper9;
-drop table customer_stmt_wrapper10;
-CREATE TABLE customer_stmt_wrapper1 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-
-);
-
-INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper2 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper3 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-CREATE TABLE customer_stmt_wrapper4 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper5 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-
-
-CREATE TABLE customer_stmt_wrapper6 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper6 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper7 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper7 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper8 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper8 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper9 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper9 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
-
-CREATE TABLE customer_stmt_wrapper10 (
- c_id integer not null,
- c_phone char(16),
- c_id3 integer not null,
- c_id4 integer not null,
- c_id5 integer not null,
- c_id6 integer not null,
- c_id7 integer not null,
- c_id8 integer not null,
- c_id9 integer not null,
- c_id10 integer not null
-);
-
-INSERT INTO customer_stmt_wrapper10 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+drop table customer_stmt_wrapper1;
+drop table customer_stmt_wrapper2;
+drop table customer_stmt_wrapper3;
+drop table customer_stmt_wrapper4;
+drop table customer_stmt_wrapper5;
+drop table customer_stmt_wrapper6;
+drop table customer_stmt_wrapper7;
+drop table customer_stmt_wrapper8;
+drop table customer_stmt_wrapper9;
+drop table customer_stmt_wrapper10;
+CREATE TABLE customer_stmt_wrapper1 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+
+);
+
+INSERT INTO customer_stmt_wrapper1 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper2 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper2 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper3 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper3 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+CREATE TABLE customer_stmt_wrapper4 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper4 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper5 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper5 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+
+
+CREATE TABLE customer_stmt_wrapper6 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper6 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper7 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper7 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper8 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper8 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper9 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper9 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
+
+CREATE TABLE customer_stmt_wrapper10 (
+ c_id integer not null,
+ c_phone char(16),
+ c_id3 integer not null,
+ c_id4 integer not null,
+ c_id5 integer not null,
+ c_id6 integer not null,
+ c_id7 integer not null,
+ c_id8 integer not null,
+ c_id9 integer not null,
+ c_id10 integer not null
+);
+
+INSERT INTO customer_stmt_wrapper10 VALUES(2, 'iiop', 3, 4, 5, 6, 7, 8, 9, 10);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/drop_pointbase.sql
index cb98378..f64c6e4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/sql/drop_pointbase.sql
@@ -1,10 +1,10 @@
-drop table customer_stmt_wrapper1;
-drop table customer_stmt_wrapper2;
-drop table customer_stmt_wrapper3;
-drop table customer_stmt_wrapper4;
-drop table customer_stmt_wrapper5;
-drop table customer_stmt_wrapper6;
-drop table customer_stmt_wrapper7;
-drop table customer_stmt_wrapper8;
-drop table customer_stmt_wrapper9;
-drop table customer_stmt_wrapper10;
+drop table customer_stmt_wrapper1;
+drop table customer_stmt_wrapper2;
+drop table customer_stmt_wrapper3;
+drop table customer_stmt_wrapper4;
+drop table customer_stmt_wrapper5;
+drop table customer_stmt_wrapper6;
+drop table customer_stmt_wrapper7;
+drop table customer_stmt_wrapper8;
+drop table customer_stmt_wrapper9;
+drop table customer_stmt_wrapper10;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/stress/build.properties
index e2ea740..3714fed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-stress"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="classes12.zip" value="/tmp/classes12.zip"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress/build.xml
index 330f11b..7c5d5d9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,22 +48,22 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<!-- Create the ORACLE connection pool connection pool and datasource -->
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.resource.type" value="javax.sql.DataSource"/>
<param name="jdbc.conpool.name" value="jdbc-stress"/>
- <param name="db.class" value="oracle.jdbc.pool.OracleDataSource"/>
- <param name="db.user" value="${ora.user}"/>
- <param name="db.pwd" value="${ora.passwd}"/>
- <param name="db.url" value="${ora.sid}"/>
+ <param name="db.class" value="oracle.jdbc.pool.OracleDataSource"/>
+ <param name="db.user" value="${ora.user}"/>
+ <param name="db.pwd" value="${ora.passwd}"/>
+ <param name="db.url" value="${ora.sid}"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -73,7 +73,7 @@
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stress.property.URL=${ora.url}"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-stress.property.ServerName=129.158.229.239"/>
@@ -86,22 +86,22 @@
</antcall>
-
- <antcall target="deploy-common"/>
+
+ <antcall target="deploy-common"/>
<echo message="Executing sql from ${sql.file}"/>
<sql
src="sql/create_pointbase.sql"
- driver="oracle.jdbc.driver.OracleDriver"
- userid="${ora.user}"
- password="${ora.passwd}"
- url="${ora.url}"
- classpath="${classes12.zip}"
- onerror="continue"
- print="yes"
+ driver="oracle.jdbc.driver.OracleDriver"
+ userid="${ora.user}"
+ password="${ora.passwd}"
+ url="${ora.url}"
+ classpath="${classes12.zip}"
+ onerror="continue"
+ print="yes"
/>
-
+
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
@@ -110,24 +110,24 @@
<echo message="Executing sql from ${sql.file}"/>
<sql
src="sql/drop_pointbase.sql"
- driver="oracle.jdbc.driver.OracleDriver"
- userid="${ora.user}"
- password="${ora.passwd}"
- url="${ora.url}"
- classpath="${classes12.zip}"
- onerror="continue"
- print="yes"
+ driver="oracle.jdbc.driver.OracleDriver"
+ userid="${ora.user}"
+ password="${ora.passwd}"
+ url="${ora.url}"
+ classpath="${classes12.zip}"
+ onerror="continue"
+ print="yes"
/>
- <antcall target="undeploy-common"/>
+ <antcall target="undeploy-common"/>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB-stress"/>
</antcall>
- <antcall target="delete-jdbc-connpool-common">
+ <antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-stress"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClient.java
index f2817e7..4fa35f8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClient.java
@@ -24,48 +24,48 @@
import com.sun.s1asdev.jdbc.stress.ejb.SimpleBMP;
public class SimpleBMPClient {
-
+
// Invoke with args: #clients, #minutes
public static void main(String[] args) throws Exception {
- int numClients = 10; //10 clients
- int numMinutes = 10; // 10 minutes
- if (args.length == 2) {
+ int numClients = 10; //10 clients
+ int numMinutes = 10; // 10 minutes
+ if (args.length == 2) {
numClients = Integer.parseInt( args[0] );
- numMinutes = Integer.parseInt( args[1] );
- }
-
+ numMinutes = Integer.parseInt( args[1] );
+ }
+
SimpleBMPClient client = new SimpleBMPClient();
- System.out.println("-=-=-=-=-=-=- Running for "+ numMinutes
- +" minutes -=-=-=-=-=-=-=-");
- client.runTest( numClients, numMinutes );
- }
-
+ System.out.println("-=-=-=-=-=-=- Running for "+ numMinutes
+ +" minutes -=-=-=-=-=-=-=-");
+ client.runTest( numClients, numMinutes );
+ }
+
public void runTest(int numClients, int numMinutes ) throws Exception {
SimpleBMPClientThread[] threads = new SimpleBMPClientThread[ numClients ];
- for (int i = 0 ; i < numClients; i++ ) {
- try {
- threads[i] = new SimpleBMPClientThread(i);
- } catch( Exception e) {
- System.out.println("Could not create thread : " + i);
- e.printStackTrace();
- }
- threads[i].start();
- }
-
- //Let it all run for few hours and then kill all threads
- System.out.println("Waiting for threads to do work now...");
- try {
- //numMinutes min * 60 sec * 1000 = millis
- Thread.sleep( numMinutes * 60 * 1000 );
- } catch(InterruptedException ie) {
- ie.printStackTrace();
- }
+ for (int i = 0 ; i < numClients; i++ ) {
+ try {
+ threads[i] = new SimpleBMPClientThread(i);
+ } catch( Exception e) {
+ System.out.println("Could not create thread : " + i);
+ e.printStackTrace();
+ }
+ threads[i].start();
+ }
- System.out.println("Interrupting threads now...");
- for (int i = 0 ; i < numClients; i++ ) {
- threads[i].runFlag = false;
- }
- }
+ //Let it all run for few hours and then kill all threads
+ System.out.println("Waiting for threads to do work now...");
+ try {
+ //numMinutes min * 60 sec * 1000 = millis
+ Thread.sleep( numMinutes * 60 * 1000 );
+ } catch(InterruptedException ie) {
+ ie.printStackTrace();
+ }
+
+ System.out.println("Interrupting threads now...");
+ for (int i = 0 ; i < numClients; i++ ) {
+ threads[i].runFlag = false;
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClientThread.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClientThread.java
index 9d13b81..41aa292 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClientThread.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/client/SimpleBMPClientThread.java
@@ -37,24 +37,24 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
simpleBMP = simpleBMPHome.create();
}
-
+
public void run() {
int numRan = 0;
- int numPassed = 0;
+ int numPassed = 0;
System.out.println("Thread : " +id_ + " running");
while( runFlag == true ) {
- numRan++;
- try {
- if ( simpleBMP.test1( id_) ) {
+ numRan++;
+ try {
+ if ( simpleBMP.test1( id_) ) {
numPassed++;
- }
- } catch( Exception e) {
- System.out.println( "Failed to run after : " + numPassed );
- break;
- }
- }
+ }
+ } catch( Exception e) {
+ System.out.println( "Failed to run after : " + numPassed );
+ break;
+ }
+ }
- System.out.println("Thread : "+id_ + " ran : " + numRan +
- " passed: " + numPassed );
- }
+ System.out.println("Thread : "+id_ + " ran : " + numRan +
+ " passed: " + numPassed );
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress/descriptor/ejb-jar.xml
index 0f2e511..41c2ce5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/descriptor/ejb-jar.xml
@@ -57,6 +57,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
index a8d570c..601cad5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
@@ -30,74 +30,74 @@
int id;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
-
+
public boolean test1(int testId) {
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection();
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection();
insertEntry( testId, "1234567890", conn);
//queryTable( conn );
- emptyTable( conn, testId );
- } catch (Exception e) {
- e.printStackTrace();
- passed = false;
- } finally {
- if ( conn != null ) {
- try { conn.close(); } catch( Exception e1) {}
- }
- }
-
- return passed;
-
+ emptyTable( conn, testId );
+ } catch (Exception e) {
+ e.printStackTrace();
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try { conn.close(); } catch( Exception e1) {}
+ }
}
-
+
+ return passed;
+
+ }
+
private void insertEntry( int id, String phone, Connection con )
throws SQLException {
-
+
PreparedStatement stmt = con.prepareStatement(
- "insert into O_Customer values (?, ?)" );
+ "insert into O_Customer values (?, ?)" );
- stmt.setInt(1, id);
- stmt.setString(2, phone);
+ stmt.setInt(1, id);
+ stmt.setString(2, phone);
- stmt.executeUpdate();
- stmt.close();
+ stmt.executeUpdate();
+ stmt.close();
}
private void emptyTable( Connection con, int testId ) {
try {
Statement stmt = con.createStatement();
-
- stmt.execute("delete * from O_Customer WHERE c_id="+testId);
- stmt.close();
+
+ stmt.execute("delete * from O_Customer WHERE c_id="+testId);
+ stmt.close();
} catch( Exception e) {
- }
-
+ }
+
}
private void queryTable( Connection con ) {
try {
- Statement stmt = con.createStatement();
- ResultSet rs = stmt.executeQuery("select * from O_Customer");
- while( rs.next() ) ;
- rs.close();
- stmt.close();
- } catch( Exception e) {
- }
+ Statement stmt = con.createStatement();
+ ResultSet rs = stmt.executeQuery("select * from O_Customer");
+ while( rs.next() ) ;
+ rs.close();
+ stmt.close();
+ } catch( Exception e) {
+ }
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/create_pointbase.sql
index e4914f6..f256076 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.properties
index a413a79..a8ddb35 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/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="jdbc-stresscmp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar-team.xml" value="descriptor/ejb-jar-team.xml"/>
@@ -26,11 +26,11 @@
<property name="sun-ejb-jar-team.xml" value="descriptor/sun-ejb-jar-team.xml"/>
<property name="sun-ejb-jar-roster.xml" value="descriptor/sun-ejb-jar-roster.xml"/>
<property name="sun-cmp-mappings.xml" value="descriptor/sun-cmp-mappings.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="dbschema" value="sql/RosterSchema.dbschema"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.xml
index 84c3846..3b49a7e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="util"/>
@@ -55,43 +55,43 @@
<antcall target="package-team-jar"/>
<antcall target="appclient-jar-common"/>
<antcall target="package-ear"/>
- </target>
+ </target>
<target name="package-roster-jar">
<antcall target="package-ejbjar-common">
<param name="ejb-jar.xml" value="${ejb-jar-roster.xml}"/>
<param name="sun-ejb-jar.xml" value="${sun-ejb-jar-roster.xml}"/>
<param name="ejbjar.files" value="${build.classes.dir}"/>
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/LeagueDetails.class,**/PlayerDetails.class,
**/TeamDetails.class,**/*Roster*.class,**/Debug.class"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
- </target>
+ </target>
<target name="package-team-jar">
<antcall target="package-ejbjar-common">
<param name="ejb-jar.xml" value="${ejb-jar-team.xml}"/>
<param name="sun-ejb-jar.xml" value="${sun-ejb-jar-team.xml}"/>
<param name="ejbjar.files" value="${build.classes.dir}"/>
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*League*.class,**/*Player*.class,**/*Team*.class,**/Debug.class,**/*dbschema*" />
<param name="ejb.jar" value="${assemble.dir}/${appname}-team-ejb.jar"/>
</antcall>
- </target>
+ </target>
<target name="package-ear">
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </ear>
+ </ear>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -101,10 +101,10 @@
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.resource.type" value="javax.sql.DataSource"/>
<param name="jdbc.conpool.name" value="${poolname}"/>
- <param name="db.class" value="oracle.jdbc.pool.OracleDataSource"/>
- <param name="db.user" value="${ora.user}"/>
- <param name="db.pwd" value="${ora.passwd}"/>
- <param name="db.url" value="${ora.sid}"/>
+ <param name="db.class" value="oracle.jdbc.pool.OracleDataSource"/>
+ <param name="db.user" value="${ora.user}"/>
+ <param name="db.pwd" value="${ora.passwd}"/>
+ <param name="db.url" value="${ora.sid}"/>
</antcall>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -114,7 +114,7 @@
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.property.URL=${ora.url}"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.property.ServerName=129.158.229.239"/>
@@ -128,7 +128,7 @@
<antcall target="create-persistence-resource-common">
<param name="pm.resource.name" value="jdo/s1qePM-stress-cmp"/>
- <param name="jdbc.resource.name" value="jdbc/s1qeDB-stress-cmp"/>
+ <param name="jdbc.resource.name" value="jdbc/s1qeDB-stress-cmp"/>
</antcall>
<antcall target="create-tables"/>
@@ -138,17 +138,17 @@
<echo message="Executing sql from ${sql.file}"/>
<sql
src="sql/create_pointbase.sql"
- driver="oracle.jdbc.driver.OracleDriver"
- userid="${ora.user}"
- password="${ora.passwd}"
- url="${ora.url}"
- classpath="${classes12.zip}"
- onerror="continue"
- print="yes"
+ driver="oracle.jdbc.driver.OracleDriver"
+ userid="${ora.user}"
+ password="${ora.passwd}"
+ url="${ora.url}"
+ classpath="${classes12.zip}"
+ onerror="continue"
+ print="yes"
/>
-
+
</target>
-
+
<target name="run" depends="init-common">
<antcall target="create-tables"/>
<antcall target="runclient-common"/>
@@ -157,18 +157,18 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="drop-tables">
<echo message="Executing sql from ${sql.file}"/>
<sql
src="sql/drop_pointbase.sql"
- driver="oracle.jdbc.driver.OracleDriver"
- userid="${ora.user}"
- password="${ora.passwd}"
- url="${ora.url}"
- classpath="${classes12.zip}"
- onerror="continue"
- print="yes"
+ driver="oracle.jdbc.driver.OracleDriver"
+ userid="${ora.user}"
+ password="${ora.passwd}"
+ url="${ora.url}"
+ classpath="${classes12.zip}"
+ onerror="continue"
+ print="yes"
/>
</target>
@@ -176,14 +176,14 @@
<antcall target="delete-persistence-resource-common">
<param name="pm.resource.name" value="jdo/s1qePM-stress-cmp"/>
</antcall>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB-stress-cmp"/>
</antcall>
- <antcall target="delete-jdbc-connpool-common">
+ <antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="${poolname}"/>
</antcall>
<antcall target="drop-tables"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClient.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClient.java
index 403bcd8..8dcc230 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClient.java
@@ -23,48 +23,48 @@
import com.sun.s1asdev.jdbc.stress1.ejb.*;
public class RosterClient {
-
+
// Invoke with args: #clients, #minutes
public static void main(String[] args) throws Exception {
- int numClients = 10; //10 clients
- int numMinutes = 10; // 10 minutes
- if (args.length == 2) {
+ int numClients = 10; //10 clients
+ int numMinutes = 10; // 10 minutes
+ if (args.length == 2) {
numClients = Integer.parseInt( args[0] );
- numMinutes = Integer.parseInt( args[1] );
- }
-
+ numMinutes = Integer.parseInt( args[1] );
+ }
+
RosterClient client = new RosterClient();
- System.out.println("-=-=-=-=-=-=- Running for "+ numMinutes
- +" minutes -=-=-=-=-=-=-=-");
- client.runTest( numClients, numMinutes );
- }
-
+ System.out.println("-=-=-=-=-=-=- Running for "+ numMinutes
+ +" minutes -=-=-=-=-=-=-=-");
+ client.runTest( numClients, numMinutes );
+ }
+
public void runTest(int numClients, int numMinutes ) throws Exception {
RosterClientThread[] threads = new RosterClientThread[ numClients ];
- for (int i = 0 ; i < numClients; i++ ) {
- try {
- threads[i] = new RosterClientThread(i);
- } catch( Exception e) {
- System.out.println("Could not create thread : " + i);
- e.printStackTrace();
- }
- threads[i].start();
- }
-
- //Let it all run for few hours and then kill all threads
- System.out.println("Waiting for threads to do work now...");
- try {
- //numMinutes min * 60 sec * 1000 = millis
- Thread.sleep( numMinutes * 60 * 1000 );
- } catch(InterruptedException ie) {
- ie.printStackTrace();
- }
+ for (int i = 0 ; i < numClients; i++ ) {
+ try {
+ threads[i] = new RosterClientThread(i);
+ } catch( Exception e) {
+ System.out.println("Could not create thread : " + i);
+ e.printStackTrace();
+ }
+ threads[i].start();
+ }
- System.out.println("Interrupting threads now...");
- for (int i = 0 ; i < numClients; i++ ) {
- threads[i].runFlag = false;
- }
- }
+ //Let it all run for few hours and then kill all threads
+ System.out.println("Waiting for threads to do work now...");
+ try {
+ //numMinutes min * 60 sec * 1000 = millis
+ Thread.sleep( numMinutes * 60 * 1000 );
+ } catch(InterruptedException ie) {
+ ie.printStackTrace();
+ }
+
+ System.out.println("Interrupting threads now...");
+ for (int i = 0 ; i < numClients; i++ ) {
+ threads[i].runFlag = false;
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClientThread.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClientThread.java
index afb29d8..0a5bdff 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClientThread.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/client/RosterClientThread.java
@@ -33,7 +33,7 @@
private static SimpleReporterAdapter status =
new SimpleReporterAdapter("appserv-tests");
-
+
public RosterClientThread( int clientID ) throws Exception {
clientID_ = clientID;
Context initial = new InitialContext();
@@ -44,22 +44,22 @@
}
public void run() {
int numRan = 0;
- int numPassed = 0;
+ int numPassed = 0;
System.out.println("Thread : " +clientID_ + " running");
while( runFlag == true ) {
- numRan++;
+ numRan++;
try {
insertInfo(myRoster);
getSomeInfo(myRoster);
getMoreInfo(myRoster);
- numPassed++;
+ numPassed++;
} catch (Exception ex) {
- System.out.println( "Failed to run after : " + numPassed );
- break;
- }
+ System.out.println( "Failed to run after : " + numPassed );
+ break;
}
- System.out.println("Thread: " + clientID_ + " ran: " + numRan +
- " passed: " + numPassed );
+ }
+ System.out.println("Thread: " + clientID_ + " ran: " + numRan +
+ " passed: " + numPassed );
}
private static void getSomeInfo(Roster myRoster) {
@@ -118,7 +118,7 @@
playerList = myRoster.getPlayersByPosition("defender");
playerList = myRoster.getAllPlayers();
playerList = myRoster.getPlayersNotOnTeam();
- playerList = myRoster.getPlayersByPositionAndName("power forward",
+ playerList = myRoster.getPlayersByPositionAndName("power forward",
"Jack Patterson");
playerList = myRoster.getPlayersByCity("Truckee");
playerList = myRoster.getPlayersBySport("Soccer");
@@ -165,7 +165,7 @@
myRoster.createTeamInLeague(new TeamDetails(
"T2", "Gophers", "Manteca"), "L1");
-
+
myRoster.createTeamInLeague(new TeamDetails(
"T3", "Deer", "Bodie"), "L2");
@@ -283,7 +283,7 @@
// Players, no team
myRoster.createPlayer(new PlayerDetails(
"P26", "Hobie Jackson", "pitcher", 582.00));
-
+
myRoster.createPlayer(new PlayerDetails(
"P27", "Melinda Kendall", "catcher", 677.00));
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
index 4195b64..f6ed84f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
@@ -29,7 +29,7 @@
public abstract String getLeagueId();
public abstract void setLeagueId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
@@ -73,31 +73,31 @@
setSport(sport);
return null;
}
-
+
public void ejbPostCreate (String id, String name, String sport)
throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
//Debug.print("LeagueBean ejbRemove");
}
-
+
public void ejbLoad() {
//Debug.print("LeagueBean ejbLoad");
}
-
+
public void ejbStore() {
//Debug.print("LeagueBean ejbStore");
}
-
+
public void ejbPassivate() { }
-
+
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
index 6dc99ca..2704847 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
@@ -20,10 +20,10 @@
import jakarta.ejb.*;
public interface LocalLeagueHome extends EJBLocalHome {
-
+
public LocalLeague create (String id, String name, String sport)
throws CreateException;
-
+
public LocalLeague findByPrimaryKey (String id)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
index 2b3ae76..da46500 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
@@ -20,39 +20,39 @@
import jakarta.ejb.*;
public interface LocalPlayerHome extends EJBLocalHome {
-
+
public LocalPlayer create (String id, String name, String position,
double salary)
throws CreateException;
-
+
public LocalPlayer findByPrimaryKey (String id)
throws FinderException;
-
- public Collection findByPosition(String position)
+
+ public Collection findByPosition(String position)
throws FinderException;
- public Collection findByHigherSalary(String name)
+ public Collection findByHigherSalary(String name)
throws FinderException;
- public Collection findBySalaryRange(double low, double high)
+ public Collection findBySalaryRange(double low, double high)
throws FinderException;
- public Collection findByLeague(LocalLeague league)
+ public Collection findByLeague(LocalLeague league)
throws FinderException;
- public Collection findBySport(String sport)
+ public Collection findBySport(String sport)
throws FinderException;
- public Collection findByCity(String city)
+ public Collection findByCity(String city)
throws FinderException;
- public Collection findAll()
+ public Collection findAll()
throws FinderException;
- public Collection findNotOnTeam()
+ public Collection findNotOnTeam()
throws FinderException;
- public Collection findByPositionAndName(String position,
+ public Collection findByPositionAndName(String position,
String name) throws FinderException;
public Collection findByTest (String parm1, String parm2, String parm3)
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
index d0f2fa8..9f91550 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
@@ -22,7 +22,7 @@
public interface LocalTeamHome extends EJBLocalHome {
public LocalTeam create (String id, String name, String city)
throws CreateException;
-
+
public LocalTeam findByPrimaryKey (String id)
throws FinderException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
index 694bd60..1e555e5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
@@ -28,7 +28,7 @@
// Access methods for persistent fields
public abstract String getPlayerId();
public abstract void setPlayerId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
@@ -51,13 +51,13 @@
// Business methods
public Collection getLeagues() throws FinderException {
- LocalPlayer player =
+ LocalPlayer player =
(LocalPlayer)context.getEJBLocalObject();
return ejbSelectLeagues(player);
}
public Collection getSports() throws FinderException {
- LocalPlayer player =
+ LocalPlayer player =
(LocalPlayer)context.getEJBLocalObject();
return ejbSelectSports(player);
}
@@ -73,31 +73,31 @@
setSalary(salary);
return null;
}
-
+
public void ejbPostCreate (String id, String name, String position,
double salary) throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
//Debug.print("PlayerBean ejbRemove");
}
-
+
public void ejbLoad() {
//Debug.print("PlayerBean ejbLoad");
}
-
+
public void ejbStore() {
//Debug.print("PlayerBean ejbStore");
}
-
+
public void ejbPassivate() { }
-
+
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
index 274047f..f6074dc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
@@ -22,55 +22,55 @@
import com.sun.s1asdev.jdbc.stress1.util.*;
public interface Roster extends EJBObject {
-
+
// Players
- public void createPlayer(PlayerDetails details)
+ public void createPlayer(PlayerDetails details)
throws RemoteException;
- public void addPlayer(String playerId, String teamId)
+ public void addPlayer(String playerId, String teamId)
throws RemoteException;
- public void removePlayer(String playerId)
+ public void removePlayer(String playerId)
throws RemoteException;
- public void dropPlayer(String playerId, String teamId)
+ public void dropPlayer(String playerId, String teamId)
throws RemoteException;
- public PlayerDetails getPlayer(String playerId)
+ public PlayerDetails getPlayer(String playerId)
throws RemoteException;
- public ArrayList getPlayersOfTeam(String teamId)
+ public ArrayList getPlayersOfTeam(String teamId)
throws RemoteException;
- public ArrayList getPlayersOfTeamCopy(String teamId)
+ public ArrayList getPlayersOfTeamCopy(String teamId)
throws RemoteException;
- public ArrayList getPlayersByPosition(String position)
+ public ArrayList getPlayersByPosition(String position)
throws RemoteException;
- public ArrayList getPlayersByHigherSalary(String name)
+ public ArrayList getPlayersByHigherSalary(String name)
throws RemoteException;
- public ArrayList getPlayersBySalaryRange(double low, double high)
+ public ArrayList getPlayersBySalaryRange(double low, double high)
throws RemoteException;
- public ArrayList getPlayersByLeagueId(String leagueId)
+ public ArrayList getPlayersByLeagueId(String leagueId)
throws RemoteException;
- public ArrayList getPlayersBySport(String sport)
+ public ArrayList getPlayersBySport(String sport)
throws RemoteException;
- public ArrayList getPlayersByCity(String city)
+ public ArrayList getPlayersByCity(String city)
throws RemoteException;
- public ArrayList getAllPlayers()
+ public ArrayList getAllPlayers()
throws RemoteException;
- public ArrayList getPlayersNotOnTeam()
+ public ArrayList getPlayersNotOnTeam()
throws RemoteException;
- public ArrayList getPlayersByPositionAndName(String position,
+ public ArrayList getPlayersByPositionAndName(String position,
String name) throws RemoteException;
public ArrayList getLeaguesOfPlayer(String playerId)
@@ -81,27 +81,27 @@
// Teams
- public ArrayList getTeamsOfLeague(String leagueId)
+ public ArrayList getTeamsOfLeague(String leagueId)
throws RemoteException;
- public void createTeamInLeague(TeamDetails details, String leagueId)
+ public void createTeamInLeague(TeamDetails details, String leagueId)
throws RemoteException;
- public void removeTeam(String teamId)
+ public void removeTeam(String teamId)
throws RemoteException;
- public TeamDetails getTeam(String teamId)
+ public TeamDetails getTeam(String teamId)
throws RemoteException;
// Leagues
- public void createLeague(LeagueDetails details)
+ public void createLeague(LeagueDetails details)
throws RemoteException;
- public void removeLeague(String leagueId)
+ public void removeLeague(String leagueId)
throws RemoteException;
- public LeagueDetails getLeague(String leagueId)
+ public LeagueDetails getLeague(String leagueId)
throws RemoteException;
// Test
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
index 592a6b5..ec9b3d8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
@@ -43,17 +43,17 @@
return copyPlayersToDetails(players);
}
- public void createPlayer(PlayerDetails details) {
+ public void createPlayer(PlayerDetails details) {
//Debug.print("RosterBean createPlayer");
try {
- LocalPlayer player = playerHome.create(details.getId(),
+ LocalPlayer player = playerHome.create(details.getId(),
details.getName(), details.getPosition(), details.getSalary());
} catch (Exception ex) {
throw new EJBException(ex.getMessage());
}
}
-
- public void addPlayer(String playerId, String teamId) {
+
+ public void addPlayer(String playerId, String teamId) {
//Debug.print("RosterBean addPlayer");
try {
LocalTeam team = teamHome.findByPrimaryKey(teamId);
@@ -64,7 +64,7 @@
}
}
- public void removePlayer(String playerId) {
+ public void removePlayer(String playerId) {
//Debug.print("RosterBean removePlayer");
try {
LocalPlayer player = playerHome.findByPrimaryKey(playerId);
@@ -73,7 +73,7 @@
throw new EJBException(ex.getMessage());
}
}
-
+
public void dropPlayer(String playerId, String teamId) {
//Debug.print("RosterBean dropPlayer");
try {
@@ -98,7 +98,7 @@
return playerDetails;
}
- public ArrayList getPlayersOfTeam(String teamId) {
+ public ArrayList getPlayersOfTeam(String teamId) {
//Debug.print("RosterBean getPlayersOfTeam");
Collection players = null;
@@ -113,7 +113,7 @@
}
- public ArrayList getPlayersOfTeamCopy(String teamId) {
+ public ArrayList getPlayersOfTeamCopy(String teamId) {
//Debug.print("RosterBean getPlayersOfTeamCopy");
ArrayList playersList = null;
@@ -128,7 +128,7 @@
}
- public ArrayList getTeamsOfLeague(String leagueId) {
+ public ArrayList getTeamsOfLeague(String leagueId) {
//Debug.print("RosterBean getTeamsOfLeague");
ArrayList detailsList = new ArrayList();
@@ -164,7 +164,7 @@
}
- public ArrayList getPlayersByHigherSalary(String name) {
+ public ArrayList getPlayersByHigherSalary(String name) {
//Debug.print("RosterBean getPlayersByByHigherSalary");
Collection players = null;
@@ -176,7 +176,7 @@
return copyPlayersToDetails(players);
} // getPlayersByHigherSalary
- public ArrayList getPlayersBySalaryRange(double low, double high) {
+ public ArrayList getPlayersBySalaryRange(double low, double high) {
//Debug.print("RosterBean getPlayersBySalaryRange");
Collection players = null;
@@ -189,7 +189,7 @@
return copyPlayersToDetails(players);
} // getPlayersBySalaryRange
- public ArrayList getPlayersByLeagueId(String leagueId) {
+ public ArrayList getPlayersByLeagueId(String leagueId) {
//Debug.print("RosterBean getPlayersByLeagueId");
Collection players = null;
@@ -202,7 +202,7 @@
return copyPlayersToDetails(players);
} // getPlayersByLeagueId
- public ArrayList getPlayersBySport(String sport) {
+ public ArrayList getPlayersBySport(String sport) {
//Debug.print("RosterBean getPlayersBySport");
Collection players = null;
@@ -214,7 +214,7 @@
return copyPlayersToDetails(players);
} // getPlayersBySport
- public ArrayList getPlayersByCity(String city) {
+ public ArrayList getPlayersByCity(String city) {
//Debug.print("RosterBean getPlayersByCity");
Collection players = null;
@@ -226,7 +226,7 @@
return copyPlayersToDetails(players);
} // getPlayersByCity
- public ArrayList getAllPlayers() {
+ public ArrayList getAllPlayers() {
//Debug.print("RosterBean getAllPlayers");
Collection players = null;
@@ -239,7 +239,7 @@
return copyPlayersToDetails(players);
} // getAllPlayers
- public ArrayList getPlayersNotOnTeam() {
+ public ArrayList getPlayersNotOnTeam() {
//Debug.print("RosterBean getPlayersNotOnTeam");
Collection players = null;
@@ -251,8 +251,8 @@
return copyPlayersToDetails(players);
} // getPlayersNotOnTeam
- public ArrayList getPlayersByPositionAndName(String position,
- String name) {
+ public ArrayList getPlayersByPositionAndName(String position,
+ String name) {
//Debug.print("RosterBean getPlayersByPositionAndName");
Collection players = null;
@@ -264,7 +264,7 @@
return copyPlayersToDetails(players);
} // getPlayersByPositionAndName
- public ArrayList getLeaguesOfPlayer(String playerId) {
+ public ArrayList getLeaguesOfPlayer(String playerId) {
//Debug.print("RosterBean getLeaguesOfPlayer");
ArrayList detailsList = new ArrayList();
Collection leagues = null;
@@ -275,7 +275,7 @@
} catch (Exception ex) {
throw new EJBException(ex.getMessage());
}
-
+
Iterator i = leagues.iterator();
while (i.hasNext()) {
LocalLeague league = (LocalLeague) i.next();
@@ -287,7 +287,7 @@
return detailsList;
} // getLeaguesOfPlayer
- public ArrayList getSportsOfPlayer(String playerId) {
+ public ArrayList getSportsOfPlayer(String playerId) {
//Debug.print("RosterBean getSportsOfPlayer");
ArrayList sportsList = new ArrayList();
Collection sports = null;
@@ -298,7 +298,7 @@
} catch (Exception ex) {
throw new EJBException(ex.getMessage());
}
-
+
Iterator i = sports.iterator();
while (i.hasNext()) {
String sport = (String) i.next();
@@ -308,7 +308,7 @@
} // getSportsOfPlayer
// Team business methods
- public void createTeamInLeague(TeamDetails details, String leagueId) {
+ public void createTeamInLeague(TeamDetails details, String leagueId) {
//Debug.print("RosterBean createTeamInLeague");
try {
LocalLeague league = leagueHome.findByPrimaryKey(leagueId);
@@ -320,8 +320,8 @@
throw new EJBException(ex.getMessage());
}
}
-
- public void removeTeam(String teamId) {
+
+ public void removeTeam(String teamId) {
//Debug.print("RosterBean removeTeam");
try {
LocalTeam team = teamHome.findByPrimaryKey(teamId);
@@ -330,7 +330,7 @@
throw new EJBException(ex.getMessage());
}
}
-
+
public TeamDetails getTeam(String teamId) {
//Debug.print("RosterBean getTeam");
TeamDetails teamDetails = null;
@@ -345,18 +345,18 @@
}
// League business methods
- public void createLeague(LeagueDetails details) {
+ public void createLeague(LeagueDetails details) {
//Debug.print("RosterBean createLeague");
try {
- LocalLeague league = leagueHome.create(details.getId(),
+ LocalLeague league = leagueHome.create(details.getId(),
details.getName(),
details.getSport());
} catch (Exception ex) {
throw new EJBException(ex.getMessage());
}
}
-
- public void removeLeague(String leagueId) {
+
+ public void removeLeague(String leagueId) {
//Debug.print("RosterBean removeLeague");
try {
LocalLeague league = leagueHome.findByPrimaryKey(leagueId);
@@ -365,7 +365,7 @@
throw new EJBException(ex.getMessage());
}
}
-
+
public LeagueDetails getLeague(String leagueId) {
//Debug.print("RosterBean getLeague");
LeagueDetails leagueDetails = null;
@@ -379,7 +379,7 @@
}
return leagueDetails;
}
-
+
// SessionBean methods
public void ejbCreate() throws CreateException {
//Debug.print("RosterBean ejbCreate");
@@ -412,7 +412,7 @@
public RosterBean() {}
public void ejbRemove() {}
public void setSessionContext(SessionContext sc) {}
-
+
// Private methods
private LocalPlayerHome lookupPlayer() throws NamingException {
Context initial = new InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
index e4562b3..55c20ff 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
@@ -30,7 +30,7 @@
public abstract String getTeamId();
public abstract void setTeamId(String id);
-
+
public abstract String getName();
public abstract void setName(String name);
@@ -95,30 +95,30 @@
setCity(city);
return null;
}
-
+
public void ejbPostCreate (String id, String name, String city)
throws CreateException { }
public void setEntityContext(EntityContext ctx) {
context = ctx;
}
-
+
public void unsetEntityContext() {
context = null;
}
-
+
public void ejbRemove() {
//Debug.print("TeamBean ejbRemove");
}
-
+
public void ejbLoad() {
//Debug.print("TeamBean ejbLoad");
}
-
+
public void ejbStore() {
//Debug.print("TeamBean ejbStore");
}
-
+
public void ejbPassivate() { }
public void ejbActivate() { }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/stress1/sql/create_pointbase.sql
index 8414770..bf0a84e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/sql/create_pointbase.sql
@@ -3,35 +3,35 @@
DROP TABLE Team;
DROP TABLE League;
-CREATE TABLE Player
+CREATE TABLE Player
(
- player_Id VARCHAR(255) PRIMARY KEY,
- name VARCHAR(255) ,
- position VARCHAR(255) ,
- salary DOUBLE PRECISION NOT NULL
+ player_Id VARCHAR(255) PRIMARY KEY,
+ name VARCHAR(255) ,
+ position VARCHAR(255) ,
+ salary DOUBLE PRECISION NOT NULL
);
-CREATE TABLE League
+CREATE TABLE League
(
- league_Id VARCHAR(255) PRIMARY KEY,
- name VARCHAR(255) ,
- sport VARCHAR(255)
+ league_Id VARCHAR(255) PRIMARY KEY,
+ name VARCHAR(255) ,
+ sport VARCHAR(255)
);
-CREATE TABLE Team
+CREATE TABLE Team
(
- team_Id VARCHAR(255) PRIMARY KEY,
- city VARCHAR(255) ,
- name VARCHAR(255) ,
- league_Id VARCHAR(255) ,
- FOREIGN KEY (league_Id) REFERENCES League (league_Id)
+ team_Id VARCHAR(255) PRIMARY KEY,
+ city VARCHAR(255) ,
+ name VARCHAR(255) ,
+ league_Id VARCHAR(255) ,
+ FOREIGN KEY (league_Id) REFERENCES League (league_Id)
);
-CREATE TABLE TeamPlayer
+CREATE TABLE TeamPlayer
(
- player_Id VARCHAR(255) ,
- team_Id VARCHAR(255),
+ player_Id VARCHAR(255) ,
+ team_Id VARCHAR(255),
CONSTRAINT pk_TeamPlayer PRIMARY KEY (player_Id , team_Id) ,
- FOREIGN KEY (team_Id) REFERENCES Team (team_Id),
- FOREIGN KEY (player_Id) REFERENCES Player (player_Id)
+ FOREIGN KEY (team_Id) REFERENCES Team (team_Id),
+ FOREIGN KEY (player_Id) REFERENCES Player (player_Id)
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.properties
index a3bab1f..1c09977 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="switchoffACCconnpooling"/>
-<property name="appname" value="${module}"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="appname" value="${module}"/> \u0020
+<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="oracledb.port" value="1521"/>
<property name="oracledb.host" value="natraj.sfbay.sun.com"/>
<property name="oracledb.sid" value="dbsmpl1"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml
index 7f6a540..c8cbb1d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -44,17 +44,17 @@
</target>
<target name="build" depends="compile">
- <mkdir dir="${assemble.dir}"/>
+ <mkdir dir="${assemble.dir}"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}" />
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}AppClient.jar"/>
+ <param name="appclient.jar"
+ value="${assemble.dir}/${appname}AppClient.jar"/>
</antcall>
- </target>
-
+ </target>
+
<!-- run appclient in AppServ -->
<target name="myrunclient" depends="init-common">
<echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
@@ -81,9 +81,9 @@
<target name="run" depends="init-common">
<antcall target="myrunclient"/>
</target>
-
+
<target name="unsetup" depends="init-common">
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/nonxaresource"/>
</antcall>
@@ -91,7 +91,7 @@
<param name="jdbc.conpool.name" value="jdbc-derby-pool"/>
</antcall>
- <antcall target="delete-jdbc-resource-common">
+ <antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/xaresource"/>
</antcall>
@@ -99,7 +99,7 @@
<param name="jdbc.conpool.name" value="jdbc-derby-xa-pool"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
index 960771e..4bb6af8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
@@ -43,23 +43,23 @@
* @author kshitiz
*/
public class Client {
-
+
private static int count = 10;
private static boolean rollback;
private static String tableName = "COFFEE";
-
+
//static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
private static final String testSuite = "switchoffACCconnpooling";
private static int testCount = 0;
-
+
private static boolean isXA=false;
/** Creates a new instance of UnpooledTest */
public Client() {
}
-
-
+
+
/**
* @param args the command line arguments
*/
@@ -77,9 +77,9 @@
runTest();
stat.printSummary();
}
-
+
private static void runTest() {
-
+
//Connection opened and closed within transaction
//non-xa resource
isXA = false;
@@ -87,8 +87,8 @@
//xa resource
isXA = true;
test1("jdbc/xaresource");
-
- //Connection opened within transaction
+
+ //Connection opened within transaction
//but closed after transaction
isXA = false;
//non-xa resource
@@ -96,47 +96,47 @@
//xa resource
isXA = true;
test2("jdbc/xaresource");
-
+
//XA and Non-XA resource within same transaction
//non-xa resource and xa resource together
test3("jdbc/nonxaresource", "jdbc/xaresource");
-
- test4("jdbc/nonxaresource", "jdbc/xaresource");
+
+ test4("jdbc/nonxaresource", "jdbc/xaresource");
//openAndCloseConnection("jdbc/oraclexa", 40);
}
-
+
public static void test1(String dsName) {
UserTransaction ut = null;
try {
InitialContext ic = new InitialContext();
DataSource ds = (DataSource) ic.lookup(dsName);
printConnection(ds);
-
+
createTable(ds);
-
+
int count1 = getCount(ds);
System.out.println("count1 : " + count1);
-
+
ut = (UserTransaction) ic.lookup("java:comp/UserTransaction");
ut.begin();
-
+
for(int i=0; i< count; i++)
insertRow(ds);
if(rollback)
ut.rollback();
else
ut.commit();
-
+
int count2=getCount(ds);
-
+
System.out.println("count2 : " + count2);
-
+
int diff = count2 - count1;
if(( diff == count && !rollback) || (diff == 0 && rollback))
printStatus(true);
else
printStatus(false);
-
+
} catch(Exception e){
printStatus(false);
e.printStackTrace();
@@ -152,9 +152,9 @@
}
}
};
-
+
}
-
+
public static void test2(String dsName) {
UserTransaction ut = null;
try {
@@ -164,32 +164,32 @@
Connection[] con;
createTable(ds);
-
+
int count1 = getCount(ds);
System.out.println("count1 : " + count1);
-
+
ut = (UserTransaction) ic.lookup("java:comp/UserTransaction");
ut.begin();
-
+
con = openConnections(dsName, count);
insertRow(con);
closeConnections(con, count);
-
+
if(rollback)
ut.rollback();
else
ut.commit();
-
+
int count2=getCount(ds);
-
+
System.out.println("count2 : " + count2);
-
+
int diff = count2 - count1;
if(( diff == count && !rollback) || (diff == 0 && rollback))
printStatus(true);
else
printStatus(false);
-
+
} catch(Exception e){
printStatus(false);
e.printStackTrace();
@@ -205,69 +205,69 @@
}
}
};
-
+
}
-
-
+
+
public static void test4(String dsName, String xaDsName) {
UserTransaction ut = null;
try {
InitialContext ic = new InitialContext();
DataSource ds = (DataSource) ic.lookup(dsName);
- DataSource xads = (DataSource) ic.lookup(xaDsName);
+ DataSource xads = (DataSource) ic.lookup(xaDsName);
printConnection(ds);
Connection[] con;
- Connection[] xaCon;
+ Connection[] xaCon;
- isXA = false;
+ isXA = false;
createTable(ds);
isXA = true;
- createTable(xads);
+ createTable(xads);
- isXA = false;
+ isXA = false;
int count1 = getCount(ds);
- isXA = true;
- int xacount1 = getCount(xads);
+ isXA = true;
+ int xacount1 = getCount(xads);
System.out.println("count1 : " + count1 + " xacount1 : " + xacount1);
-
+
ut = (UserTransaction) ic.lookup("java:comp/UserTransaction");
ut.begin();
-
- con = openConnections(dsName, count);
- xaCon = openConnections(xaDsName, 1);
- isXA = false;
- insertRow(con);
- isXA = true;
- insertRow(xaCon);
- isXA = false;
+ con = openConnections(dsName, count);
+ xaCon = openConnections(xaDsName, 1);
+ isXA = false;
+ insertRow(con);
+ isXA = true;
+ insertRow(xaCon);
+
+ isXA = false;
closeConnections(con, count);
- isXA = true;
- closeConnections(xaCon, 1);
-
+ isXA = true;
+ closeConnections(xaCon, 1);
+
if(rollback)
ut.rollback();
else
ut.commit();
-
- isXA = false;
- int count2=getCount(ds);
- isXA = true;
- int xacount2 = getCount(xads);
-
- System.out.println("count2 : " + count2 + " xacount2 : " + xacount2);
-
- int diff = count2 - count1;
- int xadiff = xacount2 - xacount1;
- if((( diff == count && !rollback) || (diff == 0 && rollback)) &&
- ((xadiff == 1 && !rollback) || (xadiff == 0 && rollback)))
+ isXA = false;
+ int count2=getCount(ds);
+ isXA = true;
+ int xacount2 = getCount(xads);
+
+ System.out.println("count2 : " + count2 + " xacount2 : " + xacount2);
+
+ int diff = count2 - count1;
+ int xadiff = xacount2 - xacount1;
+
+ if((( diff == count && !rollback) || (diff == 0 && rollback)) &&
+ ((xadiff == 1 && !rollback) || (xadiff == 0 && rollback)))
printStatus(true);
else
printStatus(false);
-
+
} catch(Exception e){
printStatus(false);
e.printStackTrace();
@@ -283,10 +283,10 @@
}
}
};
-
+
}
-
-
+
+
public static void test3(String ds1Name, String ds2Name) {
UserTransaction ut = null;
try {
@@ -295,42 +295,42 @@
printConnection(ds1);
DataSource ds2 = (DataSource) ic.lookup(ds2Name);
printConnection(ds2);
-
+
isXA = false;
createTable(ds1);
isXA = true;
createTable(ds2);
-
+
isXA = false;
int count1 = getCount(ds1);
isXA = true;
int count3 = getCount(ds2);
System.out.println("count1 : " + count1);
System.out.println("count3 : " + count3);
-
+
ut = (UserTransaction) ic.lookup("java:comp/UserTransaction");
ut.begin();
-
+
isXA = false;
for(int i=0; i< count; i++)
insertRow(ds1);
isXA = true;
for(int i=0; i< count; i++)
insertRow(ds2);
-
+
if(rollback)
ut.rollback();
else
ut.commit();
-
+
isXA = false;
int count2=getCount(ds1);
isXA = true;
int count4=getCount(ds2);
-
+
System.out.println("count2 : " + count2);
System.out.println("count4 : " + count4);
-
+
int diff1 = count2 - count1;
int diff2 = count4 - count3;
if((( diff1 == count && !rollback) || (diff1 == 0 && rollback))
@@ -338,7 +338,7 @@
printStatus(true);
else
printStatus(false);
-
+
} catch(Exception e){
printStatus(false);
e.printStackTrace();
@@ -354,21 +354,21 @@
}
}
};
-
+
}
-
+
private static void createTable(final DataSource ds) throws SQLException {
String tableName;
if(isXA)
tableName = "COFFEE_XA";
else
tableName = "COFFEE";
-
+
Connection con;
Statement stmt;
con = ds.getConnection();
stmt = con.createStatement();
-
+
try{
stmt.executeUpdate("drop table " + tableName);
}catch(Exception ex){
@@ -378,7 +378,7 @@
stmt.close();
con.close();
}
-
+
private static int getCount(final DataSource ds) throws SQLException {
String tableName;
if(isXA)
@@ -398,7 +398,7 @@
con.close();
return count;
}
-
+
private static void insertRow(final DataSource ds) throws SQLException {
String tableName;
if(isXA)
@@ -413,7 +413,7 @@
stmt.close();
con.close();
}
-
+
private static void insertRow(final Connection[] con) throws SQLException {
String tableName;
if(isXA)
@@ -424,108 +424,108 @@
for(int i=0; i < con.length; i++){
stmt = con[i].createStatement();
stmt.executeUpdate("INSERT INTO " + tableName + " values ('COFFEE', 100)");
- stmt.close();
+ stmt.close();
}
}
-
-
+
+
private static void printConnection(final DataSource ds) throws SQLException{
com.sun.appserv.jdbc.DataSource dsTyped = (com.sun.appserv.jdbc.DataSource) ds;
Connection wrapper = dsTyped.getConnection();
System.out.println("Connection type : " + dsTyped.getConnection(wrapper));
wrapper.close();
}
-
+
private static void openAndCloseConnection(String dsName, int count) {
try {
InitialContext ic = new InitialContext();
DataSource ds = (DataSource) ic.lookup(dsName);
com.sun.appserv.jdbc.DataSource dsTyped = (com.sun.appserv.jdbc.DataSource) ds;
- HashSet<String> connections = new HashSet<String>();
+ HashSet<String> connections = new HashSet<String>();
Connection con;
- String conType;
- boolean status = true;
- int i = 0;
+ String conType;
+ boolean status = true;
+ int i = 0;
for(; i < count; i++){
con = ds.getConnection();
- conType = dsTyped.getConnection(con).toString();
- System.out.println("Connection type : " + conType);
+ conType = dsTyped.getConnection(con).toString();
+ System.out.println("Connection type : " + conType);
con.close();
- if(!connections.add(conType)){
- status = false;
- break;
- }
+ if(!connections.add(conType)){
+ status = false;
+ break;
+ }
}
- System.out.println("Total connection requested : " + count);
- System.out.println("Total connection created : " + i);
- System.out.println("Total number of unique connection : " + connections.size());
- printStatus(status);
+ System.out.println("Total connection requested : " + count);
+ System.out.println("Total connection created : " + i);
+ System.out.println("Total number of unique connection : " + connections.size());
+ printStatus(status);
}catch(Exception ex){
ex.printStackTrace();
}
}
-
+
private static void openMaxConnections(String dsName, int count) {
DataSource ds = null;
- try{
- InitialContext ic = new InitialContext();
- ds = (DataSource) ic.lookup(dsName);
- }catch(NamingException ex){
- System.out.println("Unable to lookup datasource");
- ex.printStackTrace();
- return;
- }
-
- Connection[] con = new Connection[count];
- int i = 0;
- for(; i < count; i++){
- try{
- con[i] = ds.getConnection();
- }catch(SQLException ex){
- System.out.println("Unable to create max connections");
- printStatus(false);
- }
- }
+ try{
+ InitialContext ic = new InitialContext();
+ ds = (DataSource) ic.lookup(dsName);
+ }catch(NamingException ex){
+ System.out.println("Unable to lookup datasource");
+ ex.printStackTrace();
+ return;
+ }
- if(i == count){
- System.out.println("Able to create max connections");
- printStatus(true);
- try{
- ds.getConnection();
- System.out.println("Able to create beyond max connections");
- printStatus(false);
- }catch(SQLException ex){
- System.out.println("Unable to create beyond max connections");
- printStatus(true);
- }
- }
-
+ Connection[] con = new Connection[count];
+ int i = 0;
+ for(; i < count; i++){
+ try{
+ con[i] = ds.getConnection();
+ }catch(SQLException ex){
+ System.out.println("Unable to create max connections");
+ printStatus(false);
+ }
+ }
+
+ if(i == count){
+ System.out.println("Able to create max connections");
+ printStatus(true);
+ try{
+ ds.getConnection();
+ System.out.println("Able to create beyond max connections");
+ printStatus(false);
+ }catch(SQLException ex){
+ System.out.println("Unable to create beyond max connections");
+ printStatus(true);
+ }
+ }
+
for(; i > 0; i--){
- try{
- con[i - 1].close();
- }catch(SQLException ex){
- System.out.println("Unable to close connection");
- }
- }
+ try{
+ con[i - 1].close();
+ }catch(SQLException ex){
+ System.out.println("Unable to close connection");
+ }
+ }
}
private static Connection[] openConnections(String dsName, int count) throws NamingException, SQLException {
InitialContext ic = new InitialContext();
DataSource ds = (DataSource) ic.lookup(dsName);
-
+
Connection[] con = new Connection[count];
for(int i=0; i < count; i++) {
con[i] = ds.getConnection();
- System.out.println("con[" + i+ "]=" + con[i]);
- }
+ System.out.println("con[" + i+ "]=" + con[i]);
+ }
return con;
}
-
+
private static void closeConnections(Connection[] con, int count) throws SQLException {
for(int i=0; i < count; i++)
con[i].close();
}
-
+
private static void printStatus(boolean status){
String testcaseID = testSuite + "-test" + (++testCount) ;
if(status){
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.properties
index e5fc47e..8af7443 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-tracingsql"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.xml
index 0dc2d73..f6f96b9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -45,15 +45,15 @@
<param name="src" value="client"/>
</antcall>
<antcall target="compile-common">
- <param name="src" value="logger"/>
+ <param name="src" value="logger"/>
</antcall>
</target>
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/SimpleBMP.class, **/SimpleBMPHome.class,**/*Client*.class" />
</antcall>
<jar jarfile="${sql-trace-listener-jar}" update="true">
@@ -64,8 +64,8 @@
<copyfile src="${sql-trace-listener-jar}"
dest="${env.S1AS_HOME}/lib/sql-trace-listener.jar"/>
<antcall target="restart-server"/>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -93,10 +93,10 @@
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
@@ -111,7 +111,7 @@
<!-- To check reconfiguration of SQL Trace listeners -->
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -125,11 +125,11 @@
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="${tracingsql-poolname}"/>
</antcall>
- <antcall target="undeploy-common"/>
- <delete file="${env.S1AS_HOME}/lib/sql-trace-listener.jar"/>
- <delete file="${sql-trace-listener-jar}"/>
- <antcall target="restart-server"/>
- </target>
+ <antcall target="undeploy-common"/>
+ <delete file="${env.S1AS_HOME}/lib/sql-trace-listener.jar"/>
+ <delete file="${sql-trace-listener-jar}"/>
+ <antcall target="restart-server"/>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/client/SimpleBMPClient.java
index cebc04d..198502e 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/client/SimpleBMPClient.java
@@ -29,34 +29,34 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "SqlTracing ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "SqlTracing ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleBMPHome");
- SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
+ SimpleBMPHome simpleBMPHome = (SimpleBMPHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
stat.addDescription("JDBC Sql Tracing Tests");
/*if ( simpleBMP.statementTest() ) {
- stat.addStatus(testSuite+" statementTest : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" statementTest : ", stat.FAIL);
- }*/
+ stat.addStatus(testSuite+" statementTest : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" statementTest : ", stat.FAIL);
+ }*/
- if ( simpleBMP.preparedStatementTest() ) {
- stat.addStatus(testSuite+" preparedStatementTest : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" preparedStatementTest : ", stat.FAIL);
- }
+ if ( simpleBMP.preparedStatementTest() ) {
+ stat.addStatus(testSuite+" preparedStatementTest : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" preparedStatementTest : ", stat.FAIL);
+ }
- if( simpleBMP.compareRecords()) {
- stat.addStatus(testSuite+" Sql Tracing Test : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" Sql Tracing Test : ", stat.FAIL);
- }
+ if( simpleBMP.compareRecords()) {
+ stat.addStatus(testSuite+" Sql Tracing Test : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" Sql Tracing Test : ", stat.FAIL);
+ }
/*if ( simpleBMP.callableStatementTest() ) {
stat.addStatus(testSuite+" callableStatementTest : ", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/ejb-jar.xml
index 260eeb7..0a8b092 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/ejb-jar.xml
@@ -63,6 +63,6 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/sun-ejb-jar.xml
index 693fd8b..6425325 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/descriptor/sun-ejb-jar.xml
@@ -35,7 +35,7 @@
</resource-ref>
<resource-ref>
<res-ref-name>TracingDataSource</res-ref-name>
- <jndi-name>jdbc/tracingsql-res</jndi-name>
+ <jndi-name>jdbc/tracingsql-res</jndi-name>
<default-resource-principal>
<name>DBUSER</name>
<password>DBPASSWORD</password>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
index 040881f..ab4cb68 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
@@ -29,19 +29,19 @@
protected DataSource tracingds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- tracingds = (DataSource) context.lookup("java:comp/env/TracingDataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ tracingds = (DataSource) context.lookup("java:comp/env/TracingDataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean statementTest() {
@@ -54,8 +54,8 @@
stmt = conFromDS.createStatement();
conFromStatement = stmt.getConnection();
- System.out.println("statement Test : conFromDS : " + conFromDS);
- System.out.println("statement Test : conFromStatement : " + conFromStatement);
+ System.out.println("statement Test : conFromDS : " + conFromDS);
+ System.out.println("statement Test : conFromStatement : " + conFromStatement);
if( conFromDS==conFromStatement || conFromDS.equals(conFromStatement) ){
result = true;
@@ -146,8 +146,8 @@
stmt = conFromDS.prepareCall("select * from customer_stmt_wrapper");
conFromStatement = stmt.getConnection();
- System.out.println("Callable statement Test : conFromDS : " + conFromDS);
- System.out.println("Callable statement Test : conFromStatement : " + conFromStatement);
+ System.out.println("Callable statement Test : conFromDS : " + conFromDS);
+ System.out.println("Callable statement Test : conFromStatement : " + conFromStatement);
if( conFromDS==conFromStatement || conFromDS.equals(conFromStatement) ){
result = true;
}
@@ -177,8 +177,8 @@
dbmd = conFromDS.getMetaData();
conFromMetaData = dbmd.getConnection();
- System.out.println("statementTest : conFromDS : " + conFromDS);
- System.out.println("statementTest : conFromDbMetadata : " + conFromMetaData);
+ System.out.println("statementTest : conFromDS : " + conFromDS);
+ System.out.println("statementTest : conFromDbMetadata : " + conFromMetaData);
if( conFromDS==conFromMetaData || conFromDS.equals(conFromMetaData) ){
result = true;
}
@@ -204,8 +204,8 @@
rs = stmt.executeQuery("select * from customer_stmt_wrapper");
conFromResultSet = rs.getStatement().getConnection();
- System.out.println("ResultSet test : conFromDS : " + conFromDS);
- System.out.println("ResultSet test : conFromResultSet: " + conFromResultSet);
+ System.out.println("ResultSet test : conFromDS : " + conFromDS);
+ System.out.println("ResultSet test : conFromResultSet: " + conFromResultSet);
if( conFromDS==conFromResultSet || conFromDS.equals(conFromResultSet) ){
result = true;
}
@@ -233,71 +233,71 @@
}
public boolean compareRecords() {
- boolean result = false;
+ boolean result = false;
Connection conFromDS = null;
- Connection con1 = null;
- Statement stmt1 = null;
- Statement stmt = null;
- ResultSet rs = null;
- ResultSet rs1 = null;
+ Connection con1 = null;
+ Statement stmt1 = null;
+ Statement stmt = null;
+ ResultSet rs = null;
+ ResultSet rs1 = null;
try{
conFromDS = tracingds.getConnection();
- con1 = tracingds.getConnection();
+ con1 = tracingds.getConnection();
stmt = conFromDS.createStatement();
- stmt1 = con1.createStatement();
+ stmt1 = con1.createStatement();
rs = stmt.executeQuery("select * from expected_sql_trace");
- rs1 = stmt1.executeQuery("select * from sql_trace");
+ rs1 = stmt1.executeQuery("select * from sql_trace");
System.out.println("@@@@ ------------------------------------------");
- for(int i=0; i<5; i++) {
+ for(int i=0; i<5; i++) {
- String className ="";
- String methodName="";
+ String className ="";
+ String methodName="";
String args="";
String expectedClassName="";
String expectedMethodName="";
String expectedArgs="";
- if(rs1.next()) {
+ if(rs1.next()) {
className = rs1.getString(1).trim();
- methodName = rs1.getString(2).trim();
- args = rs1.getString(3).trim();
- System.out.println("@@@@@ class=" + className + "---");
- System.out.println("@@@@@ method=" + methodName + "---");
- System.out.println("@@@@@ args=" + args + "---");
- }
-
- if(rs.next()) {
- expectedClassName = rs.getString(1).trim();
- expectedMethodName = rs.getString(2).trim();
- expectedArgs = rs.getString(3).trim();
- System.out.println("@@@@@ expectedClass = " + expectedClassName + "---");
- System.out.println("@@@@@ expectedMethod = " + expectedMethodName + "---");
- System.out.println("@@@@@ expectedArgs = " + expectedArgs + "---");
- }
- System.out.println("@@@@ ------------------------------------------");
-
- if(className.equals(expectedClassName) && methodName.equals(expectedMethodName) && args.equals(expectedArgs)) {
- result = true;
- } else {
- return false;
- }
+ methodName = rs1.getString(2).trim();
+ args = rs1.getString(3).trim();
+ System.out.println("@@@@@ class=" + className + "---");
+ System.out.println("@@@@@ method=" + methodName + "---");
+ System.out.println("@@@@@ args=" + args + "---");
+ }
- /*if(className != null && expectedClassName != null) {
- if(className.equals(expectedClassName))
- result = true;
- }
- if(methodName != null && expectedMethodName != null) {
- if(methodName.equals(expectedMethodName))
- result = true;
- }
- if(args != null && expectedArgs != null) {
- if(args.equals(expectedArgs))
- result = true;
- }*/
- }
+ if(rs.next()) {
+ expectedClassName = rs.getString(1).trim();
+ expectedMethodName = rs.getString(2).trim();
+ expectedArgs = rs.getString(3).trim();
+ System.out.println("@@@@@ expectedClass = " + expectedClassName + "---");
+ System.out.println("@@@@@ expectedMethod = " + expectedMethodName + "---");
+ System.out.println("@@@@@ expectedArgs = " + expectedArgs + "---");
+ }
+ System.out.println("@@@@ ------------------------------------------");
+
+ if(className.equals(expectedClassName) && methodName.equals(expectedMethodName) && args.equals(expectedArgs)) {
+ result = true;
+ } else {
+ return false;
+ }
+
+ /*if(className != null && expectedClassName != null) {
+ if(className.equals(expectedClassName))
+ result = true;
+ }
+ if(methodName != null && expectedMethodName != null) {
+ if(methodName.equals(expectedMethodName))
+ result = true;
+ }
+ if(args != null && expectedArgs != null) {
+ if(args.equals(expectedArgs))
+ result = true;
+ }*/
+ }
}catch(SQLException sqe){
- }finally{
+ }finally{
try{
if(stmt != null){
@@ -332,7 +332,7 @@
}
}catch(SQLException sqe){}
}
- return result;
+ return result;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/logger/com/sun/s1asdev/jdbc/tracingsql/logger/TraceLogger.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/logger/com/sun/s1asdev/jdbc/tracingsql/logger/TraceLogger.java
index 99c7384..ae59b6d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/logger/com/sun/s1asdev/jdbc/tracingsql/logger/TraceLogger.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/logger/com/sun/s1asdev/jdbc/tracingsql/logger/TraceLogger.java
@@ -27,13 +27,13 @@
import java.sql.SQLException;
public class TraceLogger implements SQLTraceListener {
-
- DataSource ds;
- public TraceLogger() {
- try {
+
+ DataSource ds;
+ public TraceLogger() {
+ try {
InitialContext ic = new InitialContext();
- ds = (DataSource) ic.lookup("jdbc/tracingsql-res");
- } catch(NamingException ex) {}
+ ds = (DataSource) ic.lookup("jdbc/tracingsql-res");
+ } catch(NamingException ex) {}
}
/**
@@ -66,23 +66,23 @@
public void writeRecord(DataSource ds, String classname, String methodname, String args) {
Connection conFromDS = null;
- PreparedStatement stmt = null;
+ PreparedStatement stmt = null;
try{
conFromDS = ds.getConnection();
- //System.out.println("###con=" + conFromDS);
+ //System.out.println("###con=" + conFromDS);
stmt = conFromDS.prepareStatement(
- "insert into sql_trace values (?, ?, ?)" );
+ "insert into sql_trace values (?, ?, ?)" );
System.out.println("### stmt=" + stmt);
- stmt.setString(1, classname);
- stmt.setString(2, methodname);
- stmt.setString(3, args);
+ stmt.setString(1, classname);
+ stmt.setString(2, methodname);
+ stmt.setString(3, args);
- int count = stmt.executeUpdate();
- //System.out.println("### inserted " + count + " rows");
+ int count = stmt.executeUpdate();
+ //System.out.println("### inserted " + count + " rows");
}catch(SQLException sqe){
- }finally{
+ }finally{
try{
if(stmt != null){
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/create_pointbase.sql
index 0397a75..0f04479 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/create_pointbase.sql
@@ -1,46 +1,46 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
-INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
-
-Drop table sql_trace;
-
-CREATE TABLE sql_trace (
- classname char(100),
- methodname char(100),
- args char(200)
-);
-
-Drop table null_entry_table;
-
-CREATE TABLE null_entry_table (
- field1 char(100)
-);
-
-
-Drop table expected_sql_trace;
-
-CREATE TABLE expected_sql_trace (
- classname char(100),
- methodname char(100),
- args char(200)
-);
-
-
-INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection', 'prepareStatement', 'select * from customer_stmt_wrapper;1003;1007;');
-
-INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'getConnection', '');
-
-INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection', 'prepareStatement', 'INSERT INTO null_entry_table VALUES(?);1003;1007;');
-
-INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'setString', '1;');
-
-INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'executeUpdate', '');
-
-INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'close', '');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
+
+Drop table sql_trace;
+
+CREATE TABLE sql_trace (
+ classname char(100),
+ methodname char(100),
+ args char(200)
+);
+
+Drop table null_entry_table;
+
+CREATE TABLE null_entry_table (
+ field1 char(100)
+);
+
+
+Drop table expected_sql_trace;
+
+CREATE TABLE expected_sql_trace (
+ classname char(100),
+ methodname char(100),
+ args char(200)
+);
+
+
+INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection', 'prepareStatement', 'select * from customer_stmt_wrapper;1003;1007;');
+
+INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'getConnection', '');
+
+INSERT INTO expected_sql_trace VALUES('org.apache.derby.client.net.NetConnection', 'prepareStatement', 'INSERT INTO null_entry_table VALUES(?);1003;1007;');
+
+INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'setString', '1;');
+
+INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'executeUpdate', '');
+
+INSERT INTO expected_sql_trace VALUES('com.sun.gjc.spi.jdbc40.PreparedStatementWrapper40', 'close', '');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/recreate_sql_trace_table.sql b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/recreate_sql_trace_table.sql
index 754f9bd..eaa4577 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/recreate_sql_trace_table.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/sql/recreate_sql_trace_table.sql
@@ -1,6 +1,6 @@
Drop table sql_trace;
CREATE TABLE sql_trace (
classname char(100),
- methodname char(100),
- args char(200)
+ methodname char(100),
+ args char(200)
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/transactions/build.xml
index 7c82aaa..87ddf63 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/build.xml
@@ -35,7 +35,7 @@
<fileset dir="." includes="*.output"/>
</delete>
<record name="transactions.output" action="start" />
- <ant dir="test1" target="all"/>
+ <ant dir="test1" target="all"/>
<record name="transactions.output" action="stop" />
</target>
@@ -52,9 +52,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the reconfig tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the reconfig tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.properties
index f1a76f3..2f0078f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/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="as7-jts"/>
<property name="app.type" value="application"/>
@@ -25,7 +25,7 @@
<property name="sun-web.xml" value="descriptor/sun-web.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="appname" value="txnstatus-test1"/>
+<property name="appname" value="txnstatus-test1"/> \u0020
<property name="ejbjar.classes" value="${build.classes.dir}/com"/>
<!-- pool1 -->
<property name="ora.user1" value="aditya"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.xml
index fee77c7..9e2c19b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.xml
@@ -30,14 +30,14 @@
&commonBuild;
&testproperties;
-
+
<target name="all" depends="build,setup-jdbc,setup-sql,deploy,runweb,undeploy,cleanup-jdbc,cleanup-sql"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -55,18 +55,18 @@
</antcall>
<antcall target="package-war-local">
<param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
<antcall target="ear-common"/>
<!--
<antcall target="webclient-war-common"/>
<param name="hasWebclient" value="true"/>
- <param name="webclient.war.classes" value="**/*.class"/>
- </antcall>
+ <param name="webclient.war.classes" value="**/*.class"/>
+ </antcall>
-->
</target>
<target name="package-war-local" >
- <!-- <delete dir="${build.classes.dir}"/>
+ <!-- <delete dir="${build.classes.dir}"/>
<mkdir dir="${build.classes.dir}"/>
<antcall target="compile-servlet"/>-->
@@ -125,7 +125,7 @@
<antcall target="create-jdbc-resource-common" >
<param name="jdbc.conpool.name" value="jts-xa-pool2"/>
<param name="jdbc.resource.name" value="jdbc/oracleds2"/>
- </antcall>
+ </antcall>
<antcall target="create-jdbc-oracle-xa-pool" >
<param name="poolname" value="jts-xa-pool1"/>
@@ -134,7 +134,7 @@
<param name="ora.sid" value="${ora.sid1}"/>
<param name="ora.url" value="${ora.url1}"/>
</antcall>
-
+
<antcall target="create-jdbc-resource-common" >
<param name="jdbc.conpool.name" value="jts-xa-pool1"/>
<param name="jdbc.resource.name" value="jdbc/oraclethird"/>
@@ -167,7 +167,7 @@
onerror="continue"
print="yes"
classpath="${dbdriver.classpath}"/>
-
+
<echo message="Executing sql statement at from ${create.sql.file2}"/>
<sql
driver="${db.driver}"
@@ -191,7 +191,7 @@
onerror="continue"
print="yes"
classpath="${dbdriver.classpath}"/>
-
+
<echo message="Executing sql statement at from ${drop.sql.file2}"/>
<sql
driver="${db.driver}"
@@ -217,14 +217,14 @@
<antcall target="usage-common"/>
</target>
- <!--
+ <!--
Tomcat's GTest tool for webtests
-->
<target name="runweb" depends="init-common">
- <taskdef name="gtest" classname="org.apache.tomcat.task.GTest"
+ <taskdef name="gtest" classname="org.apache.tomcat.task.GTest"
classpath="${env.APS_HOME}/lib/testdriversecurity.jar:${env.APS_HOME}/lib/commons-logging.jar" />
<property name="wgdir" value="${env.APS_HOME}/devtests/jdbc/transactions"/>
- <gtest request="GET /txnstatus/bmservlet4 HTTP/1.0"
+ <gtest request="GET /txnstatus/bmservlet4 HTTP/1.0"
debug="9"
firstTask="true"
lastTest="true"
@@ -246,7 +246,7 @@
testCaseDescription="txnstatus-test1"
testStrategy="txnstatus-test1"
/>
- </target>
+ </target>
<target name="create-jdbc-oracle-xa-pool" depends="init-common">
<antcall target="create-jdbc-connpool-common" >
@@ -262,7 +262,7 @@
<param name="admin.command" value="set"/>
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.property.URL=${ora.url}"/>
</antcall>
-
+
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
index 4e428b6..cf28c7d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
@@ -26,10 +26,10 @@
import java.sql.*;
import javax.rmi.PortableRemoteObject;
-public class bmsamplebean3 implements SessionBean
+public class bmsamplebean3 implements SessionBean
{
private transient jakarta.ejb.SessionContext m_ctx = null;
- EJBContext ejbcontext;
+ EJBContext ejbcontext;
public void setSessionContext(jakarta.ejb.SessionContext ctx)
{
m_ctx = ctx;
@@ -40,15 +40,15 @@
{
}
- public void ejbRemove()
+ public void ejbRemove()
{
}
- public void ejbActivate()
+ public void ejbActivate()
{
}
- public void ejbPassivate()
+ public void ejbPassivate()
{
}
@@ -65,39 +65,39 @@
bmsample4 remote = null;
int resultFromBean4=1;
try {
- System.out.println("in bean1....");
+ System.out.println("in bean1....");
InitialContext ctx = new InitialContext();
DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/oraclethird");
- System.out.println("ds lookup succeeded");
+ System.out.println("ds lookup succeeded");
conn = ds.getConnection();
System.out.println("Connection succeeded"+conn);
stmt = conn.createStatement();
- //stmt.executeQuery("delete from status1");
+ //stmt.executeQuery("delete from status1");
String query1 = "select * from status1";
- stmt.executeUpdate("insert into status1 values('bean3',3)");
+ stmt.executeUpdate("insert into status1 values('bean3',3)");
rs = stmt.executeQuery(query1);
while(rs.next())
{
System.out.println("Last Name: " + rs.getString("NAME"));
System.out.println("First Name: " + rs.getInt("num"));
}
-
+
Object objref = ctx.lookup("ejb/bmsamplebean4");
- home = (bmsample4home)PortableRemoteObject.narrow(objref, bmsample4home.class);
+ home = (bmsample4home)PortableRemoteObject.narrow(objref, bmsample4home.class);
remote = home.create();
resultFromBean4 = remote.performDBOps();
- rs.close();
+ rs.close();
stmt.close();
conn.close();
- }
+ }
catch (SQLException e)
{
- System.out.println("SQLException is : " + e);
+ System.out.println("SQLException is : " + e);
return 1;
}
catch (Exception e)
{
- System.out.println("Exception is : " + e);
+ System.out.println("Exception is : " + e);
return 1;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
index 9542700..dd59b7d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
@@ -25,9 +25,9 @@
import javax.sql.*;
import java.sql.*;
-public class bmsamplebean4 implements SessionBean
+public class bmsamplebean4 implements SessionBean
{
- EJBContext ejbcontext;
+ EJBContext ejbcontext;
private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(jakarta.ejb.SessionContext ctx)
{
@@ -38,15 +38,15 @@
{
}
- public void ejbRemove()
+ public void ejbRemove()
{
}
- public void ejbActivate()
+ public void ejbActivate()
{
}
- public void ejbPassivate()
+ public void ejbPassivate()
{
}
@@ -60,15 +60,15 @@
Statement stmt = null,stmt2=null;
ResultSet rs = null,rs2=null;
try {
- System.out.println("in bean2 ....");
+ System.out.println("in bean2 ....");
InitialContext ctx = new InitialContext();
DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/oracleds2");
- System.out.println("ds lookup succeeded");
+ System.out.println("ds lookup succeeded");
conn = ds.getConnection();
System.out.println("Connection succeeded"+conn);
stmt = conn.createStatement();
String query1 = "select * from status1";
- stmt.executeUpdate("insert into status1 values('bean4',3)");
+ stmt.executeUpdate("insert into status1 values('bean4',3)");
rs = stmt.executeQuery(query1);
while(rs.next())
{
@@ -78,14 +78,14 @@
rs.close();
stmt.close();
conn.close();
- }
+ }
catch (SQLException e){
e.printStackTrace();
return 1;
}
catch (Exception e)
{
- e.printStackTrace();
+ e.printStackTrace();
return 1;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java
index a7023be..3698411 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/servlet/bmservlet4.java
@@ -25,7 +25,7 @@
import javax.rmi.PortableRemoteObject;
import javax.sql.*;
import com.sun.s1asdev.jdbc.transactions.test1.ejb.*;
-
+
public class bmservlet4 extends HttpServlet
{
public void doGet(HttpServletRequest req, HttpServletResponse res)
@@ -33,7 +33,7 @@
{
defaultAction(req, res);
}
-
+
public void doPost(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException
{
@@ -59,7 +59,7 @@
res.setContentType("text/plain");
PrintWriter out = res.getWriter();
Context ctx;
-
+
try
{
Hashtable env = new Hashtable(1);
@@ -71,10 +71,10 @@
remote = home.create();
out.println("calling bean1 ");
out.println(" the result of invoking the ejb method is " + remote.performDBOps());
- }
+ }
catch (Exception e)
{
- System.out.println(" ERROR: " + e);
+ System.out.println(" ERROR: " + e);
}
try
{
@@ -82,17 +82,17 @@
java.sql.Connection conn = null,conn2 = null;
java.sql.Statement stmt = null,stmt2 = null;
java.sql.ResultSet rs = null,rs2 = null;
- ctx = new InitialContext();
- ds = (DataSource)ctx.lookup("jdbc/ora1");
- ds2 = (DataSource)ctx.lookup("jdbc/ora2");
-
+ ctx = new InitialContext();
+ ds = (DataSource)ctx.lookup("jdbc/ora1");
+ ds2 = (DataSource)ctx.lookup("jdbc/ora2");
+
conn = ds.getConnection();
- conn2 = ds2.getConnection();
- stmt=conn.createStatement();
- stmt2=conn2.createStatement();
- out.println("Verifying table contents ....");
- rs=stmt.executeQuery("select * from status1");
- int count=0;
+ conn2 = ds2.getConnection();
+ stmt=conn.createStatement();
+ stmt2=conn2.createStatement();
+ out.println("Verifying table contents ....");
+ rs=stmt.executeQuery("select * from status1");
+ int count=0;
while (rs.next())
{count++;
out.println("record = "+rs.getString(1));
@@ -105,25 +105,25 @@
}
out.println("Total Records in table1 = "+count);
out.println("Total Records in table2 = "+count2);
- if ((count==1)&&(count2==1))
+ if ((count==1)&&(count2==1))
out.println("Result:PASS");
else
out.println("Result:FAIL");
// stmt.executeUpdate("delete from status1");
// stmt2.executeUpdate("delete from status2");
// conn.commit();
- // conn2.commit();
+ // conn2.commit();
rs.close();
out.println("deleted in 1");
out.println("deleted in 2");
- rs2.close();
+ rs2.close();
stmt.close();
- stmt2.close();
- conn.close();
- conn2.close();*/
- }catch(Exception e){}
-
-
+ stmt2.close();
+ conn.close();
+ conn2.close();*/
+ }catch(Exception e){}
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.properties
index 43125dc..1b9a9e8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/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="as7-jts"/>
<property name="app.type" value="application"/>
@@ -25,7 +25,7 @@
<property name="sun-web.xml" value="descriptor/sun-web.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="appname" value="txnstatus-test2"/>
+<property name="appname" value="txnstatus-test2"/> \u0020
<!-- pool1 -->
<property name="ora.user1" value="aditya"/>
<property name="ora.pwd1" value="aditya"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.xml
index bab3ae8..8490b8c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.xml
@@ -29,14 +29,14 @@
&commonBuild;
&testproperties;
-
+
<target name="all" depends="build,setup-jdbc,setup-sql,deploy,runweb,undeploy,cleanup-jdbc,cleanup-sql"/>
-
+
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -56,7 +56,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
--->
+-->
<!--
<target name="build" depends="compile">
<antcall target="build-ear-war"/>
@@ -78,7 +78,7 @@
<delete dir="${build.classes.dir}"/>
<mkdir dir="${build.classes.dir}"/>
<antcall target="compile-servlet"/>
- -->
+ -->
<echo message="my build classes dir is:${build.classes.dir}"/>
<delete file="${war.file}"/>
<mkdir dir="${build.classes.dir}/tmp"/>
@@ -104,7 +104,7 @@
<echo message="created war file ${war.file}"/>
<delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
</target>
-
+
<target name="build-ear-war" depends="ejb-jar-common">
<antcall target="package-war-local">
<param name="war.classes" value="${build.classes.dir}"/>
@@ -118,7 +118,7 @@
tofile="${assemble.dir}/META-INF/sun-application.xml"
failonerror="false"/>
<ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
- <fileset dir="${assemble.dir}"
+ <fileset dir="${assemble.dir}"
includes="*.jar,*.war,META-INF/sun-application.xml,lib/reporter.jar"/>
</ear>
</target>
@@ -147,8 +147,8 @@
<antcall target="create-jdbc-resource-common" >
<param name="jdbc.conpool.name" value="jts-xa-pool2"/>
<param name="jdbc.resource.name" value="jdbc/oracleds2"/>
- </antcall>
-
+ </antcall>
+
<antcall target="create-jdbc-oracle-xa-pool" >
<param name="poolname" value="jts-xa-pool1"/>
<param name="ora.user" value="${ora.user1}"/>
@@ -156,13 +156,13 @@
<param name="ora.sid" value="${ora.sid1}"/>
<param name="ora.url" value="${ora.url1}"/>
</antcall>
-
+
<antcall target="create-jdbc-resource-common" >
<param name="jdbc.conpool.name" value="jts-xa-pool1"/>
<param name="jdbc.resource.name" value="jdbc/oraclethird"/>
</antcall>
</target>
-
+
<target name="cleanup-jdbc" >
<antcall target="delete-jdbc-resource-common" >
<param name="jdbc.resource.name" value="jdbc/oracleds2"/>
@@ -171,16 +171,16 @@
<antcall target="delete-jdbc-resource-common" >
<param name="jdbc.resource.name" value="jdbc/oraclethird"/>
</antcall>
-
+
<antcall target="delete-jdbc-connpool-common" >
<param name="jdbc.conpool.name" value="jts-xa-pool2"/>
</antcall>
-
+
<antcall target="delete-jdbc-connpool-common" >
<param name="jdbc.conpool.name" value="jts-xa-pool1"/>
</antcall>
</target>
-
+
<target name="setup-sql" >
<echo message="Executing sql statement at from ${create.sql.file1}"/>
<sql
@@ -192,7 +192,7 @@
onerror="continue"
print="yes"
classpath="${dbdriver.classpath}"/>
-
+
<echo message="Executing sql statement at from ${create.sql.file2}"/>
<sql
driver="${db.driver}"
@@ -217,7 +217,7 @@
onerror="continue"
print="yes"
classpath="${dbdriver.classpath}"/>
-
+
<echo message="Executing sql statement at from ${drop.sql.file2}"/>
<sql
driver="${db.driver}"
@@ -230,28 +230,28 @@
classpath="${dbdriver.classpath}"/>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
-
+
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
-
- <!--
+
+ <!--
Tomcat's GTest tool for webtests
-->
<target name="runweb" depends="init-common">
- <taskdef name="gtest" classname="org.apache.tomcat.task.GTest"
+ <taskdef name="gtest" classname="org.apache.tomcat.task.GTest"
classpath="${env.APS_HOME}/lib/testdriversecurity.jar:${env.APS_HOME}/lib/commons-logging.jar"/>
<property name="wgdir" value="${env.APS_HOME}/devtests/jdbc/transactions/test2"/>
- <gtest request="GET /txnstatus-test2/bmservlet HTTP/1.0"
+ <gtest request="GET /txnstatus-test2/bmservlet HTTP/1.0"
debug="9"
firstTask="true"
lastTest="true"
@@ -272,7 +272,7 @@
testCaseName="txnstatus-test2"
testCaseDescription="txnstatus-test2"
testStrategy="txnstatus-test2"/>
- </target>
+ </target>
<target name="create-jdbc-oracle-xa-pool" depends="init-common">
<antcall target="create-jdbc-connpool-common" >
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
index 78835ac..69f9521 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
@@ -28,6 +28,6 @@
public interface bmsample1 extends EJBObject
{
public int performDBOps() throws RemoteException;
- public int performDBOps2() throws RemoteException;
+ public int performDBOps2() throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
index 90bfeeb..0565d71 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
@@ -25,14 +25,14 @@
import javax.sql.*;
import java.sql.*;
-public class bmsamplebean1 implements SessionBean
+public class bmsamplebean1 implements SessionBean
{
- EJBContext ejbcontext;
-transient javax.sql.DataSource ds,ds2;
-transient java.sql.Connection conn = null,conn2=null;
+ EJBContext ejbcontext;
+transient javax.sql.DataSource ds,ds2;
+transient java.sql.Connection conn = null,conn2=null;
transient Statement stmt = null,stmt2=null;
transient ResultSet rs = null,rs2=null;
-
+
public void setSessionContext(jakarta.ejb.SessionContext ctx)
{
@@ -43,15 +43,15 @@
{
}
- public void ejbRemove()
+ public void ejbRemove()
{
}
- public void ejbActivate()
+ public void ejbActivate()
{
}
- public void ejbPassivate()
+ public void ejbPassivate()
{
}
@@ -63,21 +63,21 @@
{
try {
- System.out.println("in method1");
+ System.out.println("in method1");
InitialContext ctx = new InitialContext();
DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/oraclethird");
- System.out.println("ds lookup succeeded");
+ System.out.println("ds lookup succeeded");
UserTransaction tx =(UserTransaction)m_ctx.getUserTransaction();
- System.out.println("utx succeeded"+tx);
+ System.out.println("utx succeeded"+tx);
conn = ds.getConnection();
System.out.println("Connection succeeded"+conn);
- tx.begin();
- System.out.println("txn status :" +tx.getStatus());
+ tx.begin();
+ System.out.println("txn status :" +tx.getStatus());
//conn = ds.getConnection();
//System.out.println("Connection succeeded"+conn);
stmt = conn.createStatement();
- //stmt.executeQuery("delete from status21");
- stmt.executeUpdate("insert into status21 values('method1',3)");
+ //stmt.executeQuery("delete from status21");
+ stmt.executeUpdate("insert into status21 values('method1',3)");
String query1 = "select * from status21";
rs = stmt.executeQuery(query1);
while(rs.next())
@@ -85,15 +85,15 @@
System.out.println("Last Name: " + rs.getString("NAME"));
System.out.println("First Name: " + rs.getInt("num"));
}
- }
+ }
catch (SQLException e)
{
- System.out.println("SQLException is : " + e);
+ System.out.println("SQLException is : " + e);
return 1;
}
catch (Exception e)
{
- System.out.println("Exception is : " + e);
+ System.out.println("Exception is : " + e);
return 1;
}
@@ -101,42 +101,42 @@
}
- public int performDBOps2()
- {
- try{
- InitialContext ctx = new InitialContext();
- System.out.println("in method2");
- ds2 = (DataSource) ctx.lookup("java:comp/env/jdbc/oracleds2");
- System.out.println("second ds lookup");
- UserTransaction tx =(UserTransaction)m_ctx.getUserTransaction();
- System.out.println("got second tx"+tx);
- System.out.println("txn status :" +tx.getStatus());
+ public int performDBOps2()
+ {
+ try{
+ InitialContext ctx = new InitialContext();
+ System.out.println("in method2");
+ ds2 = (DataSource) ctx.lookup("java:comp/env/jdbc/oracleds2");
+ System.out.println("second ds lookup");
+ UserTransaction tx =(UserTransaction)m_ctx.getUserTransaction();
+ System.out.println("got second tx"+tx);
+ System.out.println("txn status :" +tx.getStatus());
- conn2 = ds2.getConnection();
- System.out.println("Connection succeeded" +conn2);
- stmt2 = conn2.createStatement();
+ conn2 = ds2.getConnection();
+ System.out.println("Connection succeeded" +conn2);
+ stmt2 = conn2.createStatement();
// stmt2.executeQuery("delete from status2");
- stmt2.executeUpdate("insert into status2 values('method2')");
- String query1 = "select * from status2";
- rs2 = stmt2.executeQuery(query1);
- System.out.println("after rs2");
- while(rs2.next())
- {
- System.out.println("Last Name: " + rs2.getString("NAME"));
- }
+ stmt2.executeUpdate("insert into status2 values('method2')");
+ String query1 = "select * from status2";
+ rs2 = stmt2.executeQuery(query1);
+ System.out.println("after rs2");
+ while(rs2.next())
+ {
+ System.out.println("Last Name: " + rs2.getString("NAME"));
+ }
System.out.println("txn status :" +tx.getStatus());
- // Thread.sleep(100000);
- System.out.println("txn status :" +tx.getStatus());
- rs.close();
- rs2.close();
- stmt.close();
- conn.close();
- stmt2.close();
- conn2.close();
- tx.commit();
- }
- catch (SQLException e)
- {
+ // Thread.sleep(100000);
+ System.out.println("txn status :" +tx.getStatus());
+ rs.close();
+ rs2.close();
+ stmt.close();
+ conn.close();
+ stmt2.close();
+ conn2.close();
+ tx.commit();
+ }
+ catch (SQLException e)
+ {
try
{
System.out.println("exception " + e.getMessage());
@@ -144,25 +144,25 @@
System.out.println("error code" +e.getErrorCode());
System.out.println("ql state " +e.getSQLState());
- /*
- e=e.getNextException();
+ /*
+ e=e.getNextException();
System.out.println("exception " + e.getMessage());
e.printStackTrace();
System.out.println("error code" +e.getErrorCode());
System.out.println("ql state " +e.getSQLState());
- */
+ */
return 1;
- }catch(Exception ex)
+ }catch(Exception ex)
{
System.out.println("exception " + ex.getMessage());
ex.printStackTrace();
return 1;
}
}
- catch (Exception ex)
- {
- System.out.println("Exception is : " + ex.getMessage());
+ catch (Exception ex)
+ {
+ System.out.println("Exception is : " + ex.getMessage());
ex.printStackTrace();
return 1;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java
index d949ae1..0bbc721 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/servlet/bmservlet.java
@@ -26,7 +26,7 @@
import javax.sql.*;
import com.sun.s1asdev.jdbc.transactions.test2.ejb.*;
-
+
public class bmservlet extends HttpServlet
{
public void doGet(HttpServletRequest req, HttpServletResponse res)
@@ -34,7 +34,7 @@
{
defaultAction(req, res);
}
-
+
public void doPost(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException
{
@@ -61,13 +61,13 @@
PrintWriter out = res.getWriter();
Context ctx;
Properties p;
-
+
try
{
- Hashtable env = new Hashtable(1);
+ Hashtable env = new Hashtable(1);
env.put("javax.naming.factory.initial", "com.netscape.server.jndi.RootContextFactory");
- ctx = new InitialContext(env);
- //TestUtil.init(p);
+ ctx = new InitialContext(env);
+ //TestUtil.init(p);
Object objref = ctx.lookup("ejb/bmsamplebean1");
home = (bmsample1home)PortableRemoteObject.narrow(objref, bmsample1home.class);
remote = home.create();
@@ -75,10 +75,10 @@
out.println(" the result of invoking the ejb method is " + remote.performDBOps());
out.println("calling M2 ->DB2");
out.println("...... result of invoking the ejb method is " + remote.performDBOps2());
- }
+ }
catch (Exception e)
{
- System.out.println(" ERROR: " + e);
+ System.out.println(" ERROR: " + e);
}
try
{
@@ -86,17 +86,17 @@
java.sql.Connection conn = null,conn2 = null;
java.sql.Statement stmt = null,stmt2 = null;
java.sql.ResultSet rs = null,rs2 = null;
- ctx = new InitialContext();
- ds = (DataSource)ctx.lookup("java:comp/env/jdbc/oraclethird");
- ds2 = (DataSource)ctx.lookup("java:comp/env/jdbc/oracleds2");
-
+ ctx = new InitialContext();
+ ds = (DataSource)ctx.lookup("java:comp/env/jdbc/oraclethird");
+ ds2 = (DataSource)ctx.lookup("java:comp/env/jdbc/oracleds2");
+
conn = ds.getConnection();
- conn2 = ds2.getConnection();
- stmt=conn.createStatement();
- stmt2=conn2.createStatement();
- out.println("..........Verifying table contents ....");
- rs=stmt.executeQuery("select * from status21");
- int count=0;
+ conn2 = ds2.getConnection();
+ stmt=conn.createStatement();
+ stmt2=conn2.createStatement();
+ out.println("..........Verifying table contents ....");
+ rs=stmt.executeQuery("select * from status21");
+ int count=0;
while (rs.next())
{count++;
out.println("record = "+rs.getString(1));
@@ -109,26 +109,26 @@
}
out.println("Total Records in table1 = "+count);
out.println("Total Records in table2 = "+count2);
- if ((count==1)&&(count2==1))
+ if ((count==1)&&(count2==1))
out.println("Result:FAIL");
else
out.println("Result:PASS");
stmt.executeUpdate("delete from status21");
stmt2.executeUpdate("delete from status2");
conn.commit();
- conn2.commit();
+ conn2.commit();
rs.close();
out.println("deleted in 1");
out.println("deleted in 2");
- rs2.close();
+ rs2.close();
stmt.close();
- stmt2.close();
+ stmt2.close();
- conn.close();
- conn2.close();
- }catch(Exception e){}
-
-
+ conn.close();
+ conn2.close();
+ }catch(Exception e){}
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.properties
index c342ea4..9780544 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-transparent_pool_reconfig"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.xml
index c35193b..49d63a6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/build.xml
@@ -71,7 +71,7 @@
</antcall>
<!--<antcall target="deploy-jdbc-common"/>-->
- <!-- Workaround for issue 18783 -->
+ <!-- Workaround for issue 18783 -->
<antcall target="asadmin-common">
<param name="admin.command" value="create-module-config"/>
<param name="operand.props"
@@ -123,7 +123,7 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.java:app/ql-jdbc-pool.property.dynamic-reconfiguration-wait-timeout-in-seconds=120"/>
</antcall>
-
+
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/sql/create_pointbase.sql
index dd4c5e5..11e61ee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/sql/create_pointbase.sql
@@ -1,10 +1,10 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.properties
index c342ea4..9780544 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-transparent_pool_reconfig"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.xml
index 84c5cef..926b2e5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/build.xml
@@ -68,7 +68,7 @@
</antcall>
<antcall target="deploy-jdbc-common"/>
- <!-- Workaround for issue 18783 -->
+ <!-- Workaround for issue 18783 -->
<antcall target="asadmin-common">
<param name="admin.command" value="create-module-config"/>
<param name="operand.props"
@@ -119,7 +119,7 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.ql-jdbc-pool.property.dynamic-reconfiguration-wait-timeout-in-seconds=120"/>
</antcall>
-
+
<antcall target="deploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/sql/create_pointbase.sql
index dd4c5e5..11e61ee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/sql/create_pointbase.sql
@@ -1,10 +1,10 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.properties
index 6bc5535..4630aa4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp"/>
-<property name="appname" value="${module}-enroller"/>
+<property name="appname" value="${module}-enroller"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="default-instance" value="${env.S1AS_HOME}/domains/domain1"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.xml
index 323ca7e..ab88d38 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/build.xml
@@ -32,17 +32,17 @@
&run;
<!-- <target name="all">
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="autodeploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup"/>
- <antcall target="restart"/>
- <antcall target="setup"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
+ <antcall target="build"/>
+ <antcall target="setup"/>
+ <antcall target="autodeploy"/>
+ <antcall target="run"/>
+ <antcall target="undeploy"/>
+ <antcall target="unsetup"/>
+ <antcall target="restart"/>
+ <antcall target="setup"/>
+ <antcall target="deploy"/>
+ <antcall target="run"/>
+ <antcall target="undeploy"/>
<antcall target="unsetup"/>
</target> -->
@@ -56,7 +56,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"/>
@@ -68,13 +68,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-oracle-common">
<param name="sql.file" value="sql/create_oracle.sql"/>
@@ -87,15 +87,15 @@
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB-container"/>
- </antcall>
+ </antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB-application"/>
- </antcall>
- <antcall target="reconfig-common"/>
+ </antcall>
+ <antcall target="reconfig-common"/>
</target>
- <target name="execute-oracle-common" depends="init-common, check-db" if="oracle">
+ <target name="execute-oracle-common" depends="init-common, check-db" if="oracle">
<antcall target="execute-sql-common">
<param name="db.driver" value="${oracle.driver}"/>
<param name="db.url" value="${oracle.url}"/>
@@ -105,7 +105,7 @@
</antcall>
</target>
- <target name="deploy-oracle-common" depends="init-common, check-db" if="oracle">
+ <target name="deploy-oracle-common" depends="init-common, check-db" if="oracle">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command"
value="create-jdbc-connection-pool
@@ -129,25 +129,25 @@
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- </antcall>
+ </antcall>
</target>
- <target name="deploy-pointbase-common" depends="init-common, check-db" unless="oracle">
+ <target name="deploy-pointbase-common" depends="init-common, check-db" unless="oracle">
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- </antcall>
+ </antcall>
</target>
- <target name="execute-pointbase-common" depends="init-common, check-db" unless="oracle">
+ <target name="execute-pointbase-common" depends="init-common, check-db" unless="oracle">
<antcall target="execute-sql-common"/>
</target>
<target name="deploy" depends="init-common">
<echo message="Deploying via asadmin..."/>
<antcall target="deploy-common"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
@@ -172,7 +172,7 @@
<antcall target="undeploy-common"/>
<!-- <echo message="SHEETAL : bug during undeployment. The generated dir does not get deleted. Hence forcing deletion as a temporary solution."/>
<delete dir="${deployed-apps}/${appname}App_1"/> -->
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="execute-pointbase-common">
@@ -191,7 +191,7 @@
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
@@ -208,7 +208,7 @@
<target name="autodeploy-ear" depends="init-common">
<echo message="Dropping the app under the autodeploy dir..."/>
- <delete file="${autodeploy.dir}/${appname}App.ear_deployed" failonerror="false"/>
+ <delete file="${autodeploy.dir}/${appname}App.ear_deployed" failonerror="false"/>
<copy file="${assemble.dir}/${appname}App.ear"
todir="${autodeploy.dir}"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/client/EnrollerClient.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/client/EnrollerClient.java
index f5b23b0..871cd4d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/client/EnrollerClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/client/EnrollerClient.java
@@ -26,80 +26,80 @@
//Stress Client
public class EnrollerClient {
- private static final int MAXTHREADS= 1;
- private static final int MAXCYCLESPERTHREAD=1;
- private static ArrayList threadsAL = new ArrayList();
- private static Object lock = new Object();
-
- private static SimpleReporterAdapter status =
+ private static final int MAXTHREADS= 1;
+ private static final int MAXCYCLESPERTHREAD=1;
+ private static ArrayList threadsAL = new ArrayList();
+ private static Object lock = new Object();
+
+ private static SimpleReporterAdapter status =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
try {
long timeStart = System.currentTimeMillis();
System.out.println("Starting the test");
- status.addDescription("Testing stress cmp roster app.");
- for(int i = 0 ; i < MAXTHREADS; i++){
- final int cnt = i;
- //create Thrread to execute doTest
- Thread t = new Thread(new Runnable(){
- public void run() {
- try {
-
- String threadId = "Thr-" + cnt;
+ status.addDescription("Testing stress cmp roster app.");
+ for(int i = 0 ; i < MAXTHREADS; i++){
+ final int cnt = i;
+ //create Thrread to execute doTest
+ Thread t = new Thread(new Runnable(){
+ public void run() {
+ try {
+
+ String threadId = "Thr-" + cnt;
System.out.print(""+cnt);
- for(int j=0; j < MAXCYCLESPERTHREAD; j++ ){
- System.out.print(".");
- doTest(threadId);
- }
- } catch (Exception e) {
- System.err.println("Caught an exception in Thread: " + e.toString());
- e.printStackTrace();
- }
- }
- });
- threadsAL.add(t);
- t.start();
- }
-
- //finally join all threads
- for(int i=0; i < threadsAL.size(); i++){
- ((Thread)(threadsAL.get(i))).join();
- }
- long timeStop = System.currentTimeMillis();
- //Approximately 65 transactions to myRoster per cycle per thread
- System.out.println(" " + (double)(MAXTHREADS*MAXCYCLESPERTHREAD*65) + " transactions COMPLETED in " + (long)(timeStop - timeStart) + "ms" );
+ for(int j=0; j < MAXCYCLESPERTHREAD; j++ ){
+ System.out.print(".");
+ doTest(threadId);
+ }
+ } catch (Exception e) {
+ System.err.println("Caught an exception in Thread: " + e.toString());
+ e.printStackTrace();
+ }
+ }
+ });
+ threadsAL.add(t);
+ t.start();
+ }
+
+ //finally join all threads
+ for(int i=0; i < threadsAL.size(); i++){
+ ((Thread)(threadsAL.get(i))).join();
+ }
+ long timeStop = System.currentTimeMillis();
+ //Approximately 65 transactions to myRoster per cycle per thread
+ System.out.println(" " + (double)(MAXTHREADS*MAXCYCLESPERTHREAD*65) + " transactions COMPLETED in " + (long)(timeStop - timeStart) + "ms" );
if ( checkIfPassed()) {
- status.addStatus("Looks it is passed " , status.PASS);
+ status.addStatus("Looks it is passed " , status.PASS);
} else {
- status.addStatus("Looks it is passed " , status.FAIL);
+ status.addStatus("Looks it is passed " , status.FAIL);
}
status.printSummary("rosterAppID");
System.exit(0);
-
+
} catch (Exception ex) {
System.err.println("Caught an exception in main: " + ex.toString());
ex.printStackTrace();
}
}
-
+
private static void doTest(String threadId) throws Exception{
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome home =
- (EnrollerHome)PortableRemoteObject.narrow(objref,
+ EnrollerHome home =
+ (EnrollerHome)PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller e = home.create();
for (int i=0; i <MAXCYCLESPERTHREAD; i++) {
System.out.println("Result: " + e.doTest(threadId));
- }
+ }
- e.remove();
+ e.remove();
}
@@ -107,8 +107,8 @@
Context initial = new InitialContext();
Object objref = initial.lookup("java:comp/env/ejb/SimpleEnroller");
- EnrollerHome home =
- (EnrollerHome)PortableRemoteObject.narrow(objref,
+ EnrollerHome home =
+ (EnrollerHome)PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller e = home.create();
@@ -117,7 +117,7 @@
System.out.println("Expected Result : 0" );
System.out.println("Actual Result : " + result);
- e.remove();
+ e.remove();
if (result == 0) {
return true;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
index d39cd75..9f71cda 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
@@ -20,7 +20,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
public String doTest(String threadId)
throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
index 3c98e03..4096b5c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -25,7 +25,7 @@
import javax.naming.*;
public class EnrollerBean implements SessionBean {
-
+
private DataSource ds;
private DataSource ds_container;
private DataSource ds_app;
@@ -57,10 +57,10 @@
test1(id);
test2(id);
test3(id);
- test4(id);
+ test4(id);
test5(id);
- test6(id);
- //test7(id);
+ test6(id);
+ //test7(id);
}
// Tests a tx and verifies that work is actually committed.
@@ -72,7 +72,7 @@
Connection con = ds.getConnection();
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
con.close();
@@ -113,7 +113,7 @@
Connection con = ds.getConnection();
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
con.close();
@@ -152,7 +152,7 @@
t.begin();
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
con.close();
@@ -191,7 +191,7 @@
t.begin();
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
Connection con1 = ds.getConnection();
@@ -225,7 +225,7 @@
Connection con = ds.getConnection();
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
Connection con1 = ds.getConnection();
@@ -268,7 +268,7 @@
Connection con = ds.getConnection();
System.out.println("Got conn");
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
System.out.println("close conn");
con.close();
@@ -330,12 +330,12 @@
Connection con = ds.getConnection();
for (int i=0; i < 5; i++) {
- insertEntry(con, id + i, i, id + ":" + i);
+ insertEntry(con, id + i, i, id + ":" + i);
}
con.close();
boolean pass = false;
- Connection con4 = null;
+ Connection con4 = null;
System.out.println("con4.getConnection");
try {
con4 = ds_container.getConnection();
@@ -377,7 +377,7 @@
String selectStatement =
"select count(*) " +
"from testTx ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
ResultSet rs = prepStmt.executeQuery();
@@ -426,7 +426,7 @@
String insertStatement =
"insert into testTx values ( ? , ? , ?)";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, key);
@@ -437,7 +437,7 @@
prepStmt.close();
}
- private void deleteEntry(Connection con, String key, int iterkey)
+ private void deleteEntry(Connection con, String key, int iterkey)
throws SQLException {
String deleteStatement =
@@ -452,7 +452,7 @@
prepStmt.close();
}
- private void updateEntry(Connection con, String key, int iterkey, String value)
+ private void updateEntry(Connection con, String key, int iterkey, String value)
throws SQLException {
String deleteStatement =
@@ -469,13 +469,13 @@
prepStmt.close();
}
- private String selectValue(Connection con, String key, int iterkey)
+ private String selectValue(Connection con, String key, int iterkey)
throws SQLException {
String selectStatement =
"select value " +
"from testTx where key = ? and iterkey = ?";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, key);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_oracle.sql b/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_oracle.sql
index 917d860..f73ca58 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_oracle.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_oracle.sql
@@ -1,9 +1,9 @@
DROP TABLE testTx;
-CREATE TABLE testTx
+CREATE TABLE testTx
(
- key VARCHAR(255) PRIMARY KEY,
- iterkey INTEGER ,
- value VARCHAR(255)
+ key VARCHAR(255) PRIMARY KEY,
+ iterkey INTEGER ,
+ value VARCHAR(255)
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_pointbase.sql
index f3f8494..44201b0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
DROP TABLE testTx;
-CREATE TABLE testTx
+CREATE TABLE testTx
(
- key varchar(255) constraint pk_key primary key,
- iterkey integer ,
- value varchar(255)
+ key varchar(255) constraint pk_key primary key,
+ iterkey integer ,
+ value varchar(255)
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.properties
index 8e64bc7..4c2fa37 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-txafternontx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.xml
index 32df84d..532c0b1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,32 +48,32 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-txafternontx-pool"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-txafternontx-pool"/>
- <param name="jdbc.resource.name" value="jdbc/txafternontx"/>
+ <param name="jdbc.resource.name" value="jdbc/txafternontx"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -82,13 +82,13 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/txafternontx"/>
</antcall>
-
+
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-txafternontx-pool"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/client/Client.java
index 27dec73..ddb93a7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/client/Client.java
@@ -25,27 +25,27 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "TxAfterNonTx ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "TxAfterNonTx ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running txafternontx testSuite1 ");
+
+ stat.addDescription("Running txafternontx testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
-
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
+
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/descriptor/ejb-jar.xml
index 55e1476..9030b96 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/descriptor/ejb-jar.xml
@@ -62,12 +62,12 @@
<container-transaction>
<method>
<ejb-name>SimpleSessionEJB</ejb-name>
- <method-name>updateDb</method-name>
+ <method-name>updateDb</method-name>
</method>
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
-->
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
index 80d2028..4ce8ccd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
@@ -28,14 +28,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -44,58 +44,58 @@
/**
*/
public boolean test1() throws Exception {
- com.sun.appserv.jdbc.DataSource ds =
- (com.sun.appserv.jdbc.DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ com.sun.appserv.jdbc.DataSource ds =
+ (com.sun.appserv.jdbc.DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
System.out.println("getting first tx connection");
- try {
- conn1 = ds.getConnection();
- if (conn1.getAutoCommit() == true ) {
- throw new SQLException("Before nontx: Connection with wrong autocommit value");
- }
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
+ try {
+ conn1 = ds.getConnection();
+ if (conn1.getAutoCommit() == true ) {
+ throw new SQLException("Before nontx: Connection with wrong autocommit value");
+ }
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
System.out.println("getting nontx connection");
try {
- conn1 = ds.getNonTxConnection();
- if (conn1.getAutoCommit() == false ) {
- throw new SQLException("NonTX Connection with wrong autocommit value");
- }
- } catch( Exception e ) {
- e.printStackTrace();
- return false;
- } finally {
- try {conn1.close();} catch(Exception e) {}
- }
+ conn1 = ds.getNonTxConnection();
+ if (conn1.getAutoCommit() == false ) {
+ throw new SQLException("NonTX Connection with wrong autocommit value");
+ }
+ } catch( Exception e ) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ try {conn1.close();} catch(Exception e) {}
+ }
System.out.println("getting second tx connection");
- try {
- conn1 = ds.getConnection();
- if (conn1.getAutoCommit() == true ) {
- throw new SQLException("After nontx: Connection with wrong autocommit value");
- }
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return true;
+ try {
+ conn1 = ds.getConnection();
+ if (conn1.getAutoCommit() == true ) {
+ throw new SQLException("After nontx: Connection with wrong autocommit value");
+ }
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+
+ return true;
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_mysql.sql b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_mysql.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_mysql.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_mysql.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_pointbase.sql
index 637a7c5..c3b0d5c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO O_CUSTOMER VALUES (0, 'abcd');
-INSERT INTO O_CUSTOMER VALUES (1, 'pqrs');
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO O_CUSTOMER VALUES (0, 'abcd');
+INSERT INTO O_CUSTOMER VALUES (1, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.properties
index 8e64bc7..4c2fa37 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-txafternontx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.xml
index 32df84d..532c0b1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,32 +48,32 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="create-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-txafternontx-pool"/>
</antcall>
<antcall target="create-jdbc-resource-common">
<param name="jdbc.conpool.name" value="jdbc-txafternontx-pool"/>
- <param name="jdbc.resource.name" value="jdbc/txafternontx"/>
+ <param name="jdbc.resource.name" value="jdbc/txafternontx"/>
</antcall>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -82,13 +82,13 @@
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/txafternontx"/>
</antcall>
-
+
<antcall target="delete-jdbc-connpool-common">
<param name="jdbc.conpool.name" value="jdbc-txafternontx-pool"/>
</antcall>
-
+
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/client/Client.java
index b7988a2..46cf213 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/client/Client.java
@@ -25,27 +25,27 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "TxAfterNonTx-Jndi ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "TxAfterNonTx-Jndi ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running txafternontx testSuite1 ");
+
+ stat.addDescription("Running txafternontx testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
-
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
+
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/descriptor/ejb-jar.xml
index 55e1476..9030b96 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/descriptor/ejb-jar.xml
@@ -62,12 +62,12 @@
<container-transaction>
<method>
<ejb-name>SimpleSessionEJB</ejb-name>
- <method-name>updateDb</method-name>
+ <method-name>updateDb</method-name>
</method>
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
-->
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
index 2ab67bc..c717a58 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
@@ -28,18 +28,18 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
- private InitialContext ic1_;
+ private InitialContext ic_;
+ private InitialContext ic1_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
+ try {
+ ic_ = new InitialContext();
Hashtable ht = new Hashtable();
ht.put("com.sun.enterprise.connectors.jndisuffix", "__nontx");
- ic1_ = new InitialContext(ht);
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ ic1_ = new InitialContext(ht);
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -48,60 +48,60 @@
/**
*/
public boolean test1() throws Exception {
- com.sun.appserv.jdbc.DataSource ds =
- (com.sun.appserv.jdbc.DataSource)ic_.lookup("java:comp/env/DataSource");
- com.sun.appserv.jdbc.DataSource ds1 =
- (com.sun.appserv.jdbc.DataSource)ic1_.lookup("jdbc/txafternontx");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = false;
+ com.sun.appserv.jdbc.DataSource ds =
+ (com.sun.appserv.jdbc.DataSource)ic_.lookup("java:comp/env/DataSource");
+ com.sun.appserv.jdbc.DataSource ds1 =
+ (com.sun.appserv.jdbc.DataSource)ic1_.lookup("jdbc/txafternontx");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = false;
System.out.println("getting first tx connection");
- try {
- conn1 = ds.getConnection();
- if (conn1.getAutoCommit() == true ) {
- throw new SQLException("Before nontx: Connection with wrong autocommit value");
- }
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
+ try {
+ conn1 = ds.getConnection();
+ if (conn1.getAutoCommit() == true ) {
+ throw new SQLException("Before nontx: Connection with wrong autocommit value");
+ }
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
+ }
+
System.out.println("getting nontx connection");
try {
- conn1 = ds1.getConnection();
- if (conn1.getAutoCommit() == false ) {
- throw new SQLException("NonTX Connection with wrong autocommit value");
- }
- } catch( Exception e ) {
- e.printStackTrace();
- return false;
- } finally {
- try {conn1.close();} catch(Exception e) {}
- }
+ conn1 = ds1.getConnection();
+ if (conn1.getAutoCommit() == false ) {
+ throw new SQLException("NonTX Connection with wrong autocommit value");
+ }
+ } catch( Exception e ) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ try {conn1.close();} catch(Exception e) {}
+ }
System.out.println("getting second tx connection");
- try {
- conn1 = ds.getConnection();
- if (conn1.getAutoCommit() == true ) {
- throw new SQLException("After nontx: Connection with wrong autocommit value");
- }
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- return true;
+ try {
+ conn1 = ds.getConnection();
+ if (conn1.getAutoCommit() == true ) {
+ throw new SQLException("After nontx: Connection with wrong autocommit value");
+ }
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+
+ return true;
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
public void ejbRemove() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_mysql.sql b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_mysql.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_mysql.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_mysql.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_pointbase.sql
index 637a7c5..c3b0d5c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO O_CUSTOMER VALUES (0, 'abcd');
-INSERT INTO O_CUSTOMER VALUES (1, 'pqrs');
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO O_CUSTOMER VALUES (0, 'abcd');
+INSERT INTO O_CUSTOMER VALUES (1, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.properties
index aad222e..f001d5a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-txisolation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.xml
index 07d9d6f..d3e25a3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/build.xml
@@ -83,7 +83,7 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.${pool.name}.max_connection_usage_count=1"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
@@ -177,7 +177,7 @@
<antcall target="runclient-common">
<param name="appclient.application.args" value="6"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/client/SimpleBMPClient.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/client/SimpleBMPClient.java
index 07797d9..24674d0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/client/SimpleBMPClient.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/client/SimpleBMPClient.java
@@ -38,7 +38,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP simpleBMP = simpleBMPHome.create();
- stat.addDescription("JDBC TX Isolation tests");
+ stat.addDescription("JDBC TX Isolation tests");
boolean result = false;
String testName = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/descriptor/ejb-jar.xml
index c0f6588..94b9fdd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/descriptor/ejb-jar.xml
@@ -38,7 +38,7 @@
<description></description>
<use-caller-identity></use-caller-identity>
</security-identity>
-
+
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
@@ -46,7 +46,7 @@
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
</session>
-
+
</enterprise-beans>
<assembly-descriptor>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
index 6a3dfed..89733b9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
@@ -20,7 +20,7 @@
import java.rmi.*;
public interface SimpleBMP extends EJBObject {
-
+
public boolean test1(int i) throws RemoteException;
public void modifyIsolation(int i) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
index 6991e2a..aab7c79 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
@@ -71,7 +71,7 @@
}catch(Exception e){e.printStackTrace();}
}
}
- return result;
+ return result;
}
public boolean modifyIsolation(int isolationLevel){
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.properties
index f7354ae..47c7cf5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-txlevelswitch"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.xml
index cd20523..6966b14 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/build.xml
@@ -40,7 +40,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"/>
@@ -52,25 +52,25 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-jdbc-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/drop_pointbase.sql"/>
@@ -78,7 +78,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/client/Client.java
index 362cbf4..f7609e3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/client/Client.java
@@ -25,27 +25,27 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
public static void main(String[] args)
throws Exception {
-
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "txlevelswitch-test1 ";
+
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "txlevelswitch-test1 ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/SimpleSessionHome");
- SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
+ SimpleSessionHome simpleSessionHome = (SimpleSessionHome)
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleSessionHome.class);
-
- stat.addDescription("Running txlevelswitch testSuite1 ");
+
+ stat.addDescription("Running txlevelswitch testSuite1 ");
SimpleSession simpleSession = simpleSessionHome.create();
if (simpleSession.test1() ) {
- stat.addStatus( testSuite + " test1 : " , stat.PASS );
- } else {
- stat.addStatus( testSuite + " test1 : " , stat.FAIL );
- }
-
-
- stat.printSummary();
+ stat.addStatus( testSuite + " test1 : " , stat.PASS );
+ } else {
+ stat.addStatus( testSuite + " test1 : " , stat.FAIL );
+ }
+
+
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/descriptor/ejb-jar.xml
index 89b7dd9..14d5054 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/descriptor/ejb-jar.xml
@@ -61,11 +61,11 @@
<container-transaction>
<method>
<ejb-name>SimpleSessionEJB</ejb-name>
- <method-name>updateDb</method-name>
+ <method-name>updateDb</method-name>
</method>
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
index c42c085..cdf67f4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
@@ -27,14 +27,14 @@
{
private SessionContext ctxt_;
- private InitialContext ic_;
+ private InitialContext ic_;
public void setSessionContext(SessionContext context) {
ctxt_ = context;
- try {
- ic_ = new InitialContext();
- } catch( NamingException ne ) {
- ne.printStackTrace();
- }
+ try {
+ ic_ = new InitialContext();
+ } catch( NamingException ne ) {
+ ne.printStackTrace();
+ }
}
public void ejbCreate() throws CreateException {
@@ -46,99 +46,99 @@
* did not happen
*/
public boolean test1() throws Exception {
- DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- int keyToCompare = 10;
- boolean passed = false;
- //clean the database
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate( "DELETE FROM TXLEVELSWITCH");
- } catch( SQLException e) {
- e.printStackTrace();
- return false;
- } finally {
- if (stmt1 != null) {
- try { stmt1.close(); } catch( Exception e1 ) {}
- }
- if (conn1 != null) {
- try { conn1.close(); } catch( Exception e1 ) {}
- }
- }
-
- try {
- //Call a method with tx=RequiresNew and have it throw
- //an exception
- updateDb( "TXLEVELSWITCH", keyToCompare );
- } catch( Exception e ) {
- if (!( e instanceof EJBException )) {
- e.printStackTrace();
- return false;
- } else {
- System.out.println("Caught expected EJBException");
- }
- }
- try {
- //since our updateDb threw an exception, we should not
- //find the inserted value here
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
- while( rs1.next() ) {
- int key = rs1.getInt("c_id");
- if ( key == 10 ) {
- System.out.println("update happened successfully. It should have failed");
- return false;
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- }
-
- return true;
+ DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ int keyToCompare = 10;
+ boolean passed = false;
+ //clean the database
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate( "DELETE FROM TXLEVELSWITCH");
+ } catch( SQLException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (stmt1 != null) {
+ try { stmt1.close(); } catch( Exception e1 ) {}
+ }
+ if (conn1 != null) {
+ try { conn1.close(); } catch( Exception e1 ) {}
+ }
}
-
+
+ try {
+ //Call a method with tx=RequiresNew and have it throw
+ //an exception
+ updateDb( "TXLEVELSWITCH", keyToCompare );
+ } catch( Exception e ) {
+ if (!( e instanceof EJBException )) {
+ e.printStackTrace();
+ return false;
+ } else {
+ System.out.println("Caught expected EJBException");
+ }
+ }
+ try {
+ //since our updateDb threw an exception, we should not
+ //find the inserted value here
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+ while( rs1.next() ) {
+ int key = rs1.getInt("c_id");
+ if ( key == 10 ) {
+ System.out.println("update happened successfully. It should have failed");
+ return false;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ }
+
+ return true;
+ }
+
private void updateDb( String table, int keyToInsert ) throws Exception {
DataSource ds = (DataSource)ic_.lookup("java:comp/env/DataSource");
- Connection conn1 = null;
- Statement stmt1 = null;
- ResultSet rs1 = null;
- boolean passed = true;
- try {
- conn1 = ds.getConnection();
- stmt1 = conn1.createStatement();
- stmt1.executeUpdate("INSERT INTO " +table+" VALUES ("
- + keyToInsert+", 'ABCD')");
+ Connection conn1 = null;
+ Statement stmt1 = null;
+ ResultSet rs1 = null;
+ boolean passed = true;
+ try {
+ conn1 = ds.getConnection();
+ stmt1 = conn1.createStatement();
+ stmt1.executeUpdate("INSERT INTO " +table+" VALUES ("
+ + keyToInsert+", 'ABCD')");
throw new Exception("Rollback the tx");
- } catch( SQLException sqle ) {
- throw sqle;
- } catch (Exception e) {
- throw new EJBException( e );
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- }
+ } catch( SQLException sqle ) {
+ throw sqle;
+ } catch (Exception e) {
+ throw new EJBException( e );
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ }
}
@@ -152,80 +152,80 @@
* changeover is indeed successful
*/
public boolean test2() throws Exception {
- System.out.println("************IN TEST 2*************");
- InitialContext ic = new InitialContext();
- DataSource ds1 = (DataSource)ic.lookup("java:comp/env/DataSource1");
- DataSource ds2 = (DataSource)ic.lookup("java:comp/env/DataSource2");
- Connection conn1 = null;
- Connection conn2 = null;
- Statement stmt1 = null;
- Statement stmt2 = null;
- ResultSet rs1 = null;
- ResultSet rs2 = null;
- boolean passed = true;
- try {
- System.out.println("Before getConnection 1");
- conn1 = ds1.getConnection();
- System.out.println("After getConnection 1");
- System.out.println("Before getConnection 2");
- conn2 = ds2.getConnection();
- System.out.println("After getConnection 2");
-
- System.out.println("Before createStatement 1");
- stmt1 = conn1.createStatement();
- System.out.println("After createStatement 1");
- System.out.println("Before createStatement 2");
- stmt2 = conn2.createStatement();
- System.out.println("After createStatement 2");
-
- System.out.println("executing statement 1");
+ System.out.println("************IN TEST 2*************");
+ InitialContext ic = new InitialContext();
+ DataSource ds1 = (DataSource)ic.lookup("java:comp/env/DataSource1");
+ DataSource ds2 = (DataSource)ic.lookup("java:comp/env/DataSource2");
+ Connection conn1 = null;
+ Connection conn2 = null;
+ Statement stmt1 = null;
+ Statement stmt2 = null;
+ ResultSet rs1 = null;
+ ResultSet rs2 = null;
+ boolean passed = true;
+ try {
+ System.out.println("Before getConnection 1");
+ conn1 = ds1.getConnection();
+ System.out.println("After getConnection 1");
+ System.out.println("Before getConnection 2");
+ conn2 = ds2.getConnection();
+ System.out.println("After getConnection 2");
- try {
- rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
+ System.out.println("Before createStatement 1");
+ stmt1 = conn1.createStatement();
+ System.out.println("After createStatement 1");
+ System.out.println("Before createStatement 2");
+ stmt2 = conn2.createStatement();
+ System.out.println("After createStatement 2");
+
+ System.out.println("executing statement 1");
+
+ try {
+ rs1 = stmt1.executeQuery("SELECT * FROM TXLEVELSWITCH");
} catch( Exception e2 ) {
- System.out.println("Exception for first query :" + e2.getMessage() );
- } finally {
- passed = false;
+ System.out.println("Exception for first query :" + e2.getMessage() );
+ } finally {
+ passed = false;
}
-
- System.out.println("executing statement 2");
- try {
- rs2 = stmt2.executeQuery("SELECT * FROM TXLEVELSWITCH2");
- } catch( Exception e2) {
- System.out.println("Exception for second query :" + e2.getMessage() );
- } finally {
- passed = false;
- }
- System.out.println("finished executing statements");
- passed = !(rs1.next() & rs2.next());
- } catch (Exception e) {
- passed = true;
- System.out.println("final exception : " + e.getMessage() );
- throw new EJBException(e);
- } finally {
- if (rs1 != null ) {
- try { rs1.close(); } catch( Exception e1 ) {}
- }
+ System.out.println("executing statement 2");
+ try {
+ rs2 = stmt2.executeQuery("SELECT * FROM TXLEVELSWITCH2");
+ } catch( Exception e2) {
+ System.out.println("Exception for second query :" + e2.getMessage() );
+ } finally {
+ passed = false;
+ }
- if (rs2 != null ) {
- try { rs2.close(); } catch( Exception e1 ) {}
- }
+ System.out.println("finished executing statements");
+ passed = !(rs1.next() & rs2.next());
+ } catch (Exception e) {
+ passed = true;
+ System.out.println("final exception : " + e.getMessage() );
+ throw new EJBException(e);
+ } finally {
+ if (rs1 != null ) {
+ try { rs1.close(); } catch( Exception e1 ) {}
+ }
- if ( stmt1 != null ) {
- try { stmt1.close(); } catch( Exception e1) {}
- }
- if ( stmt2 != null ) {
- try { stmt2.close(); } catch( Exception e1) {}
- }
- if ( conn1 != null ) {
- try { conn1.close(); } catch( Exception e1) {}
- }
- if ( conn2 != null ) {
- try { conn2.close(); } catch( Exception e1) {}
- }
- }
- return passed;
+ if (rs2 != null ) {
+ try { rs2.close(); } catch( Exception e1 ) {}
+ }
+
+ if ( stmt1 != null ) {
+ try { stmt1.close(); } catch( Exception e1) {}
+ }
+ if ( stmt2 != null ) {
+ try { stmt2.close(); } catch( Exception e1) {}
+ }
+ if ( conn1 != null ) {
+ try { conn1.close(); } catch( Exception e1) {}
+ }
+ if ( conn2 != null ) {
+ try { conn2.close(); } catch( Exception e1) {}
+ }
+ }
+ return passed;
}
public void ejbLoad() {}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/create_pointbase.sql
index b227cac..42d5a16 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/create_pointbase.sql
@@ -1,9 +1,9 @@
-Drop table TXLEVELSWITCH;
-
-CREATE TABLE TXLEVELSWITCH (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
-INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
+Drop table TXLEVELSWITCH;
+
+CREATE TABLE TXLEVELSWITCH (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO TXLEVELSWITCH VALUES(1, 'wxyz');
+INSERT INTO TXLEVELSWITCH VALUES(2, 'pqrs');
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/drop_pointbase.sql
index 0c1242f..d11a115 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/sql/drop_pointbase.sql
@@ -1,2 +1,2 @@
-Drop table TXLEVELSWITCH;
-Drop table TXLEVELSWITCH2;
+Drop table TXLEVELSWITCH;
+Drop table TXLEVELSWITCH2;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.properties
index a8dd641..000b72e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.properties
@@ -15,18 +15,18 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-txpassthrough"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.xml
index 9925449..313177a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/build.xml
@@ -32,14 +32,14 @@
&testproperties;
&jdbcCommon;
&jdbcCommonProps;
-
+
<target name="all" depends="clean,build,deploy,run,undeploy"/>
-
+
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -63,23 +63,23 @@
<antcall target="deploy-jdbc-common"/>
<antcall target="deploy-common"/>
</target>
-
-
+
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
</target>
-
-
+
+
<target name="run">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create.sql"/>
- </antcall>
+ </antcall>
<antcall target="runclient-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/client/Client.java
index 4f06b7c..28fc8e6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/client/Client.java
@@ -28,24 +28,24 @@
public static void main(String[] args)
throws Exception {
- SimpleReporterAdapter stat = new SimpleReporterAdapter();
- String testSuite = "TxPassThrough ";
+ SimpleReporterAdapter stat = new SimpleReporterAdapter();
+ String testSuite = "TxPassThrough ";
InitialContext ic = new InitialContext();
Object objRef = ic.lookup("java:comp/env/ejb/NoTxConnTestEJB");
- NoTxConnTestHome home = (NoTxConnTestHome)
+ NoTxConnTestHome home = (NoTxConnTestHome)
javax.rmi.PortableRemoteObject.narrow(objRef, NoTxConnTestHome.class);
NoTxConnTest bean = home.create();
- stat.addDescription("TX Pass Through tests ");
+ stat.addDescription("TX Pass Through tests ");
if ( bean.test1() ) {
- stat.addStatus(testSuite+" test1 : ", stat.PASS);
- } else {
- stat.addStatus(testSuite+" test1 : ", stat.FAIL);
- }
- stat.printSummary();
-
-
+ stat.addStatus(testSuite+" test1 : ", stat.PASS);
+ } else {
+ stat.addStatus(testSuite+" test1 : ", stat.FAIL);
+ }
+ stat.printSummary();
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/descriptor/sun-ejb-jar.xml
index 6c6c63a..786dfb9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/descriptor/sun-ejb-jar.xml
@@ -24,44 +24,44 @@
<jndi-name>ejb/NoTxConnTestEJB</jndi-name>
<ejb-ref>
<ejb-ref-name>ejb/SecondEJB</ejb-ref-name>
- <jndi-name>ejb/SecondEJB</jndi-name>
+ <jndi-name>ejb/SecondEJB</jndi-name>
</ejb-ref>
<resource-ref>
<res-ref-name>jdbc/txpassthrough</res-ref-name>
<jndi-name>jdbc/s1qeDB</jndi-name>
- <default-resource-principal>
- <name>pbpublic</name>
- <password>pbpublic</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>pbpublic</name>
+ <password>pbpublic</password>
+ </default-resource-principal>
</resource-ref>
- </ejb>
+ </ejb>
<ejb>
<ejb-name>SecondEJB</ejb-name>
<jndi-name>ejb/SecondEJB</jndi-name>
<ejb-ref>
<ejb-ref-name>ejb/ThirdEJB</ejb-ref-name>
- <jndi-name>ejb/ThirdEJB</jndi-name>
+ <jndi-name>ejb/ThirdEJB</jndi-name>
</ejb-ref>
<resource-ref>
<res-ref-name>jdbc/txpassthrough</res-ref-name>
<jndi-name>jdbc/s1qeDB</jndi-name>
- <default-resource-principal>
- <name>pbpublic</name>
- <password>pbpublic</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>pbpublic</name>
+ <password>pbpublic</password>
+ </default-resource-principal>
</resource-ref>
- </ejb>
+ </ejb>
<ejb>
<ejb-name>ThirdEJB</ejb-name>
<jndi-name>ejb/ThirdEJB</jndi-name>
<resource-ref>
<res-ref-name>jdbc/txpassthrough</res-ref-name>
<jndi-name>jdbc/s1qeDB</jndi-name>
- <default-resource-principal>
- <name>pbpublic</name>
- <password>pbpublic</password>
- </default-resource-principal>
+ <default-resource-principal>
+ <name>pbpublic</name>
+ <password>pbpublic</password>
+ </default-resource-principal>
</resource-ref>
- </ejb>
+ </ejb>
</enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
index 7405512..c284c70 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
@@ -30,7 +30,7 @@
private EJBContext ejbcontext;
private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
-
+
public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
@@ -45,10 +45,10 @@
public void ejbPassivate() {}
public boolean test1() {
- System.out.println(" @@@@ Entering Bean 1 @@@@ ");
- Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ System.out.println(" @@@@ Entering Bean 1 @@@@ ");
+ Connection conn = null;
+ Statement stmt = null;
+ ResultSet rs = null;
try {
@@ -60,14 +60,14 @@
rs = stmt.executeQuery(query1);
Object o = ctx.lookup("java:comp/env/ejb/SecondEJB");
- SecondHome home = (SecondHome)
- javax.rmi.PortableRemoteObject.narrow(o, SecondHome.class );
- Second bean = home.create();
- return bean.test1();
+ SecondHome home = (SecondHome)
+ javax.rmi.PortableRemoteObject.narrow(o, SecondHome.class );
+ Second bean = home.create();
+ return bean.test1();
} catch (Exception e) {
- System.out.println("Caught Exception in 1st Bean---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception in 1st Bean---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -78,9 +78,9 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
- System.out.println(" @@@@ Exiting Bean 1 @@@@ ");
-
- }
+ System.out.println(" @@@@ Exiting Bean 1 @@@@ ");
+
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
index 55ed061..127709c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
@@ -30,7 +30,7 @@
private EJBContext ejbcontext;
private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
-
+
public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
@@ -45,30 +45,30 @@
public void ejbPassivate() {}
public boolean test1() {
- System.out.println(" @@@@ Entering Bean2 @@@@ ");
- Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ System.out.println(" @@@@ Entering Bean2 @@@@ ");
+ Connection conn = null;
+ Statement stmt = null;
+ ResultSet rs = null;
try {
InitialContext ctx = new InitialContext();
- /*
+ /*
ds = (javax.sql.DataSource) ctx.lookup("java:comp/env/jdbc/txpassthrough");
conn = ds.getConnection("dbuser", "dbpassword");
stmt = conn.createStatement();
String query1 = "SELECT * FROM ONLYGETCONNECTION";
rs = stmt.executeQuery(query1);
- */
+ */
Object o = ctx.lookup("java:comp/env/ejb/ThirdEJB");
- ThirdHome t = (ThirdHome)
- javax.rmi.PortableRemoteObject.narrow( o, ThirdHome.class );
- Third bean = t.create();
- return bean.test1();
+ ThirdHome t = (ThirdHome)
+ javax.rmi.PortableRemoteObject.narrow( o, ThirdHome.class );
+ Third bean = t.create();
+ return bean.test1();
} catch (Exception e) {
- System.out.println("Caught Exception in 2nd Bean---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception in 2nd Bean---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -79,9 +79,9 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
- System.out.println(" @@@@ Exiting Bean 2 @@@@");
-
- }
+ System.out.println(" @@@@ Exiting Bean 2 @@@@");
+
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
index 2cbd2b2..27eb386 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
@@ -30,7 +30,7 @@
private EJBContext ejbcontext;
private transient jakarta.ejb.SessionContext m_ctx = null;
transient javax.sql.DataSource ds;
-
+
public void setSessionContext(jakarta.ejb.SessionContext ctx) {
m_ctx = ctx;
@@ -45,10 +45,10 @@
public void ejbPassivate() {}
public boolean test1() {
- System.out.println(" @@@@ Entering Bean 3 @@@@");
- Connection conn = null;
- Statement stmt = null;
- ResultSet rs = null;
+ System.out.println(" @@@@ Entering Bean 3 @@@@");
+ Connection conn = null;
+ Statement stmt = null;
+ ResultSet rs = null;
try {
@@ -56,13 +56,13 @@
ds = (javax.sql.DataSource) ctx.lookup("java:comp/env/jdbc/txpassthrough");
conn = ds.getConnection("dbuser", "dbpassword");
stmt = conn.createStatement();
- String query1 = "SELECT * FROM ONLYGETCONNECTION";
+ String query1 = "SELECT * FROM ONLYGETCONNECTION";
rs = stmt.executeQuery(query1);
- return true;
+ return true;
} catch (Exception e) {
- System.out.println("Caught Exception in 3rd Bean---");
- e.printStackTrace();
- return false;
+ System.out.println("Caught Exception in 3rd Bean---");
+ e.printStackTrace();
+ return false;
} finally {
if (rs != null ) {
try { rs.close(); } catch( Exception e1) {}
@@ -73,8 +73,8 @@
if (conn != null ) {
try {conn.close();} catch( Exception e1) {}
}
- System.out.println(" @@@@ Exiting Bean 3 @@@@");
- }
+ System.out.println(" @@@@ Exiting Bean 3 @@@@");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/sql/create.sql b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/sql/create.sql
index c58a6e3..ae9f569 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/sql/create.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/sql/create.sql
@@ -1,5 +1,5 @@
DROP TABLE ONLYGETCONNECTION;
CREATE TABLE ONLYGETCONNECTION(
- name char(20),
+ name char(20),
num integer
);
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/SetDerbyAuthentication.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/SetDerbyAuthentication.java
index d13182b..93f94fd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/SetDerbyAuthentication.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/SetDerbyAuthentication.java
@@ -28,12 +28,12 @@
* @author shalini
*/
public class SetDerbyAuthentication {
-
+
private static String DATABASES_HOME = "/tmp/jdbc_devtests/databases";
private static String RECONFIG_DB_NAME = DATABASES_HOME + "/reconfig-db";
private static String SAMPLE_DB_NAME = DATABASES_HOME + "/sample-db";
private static String SUN_APPSERV_SAMPLES_DB = DATABASES_HOME + "/sun-appserv-samples";
-
+
public static void main(String[] args) {
setCommonDBAuthentication();
setReconfigDBAuthentication();
@@ -45,30 +45,30 @@
Connection con = null;
ResultSet rs = null;
try {
- DataSource ds = initializeDataSource();
- con = (Connection) ds.getConnection();
- stmt = con.createStatement();
- //Execute CallableStatement to enable authentication
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.connection.requireAuthentication', 'true')");
- rs = stmt.executeQuery(
- "VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(" +
- "'derby.connection.requireAuthentication')");
- rs.next();
- System.out.println("Authentication set to " + rs.getString(1));
+ DataSource ds = initializeDataSource();
+ con = (Connection) ds.getConnection();
+ stmt = con.createStatement();
+ //Execute CallableStatement to enable authentication
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.connection.requireAuthentication', 'true')");
+ rs = stmt.executeQuery(
+ "VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(" +
+ "'derby.connection.requireAuthentication')");
+ rs.next();
+ System.out.println("Authentication set to " + rs.getString(1));
- //Setting Usernames and passwords
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.dbuser', 'dbpassword')");
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.DBUSER', 'DBPASSWORD')");
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.APP', 'APP')");
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.DERBYUSER', 'DERBYPASSWORD')");
+ //Setting Usernames and passwords
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.dbuser', 'dbpassword')");
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.DBUSER', 'DBPASSWORD')");
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.APP', 'APP')");
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.DERBYUSER', 'DERBYPASSWORD')");
} catch(Exception ex) {
ex.printStackTrace();
- } finally {
+ } finally {
try {
if(rs != null) {
rs.close();
@@ -90,35 +90,35 @@
}
} catch (Exception e) {
e.printStackTrace();
- }
- }
+ }
+ }
}
-
+
private static void setReconfigDBAuthentication() {
Statement stmt = null;
Connection con = null;
- ResultSet rs = null;
+ ResultSet rs = null;
try {
- DataSource ds = initializeReconfigDataSource();
- con = (Connection) ds.getConnection();
- stmt = con.createStatement();
- //Execute CallableStatement to enable authentication
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.connection.requireAuthentication', 'true')");
- rs = stmt.executeQuery(
- "VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(" +
- "'derby.connection.requireAuthentication')");
- rs.next();
- System.out.println("Authentication set to " + rs.getString(1));
+ DataSource ds = initializeReconfigDataSource();
+ con = (Connection) ds.getConnection();
+ stmt = con.createStatement();
+ //Execute CallableStatement to enable authentication
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.connection.requireAuthentication', 'true')");
+ rs = stmt.executeQuery(
+ "VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(" +
+ "'derby.connection.requireAuthentication')");
+ rs.next();
+ System.out.println("Authentication set to " + rs.getString(1));
- //Setting Usernames and passwords
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.ruser', 'rpassword')");
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.RUSER', 'RPASSWORD')");
+ //Setting Usernames and passwords
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.ruser', 'rpassword')");
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.RUSER', 'RPASSWORD')");
} catch(Exception ex) {
ex.printStackTrace();
- } finally {
+ } finally {
try {
if(rs != null) {
rs.close();
@@ -140,36 +140,36 @@
}
} catch (Exception e) {
e.printStackTrace();
- }
-
+ }
+
}
}
-
+
private static void setSampleDBAuthentication() {
Statement stmt = null;
Connection con = null;
- ResultSet rs = null;
+ ResultSet rs = null;
try {
- DataSource ds = initializeSampleDataSource();
- con = (Connection) ds.getConnection();
- stmt = con.createStatement();
- //Execute CallableStatement to enable authentication
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.connection.requireAuthentication', 'true')");
- rs = stmt.executeQuery(
- "VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(" +
- "'derby.connection.requireAuthentication')");
- rs.next();
- System.out.println("Authentication set to " + rs.getString(1));
+ DataSource ds = initializeSampleDataSource();
+ con = (Connection) ds.getConnection();
+ stmt = con.createStatement();
+ //Execute CallableStatement to enable authentication
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.connection.requireAuthentication', 'true')");
+ rs = stmt.executeQuery(
+ "VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(" +
+ "'derby.connection.requireAuthentication')");
+ rs.next();
+ System.out.println("Authentication set to " + rs.getString(1));
- //Setting Usernames and passwords
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.APP', 'APP')");
- stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
- "'derby.user.app', 'app')");
+ //Setting Usernames and passwords
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.APP', 'APP')");
+ stmt.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(" +
+ "'derby.user.app', 'app')");
} catch(Exception ex) {
ex.printStackTrace();
- } finally {
+ } finally {
try {
if(rs != null) {
rs.close();
@@ -191,8 +191,8 @@
}
} catch (Exception e) {
e.printStackTrace();
- }
-
+ }
+
}
}
@@ -205,11 +205,11 @@
Connection con = null;
Connection con1 = null;
try {
- DataSource ds = initializeReconfigDataSource();
+ DataSource ds = initializeReconfigDataSource();
DataSource ds1 = initializeSampleDataSource();
- con = (Connection) ds.getConnection();
+ con = (Connection) ds.getConnection();
con1 = (Connection) ds1.getConnection();
- stmt = con.createStatement();
+ stmt = con.createStatement();
stmt1 = con1.createStatement();
String query = "create table " + reconfigTable + "(" + columnName + " char(50))";
stmt.executeUpdate(query);
@@ -218,7 +218,7 @@
System.out.println("Created tables : reconfigTestTable and sampleTable");
} catch(Exception ex) {
ex.printStackTrace();
- } finally {
+ } finally {
try {
if (stmt != null) {
stmt.close();
@@ -239,22 +239,22 @@
}
} catch (Exception e) {
e.printStackTrace();
- }
- }
-
+ }
+ }
+
}
-
+
/**
* Sets the EmbeddedDataSource properties corresponding to the pool configuration
* created for running the JDBC reconfig devtests.
*/
private static org.apache.derby.jdbc.EmbeddedDataSource initializeReconfigDataSource() {
- EmbeddedDataSource ds = new EmbeddedDataSource();
- ds.setUser("ruser");
- ds.setPassword("rpassword");
- ds.setDatabaseName(RECONFIG_DB_NAME);
- ds.setConnectionAttributes("create=true");
- return ds;
+ EmbeddedDataSource ds = new EmbeddedDataSource();
+ ds.setUser("ruser");
+ ds.setPassword("rpassword");
+ ds.setDatabaseName(RECONFIG_DB_NAME);
+ ds.setConnectionAttributes("create=true");
+ return ds;
}
/**
@@ -262,24 +262,24 @@
* created for running the JDBC reconfig devtests.
*/
private static org.apache.derby.jdbc.EmbeddedDataSource initializeSampleDataSource() {
- EmbeddedDataSource ds = new EmbeddedDataSource();
- ds.setUser("APP");
- ds.setPassword("APP");
- ds.setDatabaseName(SAMPLE_DB_NAME);
- ds.setConnectionAttributes("create=true");
- return ds;
+ EmbeddedDataSource ds = new EmbeddedDataSource();
+ ds.setUser("APP");
+ ds.setPassword("APP");
+ ds.setDatabaseName(SAMPLE_DB_NAME);
+ ds.setConnectionAttributes("create=true");
+ return ds;
}
-
+
/**
* Sets the EmbeddedDataSource properties corresponding to the pool configuration
* created for running the JDBC devtests.
*/
private static org.apache.derby.jdbc.EmbeddedDataSource initializeDataSource() {
- EmbeddedDataSource ds = new EmbeddedDataSource();
- ds.setUser("APP");
- ds.setPassword("APP");
- ds.setDatabaseName(SUN_APPSERV_SAMPLES_DB);
- ds.setConnectionAttributes("create=true");
- return ds;
+ EmbeddedDataSource ds = new EmbeddedDataSource();
+ ds.setUser("APP");
+ ds.setPassword("APP");
+ ds.setDatabaseName(SUN_APPSERV_SAMPLES_DB);
+ ds.setConnectionAttributes("create=true");
+ return ds;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.properties
index 85f4d14..5c0e74e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="autocommit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.xml
index 831df8f..805fba2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/build.xml
@@ -41,7 +41,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"/>
@@ -55,50 +55,50 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="true"/>
+ <property name="hasWebclient" value="true"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
<param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
- </antcall>
+ <param name="ejbjar.classes" value="**/*.class"/>
+ </antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
+ <delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- </ear>
- </target>
-
+ <ear earfile="${assemble.dir}/${appname}App.ear"
+ appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
+ </ear>
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
-
- <antcall target="setup"/>
+
+ <antcall target="setup"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="run-test-1"/>
</target>
-
+
<target name="run-test-1" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
</target>
<target name="undeploy" depends="init-common">
@@ -108,7 +108,7 @@
<antcall target="unsetup"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
@@ -118,12 +118,12 @@
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="jdbc-autocommit-pool"/>
- <param name="jdbc.resource.name" value="jdbc/autocommit"/>
+ <param name="jdbc.resource.name" value="jdbc/autocommit"/>
</antcall>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
- <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-autocommit-pool.steady_pool_size=2"/>
+ <param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-autocommit-pool.steady_pool_size=2"/>
</antcall>
<antcall target="asadmin-common">
@@ -131,7 +131,7 @@
<param name="operand.props" value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-autocommit-pool.max_pool_size=2"/>
</antcall>
-
+
</target>
<target name="unsetup">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/descriptor/ejb-jar.xml
index b5bced4..a1a150a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/descriptor/ejb-jar.xml
@@ -55,7 +55,7 @@
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>SimpleBMPEJB</ejb-name>
@@ -64,6 +64,6 @@
<trans-attribute>NotSupported</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
index 50f1766..c780d78 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
@@ -30,67 +30,67 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
/* Get a single connection and close it */
public boolean test1() {
Connection conn = null;
boolean passed = true;
- try {
- conn = ds.getConnection();
- passed = !conn.getAutoCommit();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
- return passed;
+ try {
+ conn = ds.getConnection();
+ passed = !conn.getAutoCommit();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
+
+ return passed;
}
public boolean test2() {
Connection conn1 = null;
Connection conn2 = null;
- boolean passed = true;
+ boolean passed = true;
- try {
- conn1 = ds.getConnection();
- conn2 = ds.getConnection();
+ try {
+ conn1 = ds.getConnection();
+ conn2 = ds.getConnection();
- passed = conn1.getAutoCommit() & conn2.getAutoCommit();
- } catch( Exception e ) {
- passed = false;
- } finally {
- if (conn1 != null ) {
- try {
- conn1.close();
- } catch( Exception ei) {}
- }
- if (conn2 != null ) {
- try {
- conn2.close();
- } catch( Exception ei) {}
- }
- }
-
- return passed;
+ passed = conn1.getAutoCommit() & conn2.getAutoCommit();
+ } catch( Exception e ) {
+ passed = false;
+ } finally {
+ if (conn1 != null ) {
+ try {
+ conn1.close();
+ } catch( Exception ei) {}
+ }
+ if (conn2 != null ) {
+ try {
+ conn2.close();
+ } catch( Exception ei) {}
+ }
}
-
+
+ return passed;
+ }
+
public void ejbLoad() {}
public void ejbStore() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
index 9253de6..436ff69 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
@@ -56,27 +56,27 @@
SimpleBMP bean = simpleBMPHome.create();
if ( bean.test1() ) {
- System.out.println("Autocommit : test1 : PASS");
- out.println("TEST:PASS");
- } else {
- System.out.println("Autocommit : test1 : FAIL");
+ System.out.println("Autocommit : test1 : PASS");
+ out.println("TEST:PASS");
+ } else {
+ System.out.println("Autocommit : test1 : FAIL");
out.println("TEST:FAIL");
- }
- if ( bean.test2() ) {
- System.out.println("Autocommit : test2 : PASS");
- out.println("TEST:PASS");
- } else {
- System.out.println("Autocommit : test2 : FAIL");
+ }
+ if ( bean.test2() ) {
+ System.out.println("Autocommit : test2 : PASS");
+ out.println("TEST:PASS");
+ } else {
+ System.out.println("Autocommit : test2 : FAIL");
out.println("TEST:FAIL");
- }
+ }
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/build.xml
index 59a9a5e..bc249bc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/build.xml
@@ -19,12 +19,12 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
- <!ENTITY jdbcCommon SYSTEM "./../JdbcCommon.xml">
- <!ENTITY jdbcCommonProperties SYSTEM "./../JdbcCommon.properties">
- <!ENTITY reporting SYSTEM "./../report.xml">
- <!ENTITY eeCommon SYSTEM "./../config/ee-common.xml">
- <!ENTITY eeCommonProperties SYSTEM "./../config/ee-properties.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
+ <!ENTITY jdbcCommon SYSTEM "./../JdbcCommon.xml">
+ <!ENTITY jdbcCommonProperties SYSTEM "./../JdbcCommon.properties">
+ <!ENTITY reporting SYSTEM "./../report.xml">
+ <!ENTITY eeCommon SYSTEM "./../config/ee-common.xml">
+ <!ENTITY eeCommonProperties SYSTEM "./../config/ee-properties.xml">
]>
<project name="jdbc" default="usage" basedir=".">
@@ -49,15 +49,15 @@
<delete>
<fileset dir="." includes="*.output"/>
</delete>
- <record name="jdbc.output" action="start"/>
- <antcall target="contauth"/>
- <antcall target="autocommit"/>
- <antcall target="maxconnectionusage"/>
+ <record name="jdbc.output" action="start"/>
+ <antcall target="contauth"/>
+ <antcall target="autocommit"/>
+ <antcall target="maxconnectionusage"/>
<antcall target="multipleusercredentials"/>
- <antcall target="statementtimeout"/>
- <antcall target="connleaktracing"/>
- <antcall target="conncreationretry"/>
- <antcall target="resEnableDisable"/>
+ <antcall target="statementtimeout"/>
+ <antcall target="connleaktracing"/>
+ <antcall target="conncreationretry"/>
+ <antcall target="resEnableDisable"/>
<record name="jdbc.output" action="stop"/>
</target>
@@ -69,63 +69,63 @@
<fileset dir="." includes="*.output"/>
</delete>
<record name="jdbc.output" action="start"/>
- <antcall target="contauth"/>
- <antcall target="autocommit"/>
- <antcall target="maxconnectionusage"/>
+ <antcall target="contauth"/>
+ <antcall target="autocommit"/>
+ <antcall target="maxconnectionusage"/>
<antcall target="multipleusercredentials"/>
- <antcall target="statementtimeout"/>
- <antcall target="connleaktracing"/>
- <antcall target="conncreationretry"/>
- <antcall target="resEnableDisable"/>
+ <antcall target="statementtimeout"/>
+ <antcall target="connleaktracing"/>
+ <antcall target="conncreationretry"/>
+ <antcall target="resEnableDisable"/>
<record name="jdbc.output" action="stop"/>
</target>
<target name="contauth">
<record name="contauth/contauth.output" action="start"/>
<ant dir="contauth" target="all"/>
- <record name="contauth/contauth.output" action="stop"/>
+ <record name="contauth/contauth.output" action="stop"/>
</target>
<target name="autocommit">
- <record name="autocommit/autocommit.output" action="start"/>
- <ant dir="autocommit" target="all"/>
- <record name="autocommit/autocommit.output" action="stop"/>
+ <record name="autocommit/autocommit.output" action="start"/>
+ <ant dir="autocommit" target="all"/>
+ <record name="autocommit/autocommit.output" action="stop"/>
</target>
<target name="maxconnectionusage">
<record name="maxconnectionusage/maxconnectionusage.output" action="start"/>
<ant dir="maxconnectionusage" target="all"/>
- <record name="maxconnectionusage/maxconnectionusage.output" action="stop"/>
+ <record name="maxconnectionusage/maxconnectionusage.output" action="stop"/>
</target>
-
+
<target name="multipleusercredentials">
- <record name="multipleusercredentials/multipleusercredentials.output" action="start"/>
- <ant dir="multipleusercredentials" target="all"/>
- <record name="multipleusercredentials/multipleusercredentials.output" action="stop"/>
+ <record name="multipleusercredentials/multipleusercredentials.output" action="start"/>
+ <ant dir="multipleusercredentials" target="all"/>
+ <record name="multipleusercredentials/multipleusercredentials.output" action="stop"/>
</target>
-
+
<target name="statementtimeout">
- <record name="statementtimeout/statementtimeout.output" action="start"/>
- <ant dir="statementtimeout" target="all"/>
- <record name="statementtimeout/statementtimeout.output" action="stop"/>
+ <record name="statementtimeout/statementtimeout.output" action="start"/>
+ <ant dir="statementtimeout" target="all"/>
+ <record name="statementtimeout/statementtimeout.output" action="stop"/>
</target>
<target name="connleaktracing">
<record name="connleaktracing/connleaktracing.output" action="start"/>
<ant dir="connleaktracing" target="all"/>
- <record name="connleaktracing/connleaktracing.output" action="stop"/>
+ <record name="connleaktracing/connleaktracing.output" action="stop"/>
</target>
<target name="conncreationretry">
- <record name="conncreationretry/conncreationretry.output" action="start"/>
- <ant dir="conncreationretry" target="all"/>
- <record name="conncreationretry/conncreationretry.output" action="stop"/>
+ <record name="conncreationretry/conncreationretry.output" action="start"/>
+ <ant dir="conncreationretry" target="all"/>
+ <record name="conncreationretry/conncreationretry.output" action="stop"/>
</target>
<target name="resEnableDisable">
<record name="resEnableDisable/resenabledisable.output" action="start"/>
<ant dir="resEnableDisable" target="all"/>
- <record name="resEnableDisable/resenabledisable.output" action="stop"/>
+ <record name="resEnableDisable/resenabledisable.output" action="stop"/>
</target>
<target name="usage">
<echo>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.properties
index 1f4eae9..22312b7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-connectioncreationretry"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="poolname" value="jdbc-connectioncreationretry"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.xml
index d0ab872..01339a5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/build.xml
@@ -19,11 +19,11 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../../../config/run.xml">
- <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
- <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
+ <!ENTITY run SYSTEM "./../../../../config/run.xml">
+ <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
+ <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
]>
<project name="mix" default="usage" basedir=".">
@@ -57,28 +57,28 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="true"/>
+ <property name="hasWebclient" value="true"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
<param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
- </antcall>
+ <param name="ejbjar.classes" value="**/*.class"/>
+ </antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
+ <delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- </ear>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
+ appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
+ </ear>
</target>
<target name="deploy" depends="init-common">
@@ -92,20 +92,20 @@
<target name="run" depends="init-common">
<antcall target="stop-derby"/>
- <parallel>
- <antcall target="run-test-1"/>
- <sequential>
- <sleep seconds="15"/>
- <antcall target="start-derby"/>
- </sequential>
- </parallel>
+ <parallel>
+ <antcall target="run-test-1"/>
+ <sequential>
+ <sleep seconds="15"/>
+ <antcall target="start-derby"/>
+ </sequential>
+ </parallel>
</target>
<target name="run-test-1" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
</target>
<target name="undeploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
index cd1d898..5d1b466 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
@@ -41,7 +41,7 @@
}
-
+
/* Get a single connection and close it */
public boolean test1(){
Connection conn = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
index d722609..3c05e5d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
@@ -56,20 +56,20 @@
SimpleBMP convalBMP = simpleBMPHome.create();
if (convalBMP.test1()) {
- System.out.println("Connection Creation Retry : test1 : PASS");
- out.println("TEST:PASS");
+ System.out.println("Connection Creation Retry : test1 : PASS");
+ out.println("TEST:PASS");
} else {
- System.out.println("Connection Creation Retry : test1 : FAIL");
+ System.out.println("Connection Creation Retry : test1 : FAIL");
out.println("TEST:FAIL");
}
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.properties
index 25a3797..02c0ccb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-connectionleaktracing"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="poolname" value="jdbc-connectionleaktracing"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.xml
index 2de7124..75cd13c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/build.xml
@@ -19,9 +19,9 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../config/run.xml">
+ <!ENTITY run SYSTEM "./../../config/run.xml">
]>
<project name="mix" default="usage" basedir=".">
@@ -54,12 +54,12 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
<param name="ejbjar.classes"
- value="**/ejb/*.class"/>
+ value="**/ejb/*.class"/>
<param name="appclientjar.classes"
- value="**/client/*.class"/>
- <param name="war.classes"
- value="**/servlet/*.class"/>
- <param name="hasWebclient" value="true"/>
+ value="**/client/*.class"/>
+ <param name="war.classes"
+ value="**/servlet/*.class"/>
+ <param name="hasWebclient" value="true"/>
</antcall>
<javac
srcdir="."
@@ -88,8 +88,8 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="delete-jdbc-stuff"/>
- <antcall target="undeploy-common"/>
- <delete file="client/WebTest.class"/>
+ <antcall target="undeploy-common"/>
+ <delete file="client/WebTest.class"/>
</target>
<target name="usage">
@@ -129,7 +129,7 @@
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.connection_leak_reclaim=true"/>
</antcall>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.non_transactional_connections=true"/>
@@ -160,6 +160,6 @@
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/descriptor/ejb-jar.xml
index 1b46293..9a64b42 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/descriptor/ejb-jar.xml
@@ -31,16 +31,16 @@
<ejb-name>SimpleBMPEJB</ejb-name>
<local-home>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMPHome</local-home>
<local>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMP</local>
- <ejb-class>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMPBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <!--<persistence-type>Bean</persistence-type>
+ <ejb-class>com.sun.s1asdev.jdbc.connectionleaktracing.ejb.SimpleBMPBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <!--<persistence-type>Bean</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>False</reentrant>
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>-->
+ </security-identity>-->
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
index 98a69ed..dd98a7d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
@@ -28,7 +28,7 @@
private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
- m_ctx = context;
+ m_ctx = context;
}
public Integer ejbCreate() throws CreateException {
@@ -36,7 +36,7 @@
}
-
+
/* Get a single connection and close it */
public boolean test1() {
Connection conn = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
index 88496a6..9a49ae2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
@@ -56,24 +56,24 @@
//stat.addDescription("Running serializable connector test ");
SimpleBMP bean = simpleBMPHome.create();
- for(int i=0; i<3; i++){
+ for(int i=0; i<3; i++){
if(!bean.test1()){
- //stat.addStatus("jdbc-connectionleakttracing : test ", stat.FAIL);
+ //stat.addStatus("jdbc-connectionleakttracing : test ", stat.FAIL);
out.println("TEST:FAIL");
- break;
- }
- Thread.sleep(20000);
- }
- out.println("TEST:PASS");
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
- } catch(java.lang.InterruptedException ie) {
- ie.printStackTrace();
+ break;
+ }
+ Thread.sleep(20000);
+ }
+ out.println("TEST:PASS");
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
+ } catch(java.lang.InterruptedException ie) {
+ ie.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.properties
index 1575c6c..af7e3b7 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="contauth"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="contextroot" value="/contauth/servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.xml
index 1cfe10b..afb8ab8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/build.xml
@@ -41,7 +41,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"/>
@@ -56,30 +56,30 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="true"/>
+ <property name="hasWebclient" value="true"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
<param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
- </antcall>
+ <param name="ejbjar.classes" value="**/*.class"/>
+ </antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
+ <delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- </ear>
- </target>
-
+ <ear earfile="${assemble.dir}/${appname}App.ear"
+ appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
+ </ear>
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -87,17 +87,17 @@
<antcall target="deploy-jdbc-common"/>
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
<antcall target="run-test-1"/>
</target>
-
+
<target name="run-test-1" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
</antcall>
</target>
@@ -108,7 +108,7 @@
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/descriptor/ejb-jar.xml
index 7e6bc30..576512b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/descriptor/ejb-jar.xml
@@ -50,13 +50,13 @@
<assembly-descriptor>
<container-transaction>
- <method>
+ <method>
<ejb-name>SimpleBMPEJB</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
+
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
index 5ceec41..52d9900 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
@@ -30,58 +30,58 @@
protected DataSource ds;
public void setEntityContext(EntityContext entityContext) {
- Context context = null;
- try {
- context = new InitialContext();
- ds = (DataSource) context.lookup("java:comp/env/DataSource");
- } catch (NamingException e) {
- throw new EJBException("cant find datasource");
- }
+ Context context = null;
+ try {
+ context = new InitialContext();
+ ds = (DataSource) context.lookup("java:comp/env/DataSource");
+ } catch (NamingException e) {
+ throw new EJBException("cant find datasource");
+ }
System.out.println("[**SimpleBMPBean**] Done with setEntityContext....");
}
public Integer ejbCreate() throws CreateException {
- return new Integer(1);
+ return new Integer(1);
}
public boolean test1() {
//container auth + user/pwd specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection("DBUSER", "DBPASSWORD" );
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
-
-
- return passed;
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection("DBUSER", "DBPASSWORD" );
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
}
-
+
+
+ return passed;
+ }
+
public boolean test2() {
//container auth + user/pwd NOT specified - should pass
- Connection conn = null;
- boolean passed = true;
- try {
- conn = ds.getConnection();
- } catch (Exception e) {
- passed = false;
- } finally {
- if ( conn != null ) {
- try {
- conn.close();
- } catch( Exception e1) {}
- }
- }
+ Connection conn = null;
+ boolean passed = true;
+ try {
+ conn = ds.getConnection();
+ } catch (Exception e) {
+ passed = false;
+ } finally {
+ if ( conn != null ) {
+ try {
+ conn.close();
+ } catch( Exception e1) {}
+ }
+ }
-
- return passed;
+
+ return passed;
}
public void ejbLoad() {}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
index 58208c2..e5b62aa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
@@ -56,29 +56,29 @@
SimpleBMP bean = simpleBMPHome.create();
if ( bean.test1() ) {
- System.out.println("Contauth : test1 : PASS");
- out.println("TEST:PASS");
- } else {
- System.out.println("Contauth : test1 : FAIL");
+ System.out.println("Contauth : test1 : PASS");
+ out.println("TEST:PASS");
+ } else {
+ System.out.println("Contauth : test1 : FAIL");
out.println("TEST:FAIL");
- }
- if ( bean.test2() ) {
- System.out.println("Contauth : test2 : PASS");
- out.println("TEST:PASS");
- } else {
- System.out.println("Contauth : test2 : FAIL");
+ }
+ if ( bean.test2() ) {
+ System.out.println("Contauth : test2 : PASS");
+ out.println("TEST:PASS");
+ } else {
+ System.out.println("Contauth : test2 : FAIL");
out.println("TEST:FAIL");
- }
+ }
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
- } /*catch(java.lang.InterruptedException ie) {
- ie.printStackTrace();
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
+ } /*catch(java.lang.InterruptedException ie) {
+ ie.printStackTrace();
} */finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-dev-tests-embedded.sh b/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-dev-tests-embedded.sh
index a0390e0..9975beb 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-dev-tests-embedded.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-dev-tests-embedded.sh
@@ -89,7 +89,7 @@
#Create Pool/Resource for lazy-connection-associationtest
echo Creating Pool/Resource Lazy connection association test
-./bin/asadmin create-jdbc-connection-pool --maxwait=10 --datasourceclassname=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --restype=javax.sql.ConnectionPoolDataSource --lazyconnectionenlistment=true --lazyconnectionassociation=true --property="password=APP:user=APP:databaseName=sun-appserv-samples:connectionAttributes=\;create\\=true" jdbc-lazy-assoc-test-pool
+./bin/asadmin create-jdbc-connection-pool --maxwait=10 --datasourceclassname=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --restype=javax.sql.ConnectionPoolDataSource --lazyconnectionenlistment=true --lazyconnectionassociation=true --property="password=APP:user=APP:databaseName=sun-appserv-samples:connectionAttributes=\;create\\=true" jdbc-lazy-assoc-test-pool
./bin/asadmin create-jdbc-resource --connectionpoolid=jdbc-lazy-assoc-test-pool jdbc/jdbc-lazy-assoc-test-resource
echo "\n"
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-reconfig-dev-tests_embedded.sh b/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-reconfig-dev-tests_embedded.sh
index fd08b2f..83e7abd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-reconfig-dev-tests_embedded.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/embedded/setup-jdbc-reconfig-dev-tests_embedded.sh
@@ -50,7 +50,7 @@
echo create resource jdbc/jdbc-reconfig-test-resource-1
./bin/asadmin create-jdbc-resource --connectionpoolid=jdbc-reconfig-test-pool-1 jdbc/jdbc-reconfig-test-resource-1
-echo create pool jdbc-reconfig-test-pool-2
+echo create pool jdbc-reconfig-test-pool-2
./bin/asadmin create-jdbc-connection-pool --datasourceclassname=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --restype=javax.sql.ConnectionPoolDataSource --property="Password=rpassword:User=ruser:DatabaseName=$databaseshome/reconfig-db:serverName=localhost" jdbc-reconfig-test-pool-2
echo create resource jdbc/jdbc-reconfig-test-resource-2
@@ -79,7 +79,7 @@
./bin/asadmin set resources.jdbc-connection-pool.jdbc-dev-test-pool.max-wait-time-in-millis=1000
echo "\nGET http://localhost:8080/v3_jdbc_dev_tests/ReconfigTestServlet?maxPoolSize=40\&throwException=true\&testId=1 \n"
-GET http://localhost:8080/v3_jdbc_dev_tests/ReconfigTestServlet?maxPoolSize=40\&throwException=true\&testId=1 > $reconfigResult
+GET http://localhost:8080/v3_jdbc_dev_tests/ReconfigTestServlet?maxPoolSize=40\&throwException=true\&testId=1 > $reconfigResult
echo "\n"
#asadmin set max-pool-size to 10 before running test for the second time
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.properties
index bd49867..6800108 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="maxconnectionusage"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.xml
index bea526d..62d0e91 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/build.xml
@@ -19,11 +19,11 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../../../config/run.xml">
- <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
- <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
+ <!ENTITY run SYSTEM "./../../../../config/run.xml">
+ <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
+ <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
]>
<project name="mix" default="usage" basedir=".">
@@ -51,28 +51,28 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="true"/>
+ <property name="hasWebclient" value="true"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
<param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
- </antcall>
+ <param name="ejbjar.classes" value="**/*.class"/>
+ </antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
+ <delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- </ear>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
+ appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
+ </ear>
</target>
<target name="deploy" depends="init-common">
@@ -93,7 +93,7 @@
<target name="run-test-1" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/descriptor/application.xml
index 8d5bae6..7f29733 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/descriptor/application.xml
@@ -28,10 +28,10 @@
<ejb>maxconnectionusage-ejb.jar</ejb>
</module>
<module>
- <web>
- <web-uri>maxconnectionusage-web.war</web-uri>
- <context-root>maxconnectionusage</context-root>
- </web>
+ <web>
+ <web-uri>maxconnectionusage-web.war</web-uri>
+ <context-root>maxconnectionusage</context-root>
+ </web>
</module>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
index e19f64e..50589c0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
@@ -57,7 +57,7 @@
if (simpleBMP.test1(false)) {
System.out.println(" Max Connection Usage - (local-TxNotSupported): PASS");
- out.println("TEST:PASS");
+ out.println("TEST:PASS");
} else {
System.out.println(" Max Connection Usage - (local-TxNotSupported): FAIL");
out.println("TEST:FAIL");
@@ -67,7 +67,7 @@
boolean status = connectionSharingTest(simpleBMP, useXA, 21112);
if (status) {
System.out.println(" Max Connection Usage - (local-Tx-Sharing) : PASS");
- out.println("TEST:PASS");
+ out.println("TEST:PASS");
} else {
System.out.println(" Max Connection Usage - (local-Tx-Sharing) : FAIL");
out.println("TEST:FAIL");
@@ -76,20 +76,20 @@
if (simpleBMP.test1(true)) {
System.out.println(" Max Connection Usage - (XA-TxNotSupported) : PASS");
- out.println("TEST:PASS");
+ out.println("TEST:PASS");
} else {
System.out.println(" Max Connection Usage - (XA-TxNotSupported) : FAIL");
out.println("TEST:FAIL");
}
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
private boolean connectionSharingTest(SimpleBMP simpleBMP, boolean useXA, int value) {//throws RemoteException {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/create_pointbase.sql
index 51b0735..396c566 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table max_connection_usage;
-
-CREATE TABLE max_connection_usage (
- id integer not null,
- value char(16)
-);
-
+Drop table max_connection_usage;
+
+CREATE TABLE max_connection_usage (
+ id integer not null,
+ value char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/drop_pointbase.sql
index 4e577a3..b3c8b97 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table max_connection_usage;
+Drop table max_connection_usage;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.properties
index 03e0094..132c2c3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-multipleusercredentials"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="contextroot" value="/jdbc-multipleusercredentials/servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.xml
index 344dd98..cceb421 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/build.xml
@@ -19,13 +19,13 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../../../config/run.xml">
- <!ENTITY jdbcCommon SYSTEM "./../../JdbcCommon.xml">
- <!ENTITY jdbcCommonProps SYSTEM "./../../JdbcCommon.properties">
- <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
- <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
+ <!ENTITY run SYSTEM "./../../../../config/run.xml">
+ <!ENTITY jdbcCommon SYSTEM "./../../JdbcCommon.xml">
+ <!ENTITY jdbcCommonProps SYSTEM "./../../JdbcCommon.properties">
+ <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
+ <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
]>
<project name="mix" default="usage" basedir=".">
@@ -57,12 +57,12 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
<param name="ejbjar.classes"
- value="**/ejb/*.class"/>
+ value="**/ejb/*.class"/>
<param name="appclientjar.classes"
- value="**/client/*.class"/>
- <param name="war.classes"
- value="**/servlet/*.class"/>
- <param name="hasWebclient" value="true"/>
+ value="**/client/*.class"/>
+ <param name="war.classes"
+ value="**/servlet/*.class"/>
+ <param name="hasWebclient" value="true"/>
</antcall>
<javac
srcdir="."
@@ -121,7 +121,7 @@
<antcall target="undeploy-common"/>
<antcall target="undeploy-jdbc-common"/>
- <delete file="client/WebTest.class"/>
+ <delete file="client/WebTest.class"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/descriptor/application.xml
index 84e9203..ab327cb 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/descriptor/application.xml
@@ -28,9 +28,9 @@
<ejb>jdbc-multipleusercredentials-ejb.jar</ejb>
</module>
<module>
- <web>
- <web-uri>jdbc-multipleusercredentials-web.war</web-uri>
- <context-root>jdbc-multipleusercredentials</context-root>
+ <web>
+ <web-uri>jdbc-multipleusercredentials-web.war</web-uri>
+ <context-root>jdbc-multipleusercredentials</context-root>
</web>
</module>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
index 64120ba..998379c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
@@ -69,20 +69,20 @@
}
}
if(passed){
- System.out.println("Multiple User credentials test : test1 : PASS");
+ System.out.println("Multiple User credentials test : test1 : PASS");
out.println("TEST:PASS");
- } else {
- System.out.println("Multiple User credentials test : test1 : FAIL");
+ } else {
+ System.out.println("Multiple User credentials test : test1 : FAIL");
out.println("TEST:FAIL");
- }
+ }
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/sql/create_pointbase.sql
index 87073ca..a71dd8a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/sql/create_pointbase.sql
@@ -1,8 +1,8 @@
-CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
- 'derby.user.derby',
- 'derby') ;
-
-CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
- 'derby.user.javadb',
- 'javadb') ;
-
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+ 'derby.user.derby',
+ 'derby') ;
+
+CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
+ 'derby.user.javadb',
+ 'javadb') ;
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/osgi-jdbc-test/src/main/java/org/glassfish/osgijdbc_test/JDBCActivator.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/osgi-jdbc-test/src/main/java/org/glassfish/osgijdbc_test/JDBCActivator.java
index 043fbcb..245940a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/osgi-jdbc-test/src/main/java/org/glassfish/osgijdbc_test/JDBCActivator.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/osgi-jdbc-test/src/main/java/org/glassfish/osgijdbc_test/JDBCActivator.java
@@ -41,7 +41,7 @@
private void test(){
testJdbcResources(null);
-
+
testJdbcResources("(osgi.jdbc.driver.class=oracle.jdbc.pool.OracleDataSource)");
testJdbcResources("(osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedXADataSource)");
testJdbcResources("(osgi.jdbc.driver.class=org.apache.derby.jdbc.ClientDataSource)");
@@ -59,7 +59,7 @@
testJdbcResources("(&(jndi-name=jdbc/oracle_type4_resource)(osgi.jdbc.driver.class=org.apache.derby.jdbc.ClientDataSource))");
-
+
}
private void testJdbcResources(String filter) {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.properties
index 120da35..f9b209f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="resEnableDisable"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="poolname" value="jdbc-resEnableDisable"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.xml
index a1fd96c..4f06551 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/build.xml
@@ -51,12 +51,12 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
<param name="ejbjar.classes"
- value="**/ejb/*.class"/>
+ value="**/ejb/*.class"/>
<param name="appclientjar.classes"
- value="**/client/*.class"/>
- <param name="war.classes"
- value="**/servlet/*.class"/>
- <param name="hasWebclient" value="true"/>
+ value="**/client/*.class"/>
+ <param name="war.classes"
+ value="**/servlet/*.class"/>
+ <param name="hasWebclient" value="true"/>
</antcall>
<javac
srcdir="."
@@ -85,8 +85,8 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="delete-jdbc-stuff"/>
- <antcall target="undeploy-common"/>
- <delete file="client/WebTest.class"/>
+ <antcall target="undeploy-common"/>
+ <delete file="client/WebTest.class"/>
</target>
<target name="usage">
@@ -124,8 +124,8 @@
<java classname="client.WebTest">
<arg value="${http.host}"/>
<arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <arg value="${TEST.FAIL}"/>
+ <arg value="${contextroot}"/>
+ <arg value="${TEST.FAIL}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="."/>
@@ -139,8 +139,8 @@
<java classname="client.WebTest">
<arg value="${http.host}"/>
<arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <arg value="${TEST.PASS}"/>
+ <arg value="${contextroot}"/>
+ <arg value="${TEST.PASS}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="."/>
@@ -149,13 +149,13 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="servers.server.server.resource-ref.${resourcename}.enabled=false"/>
+ value="servers.server.server.resource-ref.${resourcename}.enabled=false"/>
</antcall>
<java classname="client.WebTest">
<arg value="${http.host}"/>
<arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <arg value="${TEST.FAIL}"/>
+ <arg value="${contextroot}"/>
+ <arg value="${TEST.FAIL}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="."/>
@@ -164,13 +164,13 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props"
- value="servers.server.server.resource-ref.${resourcename}.enabled=true"/>
+ value="servers.server.server.resource-ref.${resourcename}.enabled=true"/>
</antcall>
<java classname="client.WebTest">
<arg value="${http.host}"/>
<arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <arg value="${TEST.PASS}"/>
+ <arg value="${contextroot}"/>
+ <arg value="${TEST.PASS}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="."/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/client/WebTest.java
index fdfdf3f..62fec5f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/client/WebTest.java
@@ -43,8 +43,8 @@
}
private static void goGet(String host, int port,
- String result, String contextPath,
- String testStatus) {
+ String result, String contextPath,
+ String testStatus) {
try {
long time = System.currentTimeMillis();
@@ -75,12 +75,12 @@
if (status.equalsIgnoreCase("PASS")) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- if("FAIL".equalsIgnoreCase(testStatus)) {
- //Test is supposed to fail hence passed
- stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ if("FAIL".equalsIgnoreCase(testStatus)) {
+ //Test is supposed to fail hence passed
+ stat.addStatus(TEST_NAME, stat.PASS);
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/descriptor/ejb-jar.xml
index 27bbbbf..78de1a3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/descriptor/ejb-jar.xml
@@ -31,16 +31,16 @@
<ejb-name>SimpleBMPEJB</ejb-name>
<local-home>com.sun.s1asdev.jdbc.resenabledisable.ejb.SimpleBMPHome</local-home>
<local>com.sun.s1asdev.jdbc.resenabledisable.ejb.SimpleBMP</local>
- <ejb-class>com.sun.s1asdev.jdbc.resenabledisable.ejb.SimpleBMPBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <!--<persistence-type>Bean</persistence-type>
+ <ejb-class>com.sun.s1asdev.jdbc.resenabledisable.ejb.SimpleBMPBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <!--<persistence-type>Bean</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>False</reentrant>
<security-identity>
<description></description>
<use-caller-identity></use-caller-identity>
- </security-identity>-->
+ </security-identity>-->
<resource-ref>
<res-ref-name>DataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
index 90a86a1..0b831cb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
@@ -28,7 +28,7 @@
private transient jakarta.ejb.SessionContext m_ctx = null;
public void setSessionContext(SessionContext context) {
- m_ctx = context;
+ m_ctx = context;
}
public Integer ejbCreate() throws CreateException {
@@ -36,7 +36,7 @@
}
-
+
/* Get a single connection and close it */
public boolean test1() {
Connection conn = null;
@@ -57,14 +57,14 @@
//e.printStackTrace();
passed = false;
} finally {
- if(conn != null) {
+ if(conn != null) {
try {
- conn.close();
- } catch(Exception ex) {
- System.out.println("Exception in closing connection");
- }
+ conn.close();
+ } catch(Exception ex) {
+ System.out.println("Exception in closing connection");
+ }
}
- }
+ }
return passed;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
index f67de5b..738221e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
@@ -56,20 +56,20 @@
//stat.addDescription("Running serializable connector test ");
SimpleBMP bean = simpleBMPHome.create();
- for(int i=0; i<3; i++){
+ for(int i=0; i<3; i++){
if(!bean.test1()){
out.println("TEST:FAIL");
- break;
- }
- }
- out.println("TEST:PASS");
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
+ break;
+ }
+ }
+ out.println("TEST:PASS");
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/drop_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/sql/drop_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-dev-tests.sh b/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-dev-tests.sh
index 5726241..ba9d520 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-dev-tests.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-dev-tests.sh
@@ -92,7 +92,7 @@
#Create Pool/Resource for lazy-connection-associationtest
echo Creating Pool/Resource Lazy connection association test
-./bin/asadmin create-jdbc-connection-pool --maxwait=10 --datasourceclassname=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --restype=javax.sql.ConnectionPoolDataSource --lazyconnectionenlistment=true --lazyconnectionassociation=true --property="password=APP:user=APP:databaseName=sun-appserv-samples:connectionAttributes=\;create\\=true" jdbc-lazy-assoc-test-pool
+./bin/asadmin create-jdbc-connection-pool --maxwait=10 --datasourceclassname=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --restype=javax.sql.ConnectionPoolDataSource --lazyconnectionenlistment=true --lazyconnectionassociation=true --property="password=APP:user=APP:databaseName=sun-appserv-samples:connectionAttributes=\;create\\=true" jdbc-lazy-assoc-test-pool
./bin/asadmin create-jdbc-resource --connectionpoolid=jdbc-lazy-assoc-test-pool jdbc/jdbc-lazy-assoc-test-resource
echo "\n"
@@ -150,7 +150,7 @@
./bin/asadmin start-domain
echo "\n"
-sleep 5
+sleep 5
wget http://localhost:8080/v3_jdbc_dev_tests/TestResultServlet -O $testResult1
wget http://localhost:8080/v3_jdbc_dev_tests/TestResultServlet?testName=lazy-assoc -O $testResult2
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-reconfig-dev-tests.sh b/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-reconfig-dev-tests.sh
index 89f474f..3d2cd47 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-reconfig-dev-tests.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/setup-jdbc-reconfig-dev-tests.sh
@@ -33,7 +33,7 @@
cd $v3home
echo "Starting domain..."
./bin/asadmin start-domain
-sleep 10
+sleep 10
echo "\n"
echo "*******************************************************************************************************************\n"
@@ -52,7 +52,7 @@
echo create resource jdbc/jdbc-reconfig-test-resource-1
./bin/asadmin create-jdbc-resource --connectionpoolid=jdbc-reconfig-test-pool-1 jdbc/jdbc-reconfig-test-resource-1
-echo create pool jdbc-reconfig-test-pool-2
+echo create pool jdbc-reconfig-test-pool-2
./bin/asadmin create-jdbc-connection-pool --datasourceclassname=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --restype=javax.sql.ConnectionPoolDataSource --property="Password=rpassword:User=ruser:DatabaseName=$databaseshome/reconfig-db:serverName=localhost" jdbc-reconfig-test-pool-2
echo create resource jdbc/jdbc-reconfig-test-resource-2
@@ -81,7 +81,7 @@
./bin/asadmin set resources.jdbc-connection-pool.jdbc-dev-test-pool.max-wait-time-in-millis=1000
echo "\nGET http://localhost:8080/v3_jdbc_dev_tests/ReconfigTestServlet?maxPoolSize=40\&throwException=true\&testId=1 \n"
-GET http://localhost:8080/v3_jdbc_dev_tests/ReconfigTestServlet?maxPoolSize=40\&throwException=true\&testId=1 > $reconfigResult
+GET http://localhost:8080/v3_jdbc_dev_tests/ReconfigTestServlet?maxPoolSize=40\&throwException=true\&testId=1 > $reconfigResult
echo "\n"
#asadmin set max-pool-size to 10 before running test for the second time
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.properties
index 34eb966..4a6a27a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-bmp-statementtimeout"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="appclient.application.args" value="12"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.xml
index fcc58e8..e9cdf6c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/build.xml
@@ -19,11 +19,11 @@
-->
<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+ <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
- <!ENTITY run SYSTEM "./../../../../config/run.xml">
- <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
- <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
+ <!ENTITY run SYSTEM "./../../../../config/run.xml">
+ <!ENTITY eeSetup SYSTEM "./../../config/ee-common.xml">
+ <!ENTITY eeProperties SYSTEM "./../../config/ee-properties.xml">
]>
<project name="mix" default="usage" basedir=".">
@@ -56,28 +56,28 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="true"/>
+ <property name="hasWebclient" value="true"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
<param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
- </antcall>
+ <param name="ejbjar.classes" value="**/*.class"/>
+ </antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
+ <delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- </ear>
+ <ear earfile="${assemble.dir}/${appname}App.ear"
+ appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
+ </ear>
</target>
<target name="deploy" depends="init-common">
@@ -92,7 +92,7 @@
value="${resources.dottedname.prefix}.jdbc-connection-pool.ql-jdbc-pool.statement_timeout_in_seconds=30"/>
</antcall>
- <!--<antcall target="create-persistence-resource-common"/>-->
+ <!--<antcall target="create-persistence-resource-common"/>-->
<antcall target="deploy-common"/>
</target>
@@ -105,8 +105,8 @@
<target name="run-test-1" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
</target>
<target name="undeploy" depends="init-common">
@@ -114,7 +114,7 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
- <!--<antcall target="delete-persistence-resource-common"/>-->
+ <!--<antcall target="delete-persistence-resource-common"/>-->
<antcall target="undeploy-jdbc-common"/>
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
index 69f1171..d807e47 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
@@ -56,36 +56,36 @@
SimpleBMP simpleBMP = simpleBMPHome.create();
if (simpleBMP.statementTest()) {
- System.out.println("Statement Timeout test : statementTest : PASS");
- out.println("TEST:PASS");
+ System.out.println("Statement Timeout test : statementTest : PASS");
+ out.println("TEST:PASS");
} else {
- System.out.println("Statement Timeout test : statementTest : FAIL");
+ System.out.println("Statement Timeout test : statementTest : FAIL");
out.println("TEST:FAIL");
}
if (simpleBMP.preparedStatementTest()) {
- System.out.println("Statement Timeout test : preparedStatementTest : PASS");
- out.println("TEST:PASS");
+ System.out.println("Statement Timeout test : preparedStatementTest : PASS");
+ out.println("TEST:PASS");
} else {
- System.out.println("Statement Timeout test : preparedStatementTest : FAIL");
+ System.out.println("Statement Timeout test : preparedStatementTest : FAIL");
out.println("TEST:FAIL");
}
if (simpleBMP.callableStatementTest()) {
- System.out.println("Statement Timeout test : callableStatementTest : PASS");
- out.println("TEST:PASS");
+ System.out.println("Statement Timeout test : callableStatementTest : PASS");
+ out.println("TEST:PASS");
} else {
- System.out.println("Statement Timeout test : callableStatementTest : FAIL");
+ System.out.println("Statement Timeout test : callableStatementTest : FAIL");
out.println("TEST:FAIL");
}
- } catch(NamingException ne) {
- ne.printStackTrace();
- } catch(CreateException e) {
- e.printStackTrace();
+ } catch(NamingException ne) {
+ ne.printStackTrace();
+ } catch(CreateException e) {
+ e.printStackTrace();
} finally {
- out.println("END_OF_TEST");
- out.flush();
- }
+ out.println("END_OF_TEST");
+ out.flush();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/sql/create_pointbase.sql
index dd4c5e5..11e61ee 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/sql/create_pointbase.sql
@@ -1,10 +1,10 @@
-
-Drop table customer_stmt_wrapper;
-
-CREATE TABLE customer_stmt_wrapper (
- c_id integer not null,
- c_phone char(16)
-);
-
-INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
+
+Drop table customer_stmt_wrapper;
+
+CREATE TABLE customer_stmt_wrapper (
+ c_id integer not null,
+ c_phone char(16)
+);
+
+INSERT INTO customer_stmt_wrapper VALUES(1, 'wxyz');
INSERT INTO customer_stmt_wrapper VALUES(2, 'pqrs');
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/unsetup-jdbc-dev-tests.sh b/appserver/tests/appserv-tests/devtests/jdbc/v3/unsetup-jdbc-dev-tests.sh
index 3659c26..4727b0f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/unsetup-jdbc-dev-tests.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/unsetup-jdbc-dev-tests.sh
@@ -20,7 +20,7 @@
cd $v3home
echo Starting the domain ...
-./bin/asadmin start-domain
+./bin/asadmin start-domain
echo undeploying application .....
./bin/asadmin undeploy v3_jdbc_dev_tests
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/build.xml
index d61dd4a..3b43098 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/build.xml
@@ -25,27 +25,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -53,21 +53,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -75,10 +75,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml
index abc5d3c..70c8a74 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml
index ebc0de5..31e0e91 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml
@@ -686,7 +686,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -728,7 +728,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -755,7 +755,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -781,7 +781,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java
index 9e92406..9f87fe9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/TestResultServlet.java
@@ -124,7 +124,7 @@
buf.append("<td>");
buf.append(entry.getValue());
buf.append("</td></tr>");
- }
+ }
//Run Application Authentication Test
Map<String, Boolean> mapAppAuth =
@@ -172,7 +172,7 @@
buf.append("<td>");
buf.append(entry.getValue());
buf.append("</td></tr>");
- }
+ }
//Run SimpleXADS test
@@ -198,7 +198,7 @@
buf.append(entry.getValue());
buf.append("</td></tr>");
}
- }
+ }
//Order of test is important : lazy enlist has to be before connection leak tracing
Map<String, Boolean> mapDoubleResourceReference =
@@ -363,7 +363,7 @@
processRequest(request, response);
}
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -373,7 +373,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
*/
public String getServletInfo() {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ApplicationAuthTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ApplicationAuthTest.java
index 17b72ae..5d745bb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ApplicationAuthTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ApplicationAuthTest.java
@@ -25,7 +25,7 @@
/**
* Tests Application Authentication
- *
+ *
* @author shalini
*/
public class ApplicationAuthTest implements SimpleTest {
@@ -68,7 +68,7 @@
} catch (Exception e) {
resultsMap.put("app-auth-wrong-credentials", false);
}
-
+
try {
if (testTwiceWithCredentials(ds, out)) {
resultsMap.put("app-auth-twice-with-credentials", true);
@@ -90,12 +90,12 @@
}
HtmlUtil.printHR(out);
- return resultsMap;
+ return resultsMap;
}
/**
- * Tests application authentication by ensuring that connection with
- * the same username is returned when got from 2 different credentials -
+ * Tests application authentication by ensuring that connection with
+ * the same username is returned when got from 2 different credentials -
* first one being the right one.
* @param ds
* @param out
@@ -122,7 +122,7 @@
HtmlUtil.printException(ex, out);
return result;
}
-
+
try {
out.println("<br> Getting the NonTx Connection for \"APP\" ...");
conn2 = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection(
@@ -131,7 +131,7 @@
if (conn2.getMetaData().getUserName().equals("APP")) {
out.println("<br> UserName matches the right credentials");
passed2 = true;
- }
+ }
} catch (Exception ex2) {
HtmlUtil.printException(ex2, out);
}
@@ -150,11 +150,11 @@
} catch (Exception e1) {
HtmlUtil.printException(e1, out);
}
- }
+ }
}
result = passed1 && passed2;
out.println("<br> Test result : " + result);
- return result;
+ return result;
}
/**
@@ -234,7 +234,7 @@
}
/**
- * Tests application authentication when right username/password are
+ * Tests application authentication when right username/password are
* specified.
* @param ds
* @param out
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java
index a30256e..e0f67bd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/AssocWithThreadTest.java
@@ -38,7 +38,7 @@
*/
public class AssocWithThreadTest implements SimpleTest{
-
+
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
public Map<String, Boolean> runTest(DataSource ds1, PrintWriter out) {
@@ -53,10 +53,10 @@
}
return resultsMap;
}
-
+
private boolean testAssocWithThread(DataSource ds1, PrintWriter out) throws SystemException {
-
+
HtmlUtil.printHR(out);
out.println("<h4> Assoc-with-thread test </h4>");
@@ -74,10 +74,10 @@
}else{
return false;
}
-
+
}
-
+
private String test1(DataSource ds1, PrintWriter out) throws SystemException {
String result = null;
Connection con = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionLeakTracingTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionLeakTracingTest.java
index 3f6f294..079a8da 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionLeakTracingTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionLeakTracingTest.java
@@ -28,23 +28,23 @@
/**
* Tests Connection Leak tracing/ Leak reclaim.
- *
- * Assumes that steady-pool-size=1, max-pool-size=1,
+ *
+ * Assumes that steady-pool-size=1, max-pool-size=1,
* connection-leak-timeout-in-seconds = 10, connection-leak-reclaim = true
* attributes are set in the pool configuration.
* @author shalini
*/
public class ConnectionLeakTracingTest implements SimpleTest {
- Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
-
+ Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
+
public Map<String, Boolean> runTest(DataSource ds, PrintWriter out) {
//create CUSTOMER table needed for this test
String tableName = "CUSTOMER";
createTables(ds, out, tableName);
-
+
out.println("<h4> Connection Leak Tracing Test </h4>");
-
+
for(int i=0; i<3; i++) {
try {
out.println("<br> Trial " + i);
@@ -63,15 +63,15 @@
}
out.println("<br> Test result : true");
resultsMap.put("conn-leak-tracing-test1", true);
-
+
//Delete the CUSTOMER table created.
TablesUtil.deleteTables(ds, out, tableName);
-
+
HtmlUtil.printHR(out);
return resultsMap;
}
- private boolean connLeakTracingTest1(DataSource ds, PrintWriter out,
+ private boolean connLeakTracingTest1(DataSource ds, PrintWriter out,
String tableName) {
Connection conn = null;
boolean passed = true;
@@ -116,7 +116,7 @@
} catch (Exception e) {
HtmlUtil.printException(e, out);
}
- }
+ }
}
private void emptyTable(Connection conn, String tableName) throws SQLException {
@@ -129,7 +129,7 @@
Statement stmt = conn.createStatement();
stmt.executeUpdate("INSERT into " + tableName +
" values (1, 'abcd')");
- stmt.close();
+ stmt.close();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java
index caf3f9d..c3d5427 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ConnectionSharingTest.java
@@ -33,7 +33,7 @@
*/
public class ConnectionSharingTest implements SimpleTest{
-
+
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
public Map<String, Boolean> runTest(DataSource ds1, PrintWriter out) {
@@ -51,7 +51,7 @@
return resultsMap;
}
-
+
private boolean testConnectionSharing(DataSource ds1, PrintWriter out) throws SystemException {
boolean result = false;
Connection con = null;
@@ -109,7 +109,7 @@
} catch (Exception e) {
HtmlUtil.printException(e, out);
}
-
+
out.println("<br> Test result : " + result);
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ContainerAuthTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ContainerAuthTest.java
index 41f00e0..e92d08d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ContainerAuthTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/ContainerAuthTest.java
@@ -30,7 +30,7 @@
public class ContainerAuthTest implements SimpleTest {
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
-
+
public Map<String, Boolean> runTest(DataSource ds, PrintWriter out) {
try {
if (testContAuthUserPass(ds, out)) {
@@ -52,7 +52,7 @@
}
HtmlUtil.printHR(out);
- return resultsMap;
+ return resultsMap;
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java
index 29f7847..14ccc18 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LazyConnectionAssociationTest.java
@@ -54,9 +54,9 @@
* @param i
* @param ds
*/
- private void acquireConnections(int count, DataSource ds, PrintWriter out)
+ private void acquireConnections(int count, DataSource ds, PrintWriter out)
throws Exception{
-
+
for(int i=0; i<count ; i++){
ds.getConnection();
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LeakTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LeakTest.java
index cd461fb..8e2ac2f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LeakTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/LeakTest.java
@@ -29,7 +29,7 @@
*/
public class LeakTest implements SimpleTest{
-
+
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
public Map<String, Boolean> runTest(DataSource ds1, PrintWriter out) {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MarkConnectionAsBadTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MarkConnectionAsBadTest.java
index a1a6a6c..5df51e0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MarkConnectionAsBadTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MarkConnectionAsBadTest.java
@@ -73,7 +73,7 @@
try {
conn[i] = ds.getConnection();
physicalConnections.add(ds1.getConnection(conn[i]));
-
+
} catch (Exception e) {
HtmlUtil.printException(e, out);
result = false;
@@ -136,7 +136,7 @@
try {
conn[i] = ds.getConnection();
physicalConnections.add(ds1.getConnection(conn[i]));
-
+
} catch (Exception e) {
HtmlUtil.printException(e, out);
result = false;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MaxConnectionUsageTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MaxConnectionUsageTest.java
index 22bd2d7..7392acf 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MaxConnectionUsageTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MaxConnectionUsageTest.java
@@ -27,19 +27,19 @@
import org.glassfish.jdbc.devtests.v3.util.TablesUtil;
/**
- * Devtest to test if application server removes a connection from pool
+ * Devtest to test if application server removes a connection from pool
* after using it for "maxconnectionusage" times.
- *
- * Assumes that steady-pool-size = 1, max-pool-size = 1,
+ *
+ * Assumes that steady-pool-size = 1, max-pool-size = 1,
* max-connection-usage-count = 10 attributes are set on the pool.
- *
+ *
* @author shalini
*/
public class MaxConnectionUsageTest implements SimpleTest {
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
-
+
/**
- * Tests max-connection-usage assuming pool size = 1 and
+ * Tests max-connection-usage assuming pool size = 1 and
* DataSource is of type : javax.sql.DataSource
* @param ds
* @param out
@@ -67,27 +67,27 @@
} catch (Exception e) {
resultsMap.put("max-conn-usage-connection-sharing-test", false);
}
-
+
TablesUtil.deleteTables(ds, out, tableName);
HtmlUtil.printHR(out);
- return resultsMap;
+ return resultsMap;
}
/**
* Assuming pool has only one connection, calling maxConnUsageTest2(...) and
* maxConnUsageTest3(...) 5 times each will ensure that "maxconnectionsusage=10"
- * is met.
+ * is met.
* Further call to maxConnUsageTest2(...) will return a different connection
- *
+ *
* If they are different, connection was dropped and created and test passes.
- *
+ *
* @param ds
* @param out
* @param value
* @param tableName
* @return boolean status
*/
- private boolean connectionSharingTest(DataSource ds, PrintWriter out,
+ private boolean connectionSharingTest(DataSource ds, PrintWriter out,
int value, String tableName) {
String[] results = new String[10];
out.println("<h4> Max Connection Usage - Connection Sharing Test </h4>");
@@ -96,7 +96,7 @@
if(i % 2 == 0) {
results[i] = maxConnUsageTest2(ds, out, value, tableName);
} else {
- results[i] = maxConnUsageTest3(ds, out, (i/2)+1, value,
+ results[i] = maxConnUsageTest3(ds, out, (i/2)+1, value,
tableName);
}
}
@@ -110,10 +110,10 @@
break;
}
}
-
+
out.println("<br> Further call to maxConnUsageTest2");
String tmpResult2 = maxConnUsageTest2(ds, out, value, tableName);
-
+
if(!tmpResult2.equalsIgnoreCase(tmpResult1) && status) {
status = true;
} else {
@@ -129,7 +129,7 @@
/**
* Creates table needed for the Max Connection Usage devtest.
- *
+ *
* @param ds
* @param out
* @param tableName
@@ -167,7 +167,7 @@
/**
* Tests if the first and last physical connections are different.
* Assuming maxconnectionusage property is 10 and connectionSharing ON, the
- * physical connections con-1 and con-11 must be different.
+ * physical connections con-1 and con-11 must be different.
* @param ds
* @param out
* @return boolean result
@@ -218,7 +218,7 @@
* @param tableName
* @return physicalConnectionString
*/
- private String maxConnUsageTest2(DataSource ds, PrintWriter out, int value,
+ private String maxConnUsageTest2(DataSource ds, PrintWriter out, int value,
String tableName) {
Connection physicalConnection = null;
Connection conn = null;
@@ -228,7 +228,7 @@
try {
conn = ds1.getConnection();
stmt = conn.createStatement();
- stmt.executeUpdate("insert into " + tableName + " values (" +
+ stmt.executeUpdate("insert into " + tableName + " values (" +
value + ",'" + value + "')");
physicalConnection = ds1.getConnection(conn);
physicalConnectionString = physicalConnection.toString();
@@ -243,7 +243,7 @@
} catch (Exception e) {
HtmlUtil.printException(e, out);
}
-
+
try {
if(conn != null) {
conn.close();
@@ -256,7 +256,7 @@
}
/**
- * Returns the physical connection's ID after testing if the entries inserted
+ * Returns the physical connection's ID after testing if the entries inserted
* using maxConnUsageTest2(....) method are persisted.
* @param ds
* @param out
@@ -265,7 +265,7 @@
* @param tableName
* @return physicalConnectionString
*/
- private String maxConnUsageTest3(DataSource ds, PrintWriter out, int count,
+ private String maxConnUsageTest3(DataSource ds, PrintWriter out, int count,
int value, String tableName) {
Connection physicalConnection = null;
Connection conn = null;
@@ -281,7 +281,7 @@
if(count == resultCount) {
physicalConnection = ds1.getConnection(conn);
} else {
- out.println("Expected count [" + count +
+ out.println("Expected count [" + count +
"] does not match [" + resultCount + "]");
break;
}
@@ -297,15 +297,15 @@
} catch(Exception ex) {
HtmlUtil.printException(ex, out);
}
-
+
try {
if(stmt != null) {
stmt.close();
- }
+ }
} catch (Exception ex) {
HtmlUtil.printException(ex, out);
}
-
+
try {
if(conn != null) {
conn.close();
@@ -316,5 +316,5 @@
}
return physicalConnection.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleConnectionCloseTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleConnectionCloseTest.java
index 6c4bd74..7976ac6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleConnectionCloseTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleConnectionCloseTest.java
@@ -63,7 +63,7 @@
Connection conn1 = null;
boolean passed = true;
//clean the database
- out.println("<h4> Multiple close connection - Test1 </h4>");
+ out.println("<h4> Multiple close connection - Test1 </h4>");
try {
conn1 = ds1.getConnection();
@@ -93,7 +93,7 @@
String columnName = "name";
TablesUtil.createTables(ds1, out, tableName, columnName);
- out.println("<h4> Multiple close connection - Test2 </h4>");
+ out.println("<h4> Multiple close connection - Test2 </h4>");
try {
conn1 = ds1.getConnection();
stmt = conn1.createStatement();
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleUserCredentialsTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleUserCredentialsTest.java
index f893119..74ea659 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleUserCredentialsTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/MultipleUserCredentialsTest.java
@@ -26,7 +26,7 @@
/**
* Tests if Connection pool tries to evict (expel) some free connections
- * if a new connection cannot fit in the pool. Assumes max-pool-size = 32,
+ * if a new connection cannot fit in the pool. Assumes max-pool-size = 32,
* steady-pool-size = 8, pool-resize-quantity = 2, match-connections = true.
* @author shalini
@@ -34,7 +34,7 @@
public class MultipleUserCredentialsTest implements SimpleTest {
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
-
+
public Map<String, Boolean> runTest(DataSource ds, PrintWriter out) {
try {
if (testMultipleUserCredentials(ds, out)) {
@@ -46,12 +46,12 @@
resultsMap.put("jdbc-multiple-user-credentials", false);
}
- HtmlUtil.printHR(out);
- return resultsMap;
+ HtmlUtil.printHR(out);
+ return resultsMap;
}
/**
- * Tests if unmatched free connections are purged and new connections are
+ * Tests if unmatched free connections are purged and new connections are
* provided even if the user credentials don't match.
* @param ds
* @param out
@@ -62,7 +62,7 @@
Connection conns2[] = new Connection[16];
boolean passed = true;
out.println("<h4> Multiple User Credentials Test</h4>");
-
+
//First user acquires 16 connections
out.println("<br> Getting 16 connections as DBUSER...");
for(int i=0; i<conns1.length; i++) {
@@ -84,7 +84,7 @@
passed = false;
}
}
-
+
//All connections are returned to the pool
out.println("<br> Closing all the connections acquired by DBUSER");
for(int i=0; i<conns1.length; i++) {
@@ -106,7 +106,7 @@
}
}
- //Request from third and fourth user
+ //Request from third and fourth user
out.println("<br> Getting subsequent connections for APP and DERBYUSER");
try {
Connection conn3 = ds.getConnection("APP", "APP");
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java
index c606ab3..f018810 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/NoTxConnTest.java
@@ -35,7 +35,7 @@
public class NoTxConnTest implements SimpleTest {
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
-
+
public Map<String, Boolean> runTest(DataSource ds, PrintWriter out) {
/*try {
if (testNoTxConnTest1(ds, out)) {
@@ -58,7 +58,7 @@
}
HtmlUtil.printHR(out);
- return resultsMap;
+ return resultsMap;
}
private boolean testNoTxConnTest1(DataSource ds, PrintWriter out) {
@@ -74,8 +74,8 @@
String content = "method1";
String columnName = "name";
TablesUtil.createTables(ds, out, tableName, columnName);
-
- out.println("<h4> NoTxConn Test1 </h4>");
+
+ out.println("<h4> NoTxConn Test1 </h4>");
UserTransaction tx = null;
try {
out.println("<br>");
@@ -95,7 +95,7 @@
noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
out.println("<br>Got noTx connection - noTxConn : " + noTxConn);
stmt = conn.createStatement();
- stmt.executeUpdate("INSERT INTO " + tableName + " VALUES('" +
+ stmt.executeUpdate("INSERT INTO " + tableName + " VALUES('" +
content + "')");
stmt2 = noTxConn.createStatement();
@@ -146,10 +146,10 @@
HtmlUtil.printException(e1, out);
}
}
-
+
TablesUtil.deleteTables(ds, out, tableName);
out.println("<br> Test result : " + result);
- return result;
+ return result;
}
}
@@ -162,7 +162,7 @@
jakarta.transaction.UserTransaction tx = null;
try {
out.println("<br>Starting test ...");
-
+
InitialContext ctx = new InitialContext();
tx =(UserTransaction)ctx.lookup("java:comp/UserTransaction");
@@ -183,7 +183,7 @@
noTxConn = ((com.sun.appserv.jdbc.DataSource)ds).getNonTxConnection();
out.println("<br>Autocommit of noTxConn => " + noTxConn.getAutoCommit());
if (noTxConn.getAutoCommit() == false ) {
- result = false;
+ result = false;
}
noTxConn.close();
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/StatementTimeoutTest.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/StatementTimeoutTest.java
index e0bffc7..f8bccfa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/StatementTimeoutTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/StatementTimeoutTest.java
@@ -30,22 +30,22 @@
/**
* Tests if statement-timeout (query-timeout) is being set on all types of
- * statements created in an application : Statement, PreparedStatement,
+ * statements created in an application : Statement, PreparedStatement,
* CallableStatement.
- *
+ *
* Assumes that statement-timeout attribute is set on the pool to 30.
- *
+ *
* @author shalini
*/
public class StatementTimeoutTest implements SimpleTest {
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
public Map<String, Boolean> runTest(DataSource ds, PrintWriter out) {
-
+
//Create required tables and insert entry into them
String tableName = "CUSTOMER";
String columnName = "name";
- TablesUtil.createTables(ds, out, tableName, columnName);
+ TablesUtil.createTables(ds, out, tableName, columnName);
TablesUtil.insertEntry(ds, out, tableName, "abcd");
TablesUtil.insertEntry(ds, out, tableName, "pqrs");
@@ -58,7 +58,7 @@
} catch (Exception e) {
resultsMap.put("statement-test", false);
}
-
+
try {
if (preparedStatementTest(ds, out, tableName)) {
resultsMap.put("prepared-statement-test", true);
@@ -85,14 +85,14 @@
}
/**
- * Tests if statement-timeout is being set on a CallableStatement created
+ * Tests if statement-timeout is being set on a CallableStatement created
* in the application.
* @param ds
* @param out
* @param tableName
* @return boolean result
*/
- private boolean callableStatementTest(DataSource ds, PrintWriter out,
+ private boolean callableStatementTest(DataSource ds, PrintWriter out,
String tableName) {
boolean result = false;
Connection conFromDS = null;
@@ -103,7 +103,7 @@
conFromDS = ds.getConnection();
out.print("<br> Preparing a CallableStatement");
stmt = conFromDS.prepareCall("select * from " + tableName);
-
+
out.println("<br> getQueryTimeout() on the statement");
if(stmt.getQueryTimeout() == 30) {
out.println("<br> Timeout = 30");
@@ -128,7 +128,7 @@
}
out.println("<br> Test result : " + result);
return result;
- }
+ }
}
/**
@@ -139,19 +139,19 @@
* @param tableName
* @return boolean result
*/
- private boolean preparedStatementTest(DataSource ds, PrintWriter out,
+ private boolean preparedStatementTest(DataSource ds, PrintWriter out,
String tableName) {
boolean result = false;
Connection conFromDS = null;
PreparedStatement stmt = null;
out.println("<h4> Prepared Statement Test </h4>");
-
+
try {
out.println("<br> Getting a connection...");
conFromDS = ds.getConnection();
out.println("<br>Creating a PreparedStatement query");
stmt = conFromDS.prepareStatement("select * from " + tableName);
-
+
out.println("<br>getQueryTimeout() on the statement");
if(stmt.getQueryTimeout() == 30) {
out.println("<br>Timeout = 30");
@@ -176,7 +176,7 @@
}
out.println("<br> Test result : " + result);
return result;
- }
+ }
}
/**
@@ -196,7 +196,7 @@
conFromDS = ds.getConnection();
out.print("<br>Creating a Statement");
stmt = conFromDS.createStatement();
-
+
out.println("<br> Getting the queryTimeout on the statement");
if(stmt.getQueryTimeout() == 30) {
out.println("<br>Timeout = 30");
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java
index 1fc748a..ac7a33d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestServlet.java
@@ -37,7 +37,7 @@
public class ReconfigTestServlet extends HttpServlet {
@Resource(name = "jdbc/jdbc-dev-test-resource", mappedName = "jdbc/jdbc-dev-test-resource")
DataSource ds;
-
+
@Resource(name = "jdbc/jdbc-reconfig-test-resource-1", mappedName = "jdbc/jdbc-reconfig-test-resource-1")
DataSource dsReconfig1;
@@ -46,13 +46,13 @@
@Resource(name = "jdbc/res1", mappedName = "jdbc/res1")
DataSource dsRes1;
-
+
@Override
protected void doGet(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException {
processRequest(arg0, arg1);
}
- /**
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -92,7 +92,7 @@
mapReconfig = reconfigTest.resourceAttributeChangeTest(dsReconfig2, out, throwException);
break;
case 4: //Resource attribute change test with another datasource
-
+
out.println("<h1>Reconfig Resource Attribute Test with DS : dsRes1</h1>");
mapReconfig = reconfigTest.resourceAttributeChangeTest(dsRes1, out, throwException);
break;
@@ -118,7 +118,7 @@
}
}
- /**
+ /**
* Returns a short description of the servlet.
*/
public String getServletInfo() {
@@ -126,7 +126,7 @@
"JDBC Resource";
}
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java
index 333281f..c63767a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/test/reconfig/ReconfigTestUtil.java
@@ -38,7 +38,7 @@
public class ReconfigTestUtil {
Map<String, Boolean> resultsMap = new HashMap<String, Boolean>();
- Map<String, Boolean> poolPropertyChangeTest(DataSource ds, PrintWriter out,
+ Map<String, Boolean> poolPropertyChangeTest(DataSource ds, PrintWriter out,
boolean throwException) {
//Tests the property change of jdbc connection pool by asadmin set command.
try {
@@ -49,11 +49,11 @@
}
} catch (Exception e) {
resultsMap.put("pool-property-change-test", false);
- }
+ }
return resultsMap;
}
- Map<String, Boolean> resourceAttributeChangeTest(DataSource ds, PrintWriter out,
+ Map<String, Boolean> resourceAttributeChangeTest(DataSource ds, PrintWriter out,
boolean throwException) {
//Tests the attribute set of jdbc resource by asadmin set command.
try {
@@ -64,8 +64,8 @@
}
} catch (Exception e) {
resultsMap.put("resource-change-wrong-table-test", false);
- }
-
+ }
+
try {
if(testJDBCResourceChangeCorrectTable(ds, out, !throwException)) {
resultsMap.put("resource-change-correct-table-test", true);
@@ -77,8 +77,8 @@
}
return resultsMap;
}
-
- Map<String, Boolean> poolAttributeChangeTest(DataSource ds, PrintWriter out,
+
+ Map<String, Boolean> poolAttributeChangeTest(DataSource ds, PrintWriter out,
int maxPoolSize, boolean throwException) {
//Tests the attribute set by asadmin set command.
try {
@@ -93,7 +93,7 @@
return resultsMap;
}
- private boolean testJDBCResourceChange(DataSource ds, PrintWriter out,
+ private boolean testJDBCResourceChange(DataSource ds, PrintWriter out,
boolean throwException) throws SystemException {
HtmlUtil.printHR(out);
out.println("<h4> Reconfig test : tablename : reconfigTestTable (reconfig-db)</h4>");
@@ -120,12 +120,12 @@
} finally {
try { con.close(); } catch ( Exception e ) {}
}
-
+
HtmlUtil.printHR(out);
return passed;
}
- private boolean testJDBCResourceChangeCorrectTable(DataSource ds, PrintWriter out,
+ private boolean testJDBCResourceChangeCorrectTable(DataSource ds, PrintWriter out,
boolean throwException) throws SystemException {
HtmlUtil.printHR(out);
out.println("<h4> Reconfig test : tableName : sampleTable (sample-db) </h4>");
@@ -152,13 +152,13 @@
} finally {
try { con.close(); } catch ( Exception e ) {}
}
-
+
HtmlUtil.printHR(out);
- return passed;
+ return passed;
}
-
- public boolean testMaxPoolSize(DataSource ds, PrintWriter out,
- int maxPoolSize, boolean throwException)
+
+ public boolean testMaxPoolSize(DataSource ds, PrintWriter out,
+ int maxPoolSize, boolean throwException)
throws SystemException {
HtmlUtil.printHR(out);
out.println("\n<h4> Reconfig - Attribute max-pool-size test </h4>");
@@ -205,7 +205,7 @@
return passed;
}
- private boolean testPropertyChange(DataSource ds, PrintWriter out,
+ private boolean testPropertyChange(DataSource ds, PrintWriter out,
boolean throwException) throws SystemException {
HtmlUtil.printHR(out);
out.println("\n<h4> Reconfig - Pool property change test </h4>");
@@ -225,9 +225,9 @@
passed = false;
}
} finally {
- try { con.close(); } catch ( Exception e ) {}
+ try { con.close(); } catch ( Exception e ) {}
}
HtmlUtil.printHR(out);
- return passed;
+ return passed;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/HtmlUtil.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/HtmlUtil.java
index 4a50e50..6b56f42 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/HtmlUtil.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/HtmlUtil.java
@@ -37,7 +37,7 @@
out.println(element.toString() + "<br>");
}
}
-
+
/**
* Prints a horizontal ruler.
* @param out
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/TablesUtil.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/TablesUtil.java
index c8d9221..9efb916 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/TablesUtil.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/src/java/org/glassfish/jdbc/devtests/v3/util/TablesUtil.java
@@ -65,7 +65,7 @@
}
}
}
-
+
/**
* Deletes tables used by JDBC devtests.
* @param ds1
@@ -114,7 +114,7 @@
try {
con = ds.getConnection();
stmt = con.createStatement();
- stmt.executeUpdate("INSERT INTO " + tableName + " VALUES('" +
+ stmt.executeUpdate("INSERT INTO " + tableName + " VALUES('" +
content + "')");
} catch (SQLException ex) {
HtmlUtil.printException(ex, out);
@@ -137,7 +137,7 @@
}
/**
- * Verifies table content by getting the number of rows in it, used by the
+ * Verifies table content by getting the number of rows in it, used by the
* JDBC devtests. Returns a true if there are any rows in the table.
* @param ds1
* @param out
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/web/WEB-INF/sun-web.xml b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/web/WEB-INF/sun-web.xml
index 3f940d6..9d3b3ad 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/web/WEB-INF/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/web/WEB-INF/sun-web.xml
@@ -30,6 +30,6 @@
</resource-ref>
<resource-ref>
<res-ref-name>jdbc/jdbc-multiple-user-test-resource</res-ref-name>
- <jndi-name>jdbc/jdbc-multiple-user-test-resource</jndi-name>
+ <jndi-name>jdbc/jdbc-multiple-user-test-resource</jndi-name>
</resource-ref>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.properties b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.properties
index 244097f..d774e38 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jdbc-validateatmostonceperiod"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="poolname" value="jdbc-validateatmostonceperiod"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.xml
index 7c7ee7a..d6f4af6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/build.xml
@@ -98,8 +98,8 @@
<param name="appclient.application.args" value="1"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="2"/>
@@ -111,8 +111,8 @@
value="${resources.dottedname.prefix}.jdbc-connection-pool.${poolname}.validate_atmost_once_period_in_seconds=60"/>
</antcall>
- <antcall target="stop-derby"/>
- <antcall target="start-derby"/>
+ <antcall target="stop-derby"/>
+ <antcall target="start-derby"/>
<antcall target="runclient-common">
<param name="appclient.application.args" value="3"/>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/client/Client.java
index 0327133..82766a8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/client/Client.java
@@ -36,7 +36,7 @@
javax.rmi.PortableRemoteObject.narrow(objRef, SimpleBMPHome.class);
SimpleBMP convalBMP = convalBMPHome.create();
- stat.addDescription("JDBC Validate Atmost Once Period Tests");
+ stat.addDescription("JDBC Validate Atmost Once Period Tests");
if (args != null && args.length > 0) {
String param = args[0];
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
index 61bea23..e0df733 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
@@ -41,7 +41,7 @@
}
-
+
/* Get a single connection and close it */
public boolean test1() {
Connection conn = null;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/create_pointbase.sql
index e4914f6..f256076 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/create_pointbase.sql
@@ -1,7 +1,7 @@
-Drop table O_Customer;
-
-CREATE TABLE O_Customer (
- c_id integer not null,
- c_phone char(16)
-);
-
+Drop table O_Customer;
+
+CREATE TABLE O_Customer (
+ c_id integer not null,
+ c_phone char(16)
+);
+
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/drop_pointbase.sql
index 70d1fcc..d854b95 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/sql/drop_pointbase.sql
@@ -1 +1 @@
-Drop table O_Customer;
+Drop table O_Customer;
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.properties
index a98789d..7da6537 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/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="JMSXDeliveryCount-acc1"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.xml
index 1734b8d..8e8687a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC1/build.xml
@@ -34,12 +34,12 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
+ </target>
<target name="build" depends="init-common">
<antcall target="package-client"/>
@@ -48,14 +48,14 @@
<target name="package-client" depends="compile">
<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="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy file="${application-client.xml}" tofile="${build.classes.dir}/META-INF/application-client.xml"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <jar jarfile="${build.base.dir}/archive/${appname}AppClient.jar" basedir="${build.classes.dir}"
- update="true" includes ="**/*Client.class">
+ <jar jarfile="${build.base.dir}/archive/${appname}AppClient.jar" basedir="${build.classes.dir}"
+ update="true" includes ="**/*Client.class">
<manifest>
<attribute name="Main-Class" value="org.glassfish.test.jms.jmsxdeliverycount.client.Client"/>
</manifest>
@@ -68,14 +68,14 @@
<target name="package-client2" depends="init-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="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy file="${application-client.xml}" tofile="${build.classes.dir}/META-INF/application-client.xml"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <jar jarfile="${build.base.dir}/archive/${appname}AppClient2.jar" basedir="${build.classes.dir}"
- update="true" includes ="**/*Client2.class">
+ <jar jarfile="${build.base.dir}/archive/${appname}AppClient2.jar" basedir="${build.classes.dir}"
+ update="true" includes ="**/*Client2.class">
<manifest>
<attribute name="Main-Class" value="org.glassfish.test.jms.jmsxdeliverycount.client.Client2"/>
</manifest>
@@ -91,7 +91,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"/>
@@ -108,14 +108,14 @@
<env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar"/>
</exec>
</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/jms/JMSXDeliveryCount/ACC2/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/build.properties
index 56789b3..cd62703 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/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="JMSXDeliveryCount-acc2"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/build.xml
index 74a58a3..1e8c2de 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/ACC2/build.xml
@@ -34,12 +34,12 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
- </target>
+ </target>
<target name="build" depends="init-common">
<antcall target="package-client"/>
@@ -47,14 +47,14 @@
<target name="package-client" depends="compile">
<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="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy file="${application-client.xml}" tofile="${build.classes.dir}/META-INF/application-client.xml"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <jar jarfile="${build.base.dir}/archive/${appname}AppClient.jar" basedir="${build.classes.dir}"
- update="true" includes ="**/*Client.class">
+ <jar jarfile="${build.base.dir}/archive/${appname}AppClient.jar" basedir="${build.classes.dir}"
+ update="true" includes ="**/*Client.class">
<manifest>
<attribute name="Main-Class" value="org.glassfish.test.jms.jmsxdeliverycount.client.Client"/>
</manifest>
@@ -70,7 +70,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"/>
@@ -83,14 +83,14 @@
<env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar"/>
</exec>
</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/jms/JMSXDeliveryCount/MDB1/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/build.properties
index 1e20ef5..77345fc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/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="JMSXDeliveryCount-mdb1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/build.xml
index 8f7e0b1..310b48f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/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="**/MySessionBean*.class, **/*MessageBean.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.jmsxdeliverycount.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
index 1574956..d25fe55 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
index ac090fe..603cf05 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -45,10 +45,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
@@ -73,7 +73,7 @@
Logger.getLogger(NewMessageBean.class.getName()).log(Level.SEVERE, null, ex);
}
}
-
+
private void sendMsg(boolean success, String msg) {
JMSProducer producer = jmsContext.createProducer();
TextMessage tmsg = jmsContext.createTextMessage(success + ":" + msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.properties
index 02a65e7..6d6f87d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/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="JMSXDeliveryCount-mdb2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.xml
index 7668c6e..6bdb6da 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -46,14 +46,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.jmsxdeliverycount.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
index 1574956..d25fe55 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
index 2c124bd..75c63ce 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -45,10 +45,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
@@ -73,7 +73,7 @@
Logger.getLogger(NewMessageBean.class.getName()).log(Level.SEVERE, null, ex);
}
}
-
+
private void sendMsg(boolean success, String msg) {
JMSProducer producer = jmsContext.createProducer();
TextMessage tmsg = jmsContext.createTextMessage(success + ":" + msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/build.properties
index 0c57b12..4e8a81a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/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="JMSXDeliveryCount-mdb3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/build.xml
index 4b17951..08ef248 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/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="**/MySessionBean*.class, **/*MessageBean.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.jmsxdeliverycount.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
index 1574956..d25fe55 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
index 487fbee..8b89a22 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -45,10 +45,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public void onMessage(Message message) {
@@ -73,7 +73,7 @@
Logger.getLogger(NewMessageBean.class.getName()).log(Level.SEVERE, null, ex);
}
}
-
+
private void sendMsg(boolean success, String msg) {
JMSProducer producer = jmsContext.createProducer();
TextMessage tmsg = jmsContext.createTextMessage(success + ":" + msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/build.properties
index 412a164..5c78852 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/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="JMSXDeliveryCount-mdb4"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/build.xml
index d9d11f7..72bc052 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/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="**/MySessionBean*.class, **/*MessageBean.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.jmsxdeliverycount.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
index 1574956..d25fe55 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
index a40c4b6..628cb91 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -45,10 +45,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public void onMessage(Message message) {
@@ -74,7 +74,7 @@
Logger.getLogger(NewMessageBean.class.getName()).log(Level.SEVERE, null, ex);
}
}
-
+
private void sendMsg(boolean success, String msg) {
JMSProducer producer = jmsContext.createProducer();
TextMessage tmsg = jmsContext.createTextMessage(success + ":" + msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/build.xml
index cf74343..31e708a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/build.xml
@@ -88,9 +88,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the jms tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the jms tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/build.properties
index 9f612d4..265f460 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/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="JMSXDeliveryCount-stateless-ejb1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/build.xml
index 770e0d2..101789b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/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="**/MySessionBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.jmsxdeliverycount.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
index f1b9e4b..8bbb534 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
@@ -25,9 +25,9 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public boolean checkMessage1(String text);
public boolean checkMessage2(String text);
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/build.properties b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/build.properties
index 829f621..bae0913 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/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="JMSXDeliveryCount-stateless-ejb2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/build.xml b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/build.xml
index e488396..864e1cb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/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="**/MySessionBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.jmsxdeliverycount.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
index f1b9e4b..8bbb534 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
@@ -25,9 +25,9 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public boolean checkMessage1(String text);
public boolean checkMessage2(String text);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.properties
index 8680158..3b352ee 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/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="subscriptionScope-cluster-clusterScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.xml
index 31b8aa8..64b783a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
index 5c72efb..6263784 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 85d7828..3d1e139 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.properties
index c28ebcd..259c617 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/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="subscriptionScope-cluster-clusterScopeDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.xml
index 26c8d72..266d2b3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 9731b9e..e20207d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 23a8936..ab55764 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.properties
index 77de8a5..38efbac 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/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="subscriptionScope-cluster-clusterScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.xml
index aac6950..cc57470 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 60adbc0..3a40230 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 9c43142..083fd6c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.properties
index c5cf54c..977e1d5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/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="subscriptionScope-cluster-clusterScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.xml
index 44c033a..59852e6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 55769e3..1df5455 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 961d0c9..10a5ec2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.properties
index b5538e1..e11c663 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/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="subscriptionScope-cluster-instanceScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.xml
index f00e32d..e24a868 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 6bc920b..6fafa3b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index fc59035..2f9faff 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.properties
index ddce914..3fcdb95 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/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="subscriptionScope-cluster-instanceScopeDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.xml
index bf0d287..ac20413 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 027b409..0665718 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index 95619f4..7a6c6de 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.properties
index bfa982e..871bd0b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/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="subscriptionScope-cluster-instanceScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.xml
index a7f7057..383d6b9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 4ce1e28..31dc02a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 0194c66..6ef3e6a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.properties
index 517ad9e..b8c889e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/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="subscriptionScope-cluster-instanceScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.xml
index 62f5efc..d9ca967 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 9e203c3..9fc8918 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 8abec85..830b1d5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.properties
index 9e21ac1..c6364a2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/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="subscriptionScope-cluster-noScopeDurableNoClientIdWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.xml
index c918083..d520d9b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 93a5d37..38f0de9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.properties
index d89a883..1950e81 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/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="subscriptionScope-cluster-noScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.xml
index c01fd81..68bdcba 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
index 1a814ad..7fe2bc9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.properties
index 219a0bc..97907cb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/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="subscriptionScope-cluster-noScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.xml
index f952231..019e428 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
index 2ba5001..195dff0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.properties
index 0272521..97bfe3e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/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="subscriptionScope-cluster-noScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.xml
index 23da3fe..461dd1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
index 17aa803..b25a571 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.properties
index 219a0bc..97907cb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/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="subscriptionScope-cluster-noScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.xml
index f952231..019e428 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
index ab4e1a7..9167b86 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,16 +42,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.properties
index 0272521..97bfe3e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/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="subscriptionScope-cluster-noScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.xml
index 23da3fe..461dd1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common-cluster"/>
<echo message="Wait 10 secs for cluster propagation"/>
@@ -74,7 +74,7 @@
<echo message="Wait 10 secs for cluster propagation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common, setOSProps">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -90,21 +90,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${deploy.clusterinstance1.orbport}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common-cluster"/>
- </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/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 03577c4..4022651 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -41,16 +41,16 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
JMSProducer producer = jmsContext.createProducer();
producer.send(resultQueue, msg);
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.properties
index 409f0b3..caaad9b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/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="subscriptionScope-standalone-embedded-clusterScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.xml
index dbd673c..9917d78 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
index 0dbf181..50a2794 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 9ade74b..b6c6827 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.properties
index f7937e9..316061c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/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="subscriptionScope-standalone-embedded-clusterScopeDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.xml
index ef013af..3288563 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 41cfd0b..21e95e0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 9e6d769..eac6ddf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -29,7 +29,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -38,16 +38,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.properties
index 8f4d34f..4f30c46 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/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="subscriptionScope-standalone-embedded-clusterScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.xml
index 7a1cc5d..fc37fc7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index a1bea0d..0821c23 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 4e1651f..0974a9c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.properties
index 7431263..bf41d55 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/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="subscriptionScope-standalone-embedded-clusterScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.xml
index 0290845..7b5c794 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 18f5ac8..85c52e0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 6bd8934..328e369 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.properties
index fe954d8..399b574 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/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="subscriptionScope-standalone-embedded-instanceScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.xml
index 5c4cb18..126e7e5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
index d1c8227..c627afa 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index c40f17f..bb4fb7f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.properties
index 4d233a1..4afbc86 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/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="subscriptionScope-standalone-embedded-instanceScopeDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.xml
index 13e1de4..65248c2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index ff6a170..715446d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index 899876d..d85cf43 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.properties
index 6192944..07f176e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/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="subscriptionScope-standalone-embedded-instanceScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.xml
index fc5a3bb..9cf161d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 7b5db95..26ee382 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index e051f48..389be87 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.properties
index e4ba7c5..644a8cc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/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="subscriptionScope-standalone-embedded-instanceScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.xml
index d1c8b44..34929ec 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index a68d803..0796b3c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 52e273b..747fe01 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.properties
index 936f9a8..2bf3e7b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/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="subscriptionScope-standalone-embedded-instanceScopeDurableNoClientIdWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.xml
index 7f5336a..3d78917 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index f9ece8b..7ffaed3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.properties
index fe954d8..399b574 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/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="subscriptionScope-standalone-embedded-instanceScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.xml
index 5c4cb18..126e7e5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
index a36c7a1..977cb67 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.properties
index 6192944..07f176e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/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="subscriptionScope-standalone-embedded-instanceScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.xml
index fc5a3bb..9cf161d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
index 5c912d2..5186165 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.properties
index e4ba7c5..644a8cc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/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="subscriptionScope-standalone-embedded-instanceScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.xml
index d1c8b44..34929ec 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 8916cb2..0608d84 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.properties
index e4af6d0..b3237c7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/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="subscriptionScope-standalone-local-clusterScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.xml
index 016622f..5473d08 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
index 0dbf181..50a2794 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 9ade74b..b6c6827 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.properties
index 1771c32..e0b43e3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/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="subscriptionScope-standalone-local-clusterScopeDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.xml
index aa85f57..9d30d07 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 41cfd0b..21e95e0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 02134b7..132e245 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.properties
index f938ae6..c1021f7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/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="subscriptionScope-standalone-local-clusterScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.xml
index 9d92e0b..99517ae 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index a1bea0d..0821c23 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 4e1651f..0974a9c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.properties
index 3cce8e8..78bf467 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/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="subscriptionScope-standalone-local-clusterScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.xml
index 1b1d4ce..bd122e1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index bf77e60..01fdfd2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -29,7 +29,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -38,16 +38,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 6bd8934..328e369 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.properties
index e355522..85d2f22 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/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="subscriptionScope-standalone-local-instanceScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.xml
index 28cd241..59ded14 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
index d1c8227..c627afa 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index c40f17f..bb4fb7f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.properties
index 813fa4f..ccfde1f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/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="subscriptionScope-standalone-local-instanceScopeDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.xml
index e727930..d8b39cf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index ff6a170..715446d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index 899876d..d85cf43 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.properties
index d468643..350d136 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/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="subscriptionScope-standalone-local-instanceScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.xml
index 8c93698..3e3d990 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 7b5db95..26ee382 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 3530a86..00a7b21 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.properties
index d92c632..05e2078 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/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="subscriptionScope-standalone-local-instanceScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.xml
index 909114c..4fdad6f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index a68d803..0796b3c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 52e273b..747fe01 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean2.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.properties
index 2bf43de..5d0a093 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/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="subscriptionScope-standalone-local-noScopeDurableNoClientIdWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.xml
index 3249021..c747deb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index f9ece8b..7ffaed3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.properties
index 799a94f..d0714b3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/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="subscriptionScope-standalone-local-noScopeDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.xml
index a02a35c..0968fa6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
index a36c7a1..977cb67 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.properties
index 2d17c26..5763e15 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/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="subscriptionScope-standalone-local-noScopeNonDurableWithName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.xml
index 296c573..b171d7e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
index 5c912d2..5186165 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -31,7 +31,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -40,16 +40,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.properties b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.properties
index 89a22b8..f05616e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/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="subscriptionScope-standalone-local-noScopeNonDurableWithoutName"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.xml b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.xml
index f47d69e..cae915d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,13 +48,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
<echo message="Wait 10 secs for endpoint activation"/>
@@ -68,7 +68,7 @@
<echo message="Wait 10 secs for resource creation"/>
<sleep seconds="10"/>
</target>
-
+
<target name="delete-resources" depends="init-common">
<antcall target="asadmin-batch-common">
<param name="asadmin.file" value="delete_resources.asadmin"/>
@@ -76,21 +76,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.activationproperties.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index cfad38a..47b25a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public String checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 8916cb2..0608d84 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -30,7 +30,7 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
@Resource
private MessageDrivenContext mdc;
@@ -39,16 +39,16 @@
@Resource(mappedName = "jms/jms_unit_test_QCF")
private QueueConnectionFactory qconFactory;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
sendMsg(message);
}
-
+
private void sendMsg(Message msg) {
QueueConnection qcon = null;
QueueSession qsession = null;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/build.properties b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/build.properties
index e8691d1..ecffff9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/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="annotationt-mdb1"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/build.properties b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/build.properties
index b2fc870..4dc1ee2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/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="annotationt-mdb2"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/build.properties b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/build.properties
index 3df8b97..01042a1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/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="annotationt-mdb3"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/build.properties b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/build.properties
index f9793f2..4885529 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/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="annotation-stateless-ejb"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/build.xml b/appserver/tests/appserv-tests/devtests/jms/build.xml
index 9fcaa8f..b08a6ed 100644
--- a/appserver/tests/appserv-tests/devtests/jms/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/build.xml
@@ -103,9 +103,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the jms tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the jms tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jms/config/common.xml b/appserver/tests/appserv-tests/devtests/jms/config/common.xml
index eae6bf8..b176a3b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/config/common.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/config/common.xml
@@ -120,7 +120,7 @@
</target>
<target name="deleteCluster">
- <!-- stop-cluster does not work so use stop-instance to make sure
+ <!-- stop-cluster does not work so use stop-instance to make sure
instance is stopped before deleting it -->
<echo message="Running... asadmin stop-instance"/>
<exec executable="${ASADMIN}">
@@ -163,8 +163,8 @@
<!--
On Windows, ant hangs when it runs an asadmin command that starts a process.
To work around that, this task distinguishes between Windows and non-Windows
- systems and uses a custom ant task for Windows.
-
+ systems and uses a custom ant task for Windows.
+
Any test that needs to start a process should NOT use ${ASADMIN} directly
but should call this start-process target instead. Pass the command line
to be run as <param name="line" value="..."/>.
@@ -182,7 +182,7 @@
<isset property="start-target"/>
</not>
</condition>
-
+
<!--
Invoke the target just chosen.
-->
@@ -209,7 +209,7 @@
</target>
<!--
- For non-Windows systems, ant works fine when invoking asadmin to start a
+ For non-Windows systems, ant works fine when invoking asadmin to start a
process, so do it that way for those systems.
-->
<target name="start-process-non-windows" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.properties b/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.properties
index 2ba3638..bbf8e1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/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="jms-default-connection-factory-ejb"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.xml b/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.xml
index 17615c8..cdb1c0b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
@@ -52,14 +52,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/SessionBeanDefault*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanDefault*.class" />
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -69,7 +69,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,21 +77,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.defaultcf.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant all to test jms default connection factory
</echo>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
index ecd76da..97fbff5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
@@ -32,10 +32,10 @@
@Resource(name="myCF0", lookup="jms/__defaultConnectionFactory")
private ConnectionFactory cf0;
-
+
@Resource(name="myCF1", lookup="java:comp/DefaultJMSConnectionFactory")
private ConnectionFactory cf1;
-
+
@Resource(name="myCF2")
private ConnectionFactory cf2;
@@ -67,7 +67,7 @@
}
if (conn != null) {
try {
-
+
conn.close();
} catch (Exception e) {
throw new EJBException(e);
diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
index e0af5bd..b768472 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = SessionBeanDefault.class.getSimpleName() + "/remote";
public void sendMessage(String text);
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/build.xml
index 4146399..4e6cf59 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/build.xml
@@ -116,9 +116,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the jms tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the jms tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/build.properties
index d683138..2ffb177 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/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="jms-injection-jsf"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/build.xml
index dfef800..739ecbc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/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="**/InterceptorInjection*.class,**/MyInterceptor.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/InterceptorInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
index ba41a2c..042d692 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
@@ -29,7 +29,7 @@
@Stateless(mappedName="InterceptorInjection/remote")
public class InterceptorInjection implements InterceptorInjectionRemote {
private static String requestScope = "around RequestScoped";
-
+
@Resource(mappedName = "jms/jms_unit_test_Queue")
private Queue queue;
@@ -40,7 +40,7 @@
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
@Override
- @Interceptors(MyInterceptor.class)
+ @Interceptors(MyInterceptor.class)
public void sendMessage(String text) {
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
index f91ce7e..2ebd0d8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = InterceptorInjection.class.getSimpleName() + "/remote";
public void sendMessage(String text);
-
+
public boolean checkMessageAndScoped(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/build.properties
index d683138..2ffb177 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/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="jms-injection-jsf"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/build.xml
index 5d15b72..75fe00c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/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="**/InterceptorInjection*.class,**/MyInterceptor.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/InterceptorInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
index 12cd20a..e34ac0a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
@@ -40,7 +40,7 @@
private JMSContext jmsContext;
@Override
- @Interceptors(MyInterceptor.class)
+ @Interceptors(MyInterceptor.class)
public void sendMessage(String text) {
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
index f91ce7e..2ebd0d8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = InterceptorInjection.class.getSimpleName() + "/remote";
public void sendMessage(String text);
-
+
public boolean checkMessageAndScoped(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
index 81c07cd..698fbca 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
@@ -37,7 +37,7 @@
public Object sendMsg(InvocationContext ctx) throws Exception {
Object[] params = ctx.getParameters();
-
+
try {
lookupQueue();
JMSProducer producer = jmsContext.createProducer();
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.properties
index d683138..2ffb177 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/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="jms-injection-jsf"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.xml
index 137f646..3c20019 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-ejb"/>
<antcall target="compile-common">
@@ -64,7 +64,7 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
@@ -72,42 +72,42 @@
<delete file="${appclient.jar}"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-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 ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-client, build-ear"/>
@@ -117,7 +117,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"/>
@@ -129,7 +129,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WebTest">
@@ -139,10 +139,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/jsfRequestScoped/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/client/WebTest.java
index 91d05a7..d8cda69 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -57,14 +57,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/faces/newjsf.xhtml");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
index 2230213..6551ab4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index 9efb518..9c9a0f0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -48,14 +48,14 @@
*/
public NewJSFManagedBean() {
}
-
+
public String getMessage() {
try {
String text = "JSF Hello World!";
JMSProducer producer = jmsContext.createProducer();
TextMessage msg = jmsContext.createTextMessage(text);
producer.send(queue, msg);
-
+
if(jmsContext.toString().indexOf(requestScope) == -1){
throw new RuntimeException("NOT in requestScope scope!");
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.properties
index d683138..2ffb177 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/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="jms-injection-jsf"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.xml
index 137f646..3c20019 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-ejb"/>
<antcall target="compile-common">
@@ -64,7 +64,7 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
@@ -72,42 +72,42 @@
<delete file="${appclient.jar}"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-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 ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-client, build-ear"/>
@@ -117,7 +117,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"/>
@@ -129,7 +129,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WebTest">
@@ -139,10 +139,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/jsfTransactionScoped/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/client/WebTest.java
index 8d82e5d..ec8d3bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -57,14 +57,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/faces/newjsf.xhtml");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
index 2230213..6551ab4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index 9ac6569..8e007e1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -44,7 +44,7 @@
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
- @Inject
+ @Inject
UserTransaction ut;
private static String transactionScope = "around TransactionScoped";
@@ -54,7 +54,7 @@
*/
public NewJSFManagedBean() {
}
-
+
public String getMessage() {
String context = "";
try {
@@ -70,11 +70,11 @@
}
return text;
} catch (Exception e) {
- try {
+ try {
ut.rollback();
} catch (Exception ex) {
e.printStackTrace();
- }
+ }
throw new RuntimeException(e);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.properties
index f609dab..626997b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/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="jms-injection-jsp"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.xml
index ae6001e..e1be76e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-ejb"/>
<antcall target="compile-common">
@@ -64,7 +64,7 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
@@ -72,42 +72,42 @@
<delete file="${appclient.jar}"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-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 ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-client, build-ear"/>
@@ -117,7 +117,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"/>
@@ -129,7 +129,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WebTest">
@@ -139,10 +139,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/jspRequestScoped/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/client/WebTest.java
index a636246..5daf9b0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -57,14 +57,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/newJSP.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
index 2230213..6551ab4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java
index 1046b8a..99b7feb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java
@@ -59,10 +59,10 @@
}
//Get the writer object for output.
JspWriter out = pageContext.getOut();
-
+
//Perform substr operation on string.
out.println(text);
-
+
} catch (Exception e) {
throw new JspException(e);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.properties
index f609dab..626997b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/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="jms-injection-jsp"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.xml
index ae6001e..e1be76e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-ejb"/>
<antcall target="compile-common">
@@ -64,7 +64,7 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
@@ -72,42 +72,42 @@
<delete file="${appclient.jar}"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-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 ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-client, build-ear"/>
@@ -117,7 +117,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"/>
@@ -129,7 +129,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WebTest">
@@ -139,10 +139,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/jspTransactionScoped/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/client/WebTest.java
index c8c3257..eecc333 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -57,14 +57,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/newJSP.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
index 2230213..6551ab4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
index 0e615d1..cc7c01a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
@@ -60,16 +60,16 @@
producer.send(queue, msg);
context = jmsContext.toString();
ut.commit();
-
+
if(context.indexOf(transactionScope) == -1){
throw new JspException("NOT in transaction scope!");
}
//Get the writer object for output.
JspWriter out = pageContext.getOut();
-
+
//Perform substr operation on string.
out.println(text);
-
+
} catch (Exception e) {
throw new JspException(e);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.properties
index febee3b..be44f1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/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="jms-injection-servlet"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.xml
index df5b97c..bb03305 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-ejb"/>
<antcall target="compile-common">
@@ -64,7 +64,7 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
@@ -72,42 +72,42 @@
<delete file="${appclient.jar}"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-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 ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-client, build-ear"/>
@@ -117,7 +117,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"/>
@@ -129,7 +129,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WebTest">
@@ -139,10 +139,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/servletRequestScoped/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/client/WebTest.java
index c848198..ed5b426 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -57,14 +57,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
@@ -85,7 +85,7 @@
throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
-
+
} finally {
try {
if (is != null) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
index 37722f5..c2bea63 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String[] texts);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java
index 960dc08..d381997 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java
@@ -32,7 +32,7 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public void init(FilterConfig filterConfig) throws ServletException {
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.properties
index febee3b..be44f1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/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="jms-injection-servlet"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.xml
index df5b97c..bb03305 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-ejb"/>
<antcall target="compile-common">
@@ -64,7 +64,7 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
@@ -72,42 +72,42 @@
<delete file="${appclient.jar}"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-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 ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-client, build-ear"/>
@@ -117,7 +117,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"/>
@@ -129,7 +129,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WebTest">
@@ -139,10 +139,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/servletTransactionScoped/client/WebTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/client/WebTest.java
index a376d50..48f9a63 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/client/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/client/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -57,14 +57,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
@@ -85,7 +85,7 @@
throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
-
+
} finally {
try {
if (is != null) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
index 37722f5..c2bea63 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String[] texts);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java
index 960dc08..d381997 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java
@@ -32,7 +32,7 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public void init(FilterConfig filterConfig) throws ServletException {
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
index 67aabfc..b093368 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
@@ -63,7 +63,7 @@
System.out.println("TThe context variables used in the call are NOT in requestScope scope.");
return false;
}
-
+
try {
JMSConsumer consumer = jmsContext.createConsumer(queue);
Message msg = consumer.receive(30000L);
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
index d7ef45b..435dbb8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = SessionBeanInjection.class.getSimpleName() + "/remote";
public void sendMessage(String text);
-
+
public boolean checkMessageAndScoped(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
index d7ef45b..435dbb8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = SessionBeanInjection.class.getSimpleName() + "/remote";
public void sendMessage(String text);
-
+
public boolean checkMessageAndScoped(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.properties
index ff3464d..d3cef76 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/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="jms-injection-ws"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.xml
index 0f54428..40f76fc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -63,29 +63,29 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-ear"/>
@@ -102,9 +102,9 @@
</target>
<target name="run.wscompile" depends="set-wscompile">
- <exec executable="${wscompile}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${wscompile}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="build-client" depends="clean">
@@ -113,25 +113,25 @@
<antcall target="generateWSConfig"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-application-client.xml"
failonerror="false"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
failonerror="false"/>
<antcall target="run.wscompile">
- <param name="wscompile.command" value="-gen -cp ${build.classes.dir} -keep -d ${build.classes.dir} config.xml"/>
+ <param name="wscompile.command" value="-gen -cp ${build.classes.dir} -keep -d ${build.classes.dir} config.xml"/>
</antcall>
<antcall target="compile-client"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="create-resources" depends="init-common">
@@ -139,7 +139,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"/>
@@ -151,7 +151,7 @@
</target>
<target name="generateWSConfig" depends="compile-ejb">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="org.glassfish.test.jms.injection.ejb.GenerateWSConfig">
@@ -163,7 +163,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WsTest">
@@ -173,10 +173,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/wsRequestScoped/client/WsTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/client/WsTest.java
index e17fd66..42471bc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/client/WsTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/client/WsTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into webservice "
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/GenerateWSConfig.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/GenerateWSConfig.java
index dc32d2e..8d8f2d9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/GenerateWSConfig.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/GenerateWSConfig.java
@@ -23,7 +23,7 @@
String filename = args[0];
String host = args[1];
String port = args[2];
-
+
StringBuffer config = new StringBuffer();
config.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>").append("\r\n");
config.append("<configuration xmlns=\"http://java.sun.com/xml/ns/jax-rpc/ri/config\">");
@@ -31,11 +31,11 @@
config.append("<wsdl location=\"http://").append(host).append(":").append(port);
config.append("/jms-injection-ws-web/NewWebService?wsdl\" packageName=\"test\"/>");
config.append("\r\n").append("</configuration>");
-
+
File file = new File(filename);
if (file.exists())
file.delete();
-
+
byte[] output = config.toString().getBytes();
FileOutputStream fos = new FileOutputStream(filename);
fos.write(output, 0, output.length);
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
index 2230213..6551ab4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.properties
index ff3464d..d3cef76 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/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="jms-injection-ws"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.xml
index 0f54428..40f76fc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/build.xml
@@ -35,7 +35,7 @@
</target>
<target name="clean-classes-dir">
- <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.classes.dir}"/>
</target>
<target name="compile-ejb" depends="init-common">
@@ -51,7 +51,7 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="compile-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -63,29 +63,29 @@
</target>
<target name="build-web" depends="compile-web">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common"/>
</target>
<target name="build-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="${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>
<target name="build" depends="build-ejb, build-web, build-ear"/>
@@ -102,9 +102,9 @@
</target>
<target name="run.wscompile" depends="set-wscompile">
- <exec executable="${wscompile}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${wscompile}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="build-client" depends="clean">
@@ -113,25 +113,25 @@
<antcall target="generateWSConfig"/>
<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="${glassfish-application-client.xml}" tofile="${build.classes.dir}/META-INF/glassfish-application-client.xml"
failonerror="false"/>
<copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
failonerror="false"/>
<antcall target="run.wscompile">
- <param name="wscompile.command" value="-gen -cp ${build.classes.dir} -keep -d ${build.classes.dir} config.xml"/>
+ <param name="wscompile.command" value="-gen -cp ${build.classes.dir} -keep -d ${build.classes.dir} config.xml"/>
</antcall>
<antcall target="compile-client"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes ="**/*.class"
- manifest="./client/MANIFEST.MF">
+ <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
+ update="true" includes ="**/*.class"
+ manifest="./client/MANIFEST.MF">
<metainf dir="${build.classes.dir}/META-INF">
<include name="application-client.xml"/>
<include name="glassfish-application-client.xml"/>
<include name="sun-application-client.xml"/>
</metainf>
- </jar>
+ </jar>
</target>
<target name="create-resources" depends="init-common">
@@ -139,7 +139,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"/>
@@ -151,7 +151,7 @@
</target>
<target name="generateWSConfig" depends="compile-ejb">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="org.glassfish.test.jms.injection.ejb.GenerateWSConfig">
@@ -163,7 +163,7 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar:${env.APS_HOME}/lib/reportbuilder.jar"
classname="WsTest">
@@ -173,10 +173,10 @@
<arg value="${contextroot}"/>
</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/jms/injection/jmsContext/basic/wsTransactionScoped/client/WsTest.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/client/WsTest.java
index 46b10a4..697c450 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/client/WsTest.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/client/WsTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into webservice "
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/GenerateWSConfig.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/GenerateWSConfig.java
index dc32d2e..8d8f2d9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/GenerateWSConfig.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/GenerateWSConfig.java
@@ -23,7 +23,7 @@
String filename = args[0];
String host = args[1];
String port = args[2];
-
+
StringBuffer config = new StringBuffer();
config.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>").append("\r\n");
config.append("<configuration xmlns=\"http://java.sun.com/xml/ns/jax-rpc/ri/config\">");
@@ -31,11 +31,11 @@
config.append("<wsdl location=\"http://").append(host).append(":").append(port);
config.append("/jms-injection-ws-web/NewWebService?wsdl\" packageName=\"test\"/>");
config.append("\r\n").append("</configuration>");
-
+
File file = new File(filename);
if (file.exists())
file.delete();
-
+
byte[] output = config.toString().getBytes();
FileOutputStream fos = new FileOutputStream(filename);
fos.write(output, 0, output.length);
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
index 2230213..6551ab4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
@@ -25,6 +25,6 @@
@Remote
public interface MessageReceiverRemote {
public static final String RemoteJNDIName = MessageReceiverBean.class.getSimpleName() + "/remote";
-
+
public boolean checkMessage(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/build.xml
index c243a07..aa87b6f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/build.xml
@@ -38,7 +38,7 @@
<ant dir="basic" target="all"/>
<record name="basic.output" action="stop" />
</target>
-
+
<target name="mixedScoped">
<record name="mixedScoped.output" action="start" />
<ant dir="mixedScoped" target="all"/>
@@ -46,11 +46,11 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the jmsContext injection tests)
- ant basic (Executes all the basic jmsContext injection tests)
- ant mixedScoped (Executes all the mixed jmsContext injection tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the jmsContext injection tests)
+ ant basic (Executes all the basic jmsContext injection tests)
+ ant mixedScoped (Executes all the mixed jmsContext injection tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/build.xml
index 52aef93..5fb750c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/build.xml
@@ -29,7 +29,7 @@
&reporting;
<target name="all">
- <antcall target="jmsContextDefaultInjection"/>
+ <antcall target="jmsContextDefaultInjection"/>
<antcall target="jmsContextInjectionA"/>
<antcall target="jmsContextInjectionB"/>
<antcall target="jmsContextInjectionC"/>
@@ -59,49 +59,49 @@
<ant dir="jmsContextInjectionB" target="all"/>
<record name="jmsContextInjectionB.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionC">
<record name="jmsContextInjectionC.output" action="start" />
<ant dir="jmsContextInjectionC" target="all"/>
<record name="jmsContextInjectionC.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionD">
<record name="jmsContextInjectionD.output" action="start" />
<ant dir="jmsContextInjectionD" target="all"/>
<record name="jmsContextInjectionD.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionE">
<record name="jmsContextInjectionE.output" action="start" />
<ant dir="jmsContextInjectionE" target="all"/>
<record name="jmsContextInjectionE.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionF">
<record name="jmsContextInjectionF.output" action="start" />
<ant dir="jmsContextInjectionF" target="all"/>
<record name="jmsContextInjectionF.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionG">
<record name="jmsContextInjectionG.output" action="start" />
<ant dir="jmsContextInjectionG" target="all"/>
<record name="jmsContextInjectionG.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionH">
<record name="jmsContextInjectionH.output" action="start" />
<ant dir="jmsContextInjectionH" target="all"/>
<record name="jmsContextInjectionH.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionJ">
<record name="jmsContextInjectionJ.output" action="start" />
<ant dir="jmsContextInjectionJ" target="all"/>
<record name="jmsContextInjectionJ.output" action="stop" />
</target>
-
+
<target name="jmsContextInjectionK">
<record name="jmsContextInjectionK.output" action="start" />
<ant dir="jmsContextInjectionK" target="all"/>
@@ -109,9 +109,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the jms tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the jms tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/build.xml
index b0b36d6..6b5db15 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/client/Client.java
index 604bb95..c1ad737 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/client/Client.java
@@ -47,11 +47,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
index 2b430a3..fa2bbae 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
@@ -34,12 +34,12 @@
private static String scope = "around";
private static String preIdentical = "fingerPrint";
- @EJB
+ @EJB
SessionBeanInjectionRemote2 bean2;
@Resource(mappedName = "jms/jms_unit_test_Queue")
private Queue queue;
-
+
@Inject
private JMSContext jmsContext;
@@ -63,20 +63,20 @@
return checkResult(context1, context2);
}
-
+
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public Boolean checkResult(String context1, String context2){
if (context1.indexOf(preIdentical) == -1 || context1.indexOf(scope) == -1)
return false;
-
-
+
+
if (context2.indexOf(preIdentical) == -1 || context2.indexOf(scope) == -1)
return false;
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(scope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(scope));
-
+
if(context1Annotation.equals(context2Annotation)) {
System.out.println("Injected using identical annotations.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
index 1cb4a4c..9cfcae3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
@@ -27,5 +27,5 @@
public static final String RemoteJNDIName = SessionBeanInjection1.class.getSimpleName() + "/remote1";
public Boolean sendMessage(String text);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/client/Client.java
index fed581a..2cbc9dc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/client/Client.java
@@ -46,7 +46,7 @@
String context2 = beanRemote.sendMessage2(text);
System.out.println("context1:"+context1);
System.out.println("context1:"+context2);
-
+
if (context1.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the first call are in transaction scope.");
}else{
@@ -54,7 +54,7 @@
STAT.addStatus(ejbName, STAT.FAIL);
return ;
}
-
+
if (context2.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the second call are in transaction scope.");
}else{
@@ -62,10 +62,10 @@
STAT.addStatus(ejbName, STAT.FAIL);
return ;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
}else{
@@ -73,7 +73,7 @@
STAT.addStatus(ejbName, STAT.FAIL);
return ;
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context2.substring(context2.indexOf(transactionScope)))) {
System.out.println("The context variables used in the first and second calls to context.send() take place in the same transaction.");
STAT.addStatus(ejbName, STAT.FAIL);
@@ -82,12 +82,12 @@
System.out.println("The context variables used in the first and second calls to context.send() take place in the different transaction.");
}
STAT.addStatus(ejbName, STAT.PASS);
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
index 285de4c..b9cd70c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = SessionBeanInjection.class.getSimpleName() + "/remote";
public String sendMessage1(String text);
-
+
public String sendMessage2(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/client/Client.java
index 3a57bdb..b774305 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/client/Client.java
@@ -49,11 +49,11 @@
{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
index 1cd1125..5e7dfdd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
@@ -33,7 +33,7 @@
private static String transactionScope = "around TransactionScoped";
private static String preIdentical = "fingerPrint";
- @EJB
+ @EJB
SessionBeanInjectionRemote2 bean2;
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@@ -50,31 +50,31 @@
System.out.println("The context variables used in the first call are NOT in transaction scope.");
return false;
}
-
+
if (context2.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the second call are in transaction scope.");
}else{
System.out.println("The context variables used in the second call are NOT in transaction scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)) {
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
}else{
System.out.println("The context variables in the first and second calls to context.send() injected are not using identical annotations.");
return false;
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context2.substring(context2.indexOf(transactionScope)))){
System.out.println("The context variables used in the first and second calls to context.send() take place in the same transaction.");
}else{
System.out.println("The context variables used in the first and second calls to context.send() take place in the different transaction.");
return false;
}
-
+
return true;
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
index 02dc134..09a9f8d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
@@ -27,6 +27,6 @@
public static final String RemoteJNDIName = SessionBeanInjection2.class.getSimpleName() + "/remote2";
public String sendMessage1(String text);
-
+
public String sendMessage2(String text);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/client/Client.java
index 1be4b3c..bab321a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/client/Client.java
@@ -47,11 +47,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
index 810e98d..7360ea7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
@@ -34,7 +34,7 @@
private static String transactionScope = "around TransactionScoped";
private static String preIdentical = "fingerPrint";
- @EJB
+ @EJB
SessionBeanInjectionRemote2 bean2;
@Resource(mappedName = "jms/jms_unit_test_Queue")
@@ -66,24 +66,24 @@
System.out.println("The context variables used in the first call are NOT in transaction scope.");
return false;
}
-
+
if (context2.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the second call are in transaction scope.");
}else{
System.out.println("The context variables used in the second call are NOT in transaction scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)) {
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
}else{
System.out.println("The context variables in the first and second calls to context.send() injected are not using identical annotations.");
return false;
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context2.substring(context2.indexOf(transactionScope)))) {
System.out.println("The context variables used in the first and second calls to context.send() take place in the same transaction.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/client/Client.java
index 079b89b..41c6e38 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/client/Client.java
@@ -48,11 +48,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
index ecff767..457f719 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
@@ -35,7 +35,7 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
private static String transactionScope = "around TransactionScoped";
private static String preIdentical = "fingerPrint";
@@ -66,24 +66,24 @@
System.out.println("The context variables used in the first call are NOT in transaction scope.");
return false;
}
-
+
if (context2.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the second call are in transaction scope.");
}else{
System.out.println("The context variables used in the second call are NOT in transaction scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)) {
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
}else{
System.out.println("The context variables in the first and second calls to context.send() injected are not using identical annotations.");
return false;
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context2.substring(context2.indexOf(transactionScope)))){
System.out.println("The context variables used in the first and second calls to context.send() take place in the same transaction.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
index accf635..97019f1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
@@ -27,5 +27,5 @@
public static final String RemoteJNDIName = SessionBeanInjection.class.getSimpleName() + "/remote";
public Boolean sendMessage(String text);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/client/Client.java
index 33d3e5c..8b00ca0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/client/Client.java
@@ -48,11 +48,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
index 6cd478f..9cc2f7a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
@@ -66,24 +66,24 @@
System.out.println("The context variables used in the first call are NOT in request scope.");
return false;
}
-
+
if (context2.indexOf(requestScope) != -1){
System.out.println("The context variables used in the second call are in request scope.");
}else{
System.out.println("The context variables used in the second call are NOT in request scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(requestScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(requestScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
}else{
System.out.println("The context variables in the first and second calls to context.send() injected are not using identical annotations.");
return false;
}
-
+
if (context1.substring(context1.indexOf(requestScope)).equals(context2.substring(context2.indexOf(requestScope)))){
System.out.println("The context variables used in the first and second calls to context.send() take place in the same request.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
index 0805e9d..fc173a0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
@@ -27,5 +27,5 @@
public static final String RemoteJNDIName = SessionBeanInjection.class.getSimpleName() + "/remote";
public Boolean sendMessage(String text);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/client/Client.java
index d672436..b478967 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/client/Client.java
@@ -47,11 +47,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
index 9e77640..af517b3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
@@ -32,7 +32,7 @@
private static String preIdentical = "fingerPrint";
private static String requestScope = "around RequestScoped";
- @EJB
+ @EJB
SessionBeanInjectionRemote2 bean2;
@Resource(mappedName = "jms/jms_unit_test_Queue")
@@ -63,17 +63,17 @@
System.out.println("The context variables used in the first call are NOT in request scope.");
return false;
}
-
+
if (context2.indexOf(requestScope) != -1){
System.out.println("The context variables used in the second call are in request scope.");
}else{
System.out.println("The context variables used in the second call are NOT in request scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(requestScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(requestScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/client/Client.java
index e7ae910..17d12a7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/client/Client.java
@@ -48,11 +48,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
index 5852086..0164e39 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
@@ -38,9 +38,9 @@
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
- @Inject
+ @Inject
UserTransaction ut;
-
+
private static String transactionScope = "around TransactionScoped";
private static String preIdentical = "fingerPrint";
@@ -53,11 +53,11 @@
try {
ut.begin();
TextMessage msg = jmsContext.createTextMessage(text);
-
+
jmsContext.createProducer().send(queue, msg);
context1 = jmsContext.toString();
System.out.println("JMSContext1:"+jmsContext.toString());
-
+
jmsContext.createProducer().send(queue, msg);
context2 = jmsContext.toString();
System.out.println("JMSContext2:"+jmsContext.toString());
@@ -68,7 +68,7 @@
jmsContext.createProducer().send(queue, msg);
context3 = jmsContext.toString();
System.out.println("JMSContext3:"+jmsContext.toString());
-
+
jmsContext.createProducer().send(queue, msg);
context4 = jmsContext.toString();
System.out.println("JMSContext4:"+jmsContext.toString());
@@ -82,40 +82,40 @@
}
public Boolean checkScope(String context1, String context2, String context3, String context4){
-
+
if (context1.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the first call are in transaction scope.");
}else{
System.out.println("The context variables used in the first call are NOT in transaction scope.");
return false;
}
-
+
if (context2.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the second call are in transaction scope.");
}else{
System.out.println("The context variables used in the second call are NOT in transaction scope.");
return false;
}
-
+
if (context3.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the third call are in transaction scope.");
}else{
System.out.println("The context variables used in the third call are NOT in transaction scope.");
return false;
}
-
+
if (context4.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the fourth call are in transaction scope.");
}else{
System.out.println("The context variables used in the fourth call are NOT in transaction scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
String context3Annotation = context3.substring(context3.indexOf(preIdentical),context3.indexOf(transactionScope));
String context4Annotation = context4.substring(context4.indexOf(preIdentical),context3.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
if(context1Annotation.equals(context3Annotation)){
@@ -134,21 +134,21 @@
System.out.println("The context variables in the first and second calls to context.send() injected are not using identical annotations.");
return false;
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context2.substring(context2.indexOf(transactionScope)))){
System.out.println("The context variables used in the first and second calls to context.send() take place in the same transaction.");
}else{
System.out.println("The context variables used in the first and second calls to context.send() take place in the different transaction.");
return false;
}
-
+
if (context3.substring(context3.indexOf(transactionScope)).equals(context4.substring(context4.indexOf(transactionScope)))){
System.out.println("The context variables used in the third and fourth calls to context.send() take place in the same transaction.");
}else{
System.out.println("The context variables used in the third and fourth calls to context.send() take place in the different transaction.");
return false;
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context3.substring(context3.indexOf(transactionScope)))){
System.out.println("The context variables used in the first and third calls to context.send() take place in the same transaction.");
return false;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/build.xml
index 2196ce1..1e61218 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/client/Client.java
index cd78203..908738e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/client/Client.java
@@ -48,11 +48,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
index 584e56c..d4bfbd7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
@@ -38,9 +38,9 @@
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
- @Inject
+ @Inject
UserTransaction ut;
-
+
private static String requestScope = "around RequestScoped";
private static String transactionScope = "around TransactionScoped";
private static String preIdentical = "fingerPrint";
@@ -54,11 +54,11 @@
String context5 = "";
try {
TextMessage msg = jmsContext.createTextMessage(text);
-
+
jmsContext.createProducer().send(queue, msg);
context1 = jmsContext.toString();
System.out.println("JMSContext1:"+context1);
-
+
jmsContext.createProducer().send(queue, msg);
context2 = jmsContext.toString();
System.out.println("JMSContext2:"+context2);
@@ -68,7 +68,7 @@
context3 = jmsContext.toString();
System.out.println("JMSContext3:"+context3);
ut.commit();
-
+
jmsContext.createProducer().send(queue, msg);
context4 = jmsContext.toString();
System.out.println("JMSContext4:"+context4);
@@ -97,41 +97,41 @@
System.out.println("The context variables used in the first call are NOT in request scope.");
return false;
}
-
+
if (context2.indexOf(requestScope) != -1){
System.out.println("The context variables used in the second call are in request scope.");
}else{
System.out.println("The context variables used in the second call are NOT in request scope.");
return false;
}
-
+
if (context3.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the third call are in transaction scope.");
}else{
System.out.println("The context variables used in the third call are NOT in transaction scope.");
return false;
}
-
+
if (context4.indexOf(requestScope) != -1){
System.out.println("The context variables used in the fourth call are in request scope.");
}else{
System.out.println("The context variables used in the fourth call are NOT in request scope.");
return false;
}
-
+
if (context5.indexOf(requestScope) != -1){
System.out.println("The context variables used in the fifth call are in request scope.");
}else{
System.out.println("The context variables used in the fifth call are NOT in request scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(requestScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(requestScope));
String context3Annotation = context3.substring(context3.indexOf(preIdentical),context3.indexOf(transactionScope));
String context4Annotation = context4.substring(context4.indexOf(preIdentical),context4.indexOf(requestScope));
String context5Annotation = context5.substring(context5.indexOf(preIdentical),context5.indexOf(requestScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
if(context1Annotation.equals(context3Annotation)){
@@ -163,7 +163,7 @@
System.out.println("The context variables used in the first and second calls to context.send() take place in the different request.");
return false;
}
-
+
if (context4.substring(context4.indexOf(requestScope)).equals(context5.substring(context5.indexOf(requestScope)))){
System.out.println("The context variables used in the fourth and fifth calls to context.send() take place in the same request.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/build.xml
index 3d4f191..51c1f42 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/client/Client.java
index 7aa97af..7838a8a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/client/Client.java
@@ -47,11 +47,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
index cabc888..7f52cf4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
@@ -41,7 +41,7 @@
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
- @EJB
+ @EJB
SessionBeanInjectionRemote2 bean2;
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@@ -74,25 +74,25 @@
System.out.println("The context variables used in the first call are NOT in transaction scope.");
return false;
}
-
+
if (context2.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the second call are in transaction scope.");
}else{
System.out.println("The context variables used in the second call are NOT in transaction scope.");
return false;
}
-
+
if (context3.indexOf(transactionScope) != -1){
System.out.println("The context variables used in the third call are in transaction scope.");
}else{
System.out.println("The context variables used in the third call are NOT in transaction scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
String context3Annotation = context3.substring(context3.indexOf(preIdentical),context3.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
if(context1Annotation.equals(context3Annotation)){
@@ -112,7 +112,7 @@
}else{
System.out.println("The context variables used in the first and second calls to context.send() take place in the different transaction.");
}
-
+
if (context1.substring(context1.indexOf(transactionScope)).equals(context3.substring(context3.indexOf(transactionScope)))){
System.out.println("The context variables used in the first and third calls to context.send() take place in the same transaction.");
}else{
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
index 3de6e9f..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
@@ -27,5 +27,5 @@
public static final String RemoteJNDIName = SessionBeanInjection2.class.getSimpleName() + "/remote2";
public String sendMessage(String text);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/build.properties b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/build.properties
index 94c5569..70e7670 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/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="jms-injection-stateless-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/build.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/build.xml
index b0b36d6..6b5db15 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/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="**/SessionBeanInjection*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/SessionBeanInjection*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.injection.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/client/Client.java
index 0f8382a..ab965f7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/client/Client.java
@@ -47,11 +47,11 @@
}else{
STAT.addStatus(ejbName, STAT.FAIL);
}
-
+
} catch(Exception e) {
e.printStackTrace();
STAT.addStatus(ejbName, STAT.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
index 06f1d1a..b7224cf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
@@ -29,16 +29,16 @@
@Stateless(mappedName="SessionBeanInjection1/remote1")
@TransactionManagement(TransactionManagementType.CONTAINER)
public class SessionBeanInjection1 implements SessionBeanInjectionRemote1 {
-
+
private static String transactionScope = "around TransactionScoped";
private static String preIdentical = "fingerPrint";
- @EJB
+ @EJB
SessionBeanInjectionRemote2 bean2;
@Resource(mappedName = "jms/jms_unit_test_Queue")
private Queue queue;
-
+
@Inject
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
@@ -63,7 +63,7 @@
String context2 = bean2.sendMessage(text+"2");
return checkResult(context1, context2);
}
-
+
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public Boolean checkResult(String context1, String context2){
@@ -74,7 +74,7 @@
System.out.println("The context variables used in the first call are NOT in transaction scope.");
return false;
}
-
+
if (context2.indexOf(transactionScope) != -1)
{
System.out.println("The context variables used in the second call are in transaction scope.");
@@ -82,10 +82,10 @@
System.out.println("The context variables used in the second call are NOT in transaction scope.");
return false;
}
-
+
String context1Annotation = context1.substring(context1.indexOf(preIdentical),context1.indexOf(transactionScope));
String context2Annotation = context2.substring(context2.indexOf(preIdentical),context2.indexOf(transactionScope));
-
+
if(context1Annotation.equals(context2Annotation)){
System.out.println("The context variables in the first and second calls to context.send() injected are using identical annotations.");
return false;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
index 1cb4a4c..9cfcae3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
@@ -27,5 +27,5 @@
public static final String RemoteJNDIName = SessionBeanInjection1.class.getSimpleName() + "/remote1";
public Boolean sendMessage(String text);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/build.properties b/appserver/tests/appserv-tests/devtests/jms/mdbDest/build.properties
index 226bd57..35da164 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/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="mdbDest"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/build.xml b/appserver/tests/appserv-tests/devtests/jms/mdbDest/build.xml
index 9601e47..87d5983 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/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="**/MySessionBean*.class, **/*MessageBean*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client.class,**/MySessionBean*.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"/>
@@ -71,21 +71,21 @@
</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:${assemble.dir}/${appname}-client.jar:${env.APS_HOME}/lib/reporter.jar"
classname="org.glassfish.test.jms.mdbdest.client.Client">
<sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/mdbDest/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
index bc8af24..438ad28 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
@@ -25,8 +25,8 @@
@Remote
public interface MySessionBeanRemote {
public static final String RemoteJNDIName = MySessionBean.class.getSimpleName() + "/remote";
-
+
public void sendMessage(String text);
-
+
public int checkMessage(String text, int expectedCount);
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
index 1b194ef..3309859 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,10 +42,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
index 0fca031..78cc216 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean1 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,10 +42,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean1() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
index 8d5550c..69db995 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean2 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,10 +42,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean2() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
index 77045e7..40fad95 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean3 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,10 +42,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean3() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
index f021c35..2a5dd0b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
@@ -29,9 +29,9 @@
})
public class NewMessageBean4 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -42,10 +42,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean4() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
index 90153ce..cf7d09d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
@@ -30,9 +30,9 @@
})
public class NewMessageBean5 implements MessageListener {
private static final Logger logger = Logger.getLogger(NewMessageBean.class.getName());
-
+
private static int count;
-
+
@Resource
private MessageDrivenContext mdc;
@@ -43,10 +43,10 @@
@JMSConnectionFactory("jms/jms_unit_test_QCF")
@JMSSessionMode(JMSContext.AUTO_ACKNOWLEDGE)
private JMSContext jmsContext;
-
+
public NewMessageBean5() {
}
-
+
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/build.xml b/appserver/tests/appserv-tests/devtests/jms/msgdest/build.xml
index 8e0e5c6..99ccf3c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/build.xml
@@ -30,10 +30,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant jmsweb (Executes the jms-msgdest jmsweb test)
- ant all (Executes all the jms-msgdest tests)
- </echo>
+ <echo>
+ Usage:
+ ant jmsweb (Executes the jms-msgdest jmsweb test)
+ ant all (Executes all the jms-msgdest tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.properties b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.properties
index b80be4c..70655c5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/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="jms-msgdest-jmsweb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.xml b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.xml
index 0e320bf..8f192ee 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -48,30 +48,30 @@
</target>
<target name="build-war">
- <mkdir dir="${assemble.dir}/a/b"/>
- <antcall target="package-war-common">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/a/b/${appname}-web.war"/>
- </antcall>
+ <mkdir dir="${assemble.dir}/a/b"/>
+ <antcall target="package-war-common">
+ <param name="war.classes" value="${build.classes.dir}"/>
+ <param name="war.file" value="${assemble.dir}/a/b/${appname}-web.war"/>
+ </antcall>
</target>
<target name="build" depends="compile, build-war">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Bean*.class" />
- <param name="war.classes"
+ <param name="war.classes"
value="**/*Servlet*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
- <ear earfile="${assemble.dir}/${appname}App.ear" update="true">
- <fileset dir="${assemble.dir}">
- <include name="a/b/*.war"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy"
+ <ear earfile="${assemble.dir}/${appname}App.ear" update="true">
+ <fileset dir="${assemble.dir}">
+ <include name="a/b/*.war"/>
+ </fileset>
+ </ear>
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -81,7 +81,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"/>
@@ -93,14 +93,14 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <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/jms/msgdest/jmsweb/client/Client.java b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/client/Client.java
index c52d689..5724f30 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private String host;
private String port;
@@ -35,23 +35,23 @@
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
stat.addDescription("jms-msgdest-jmsweb");
Client client = new Client(args);
client.doTest();
stat.printSummary("jms-msgdest-jmswebID");
}
-
+
public void doTest() {
-
+
String env = null;
try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/jms-msgdest-jmsweb/jmsservlet";
System.out.println("invoking jmsweb servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("jmsweb main", stat.FAIL);
@@ -63,15 +63,15 @@
stat.addStatus("jmsweb main", stat.FAIL);
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -84,6 +84,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/descriptor/web.xml
index ac85d77..07c5240 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/descriptor/web.xml
@@ -35,7 +35,7 @@
<res-ref-name>jms/MyQueueConnectionFactory</res-ref-name>
<res-type>jakarta.jms.QueueConnectionFactory</res-type>
<res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
+ <res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
<message-destination-ref>
<description>intra-war destination</description>
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
index a2473be..9ce4307 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
@@ -22,7 +22,7 @@
import java.io.Serializable;
import javax.naming.*;
-public class MessageBean
+public class MessageBean
implements MessageDrivenBean, MessageListener {
private MessageDrivenContext mdc;
@@ -34,16 +34,16 @@
}
public void setMessageDrivenContext(MessageDrivenContext mdc) {
- this.mdc = mdc;
- System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
+ this.mdc = mdc;
+ System.out.println("In MessageDrivenEJB::setMessageDrivenContext !!");
}
public void ejbCreate() throws RemoteException {
- System.out.println("In MessageDrivenEJB::ejbCreate !!");
+ System.out.println("In MessageDrivenEJB::ejbCreate !!");
}
public void ejbRemove() {
- System.out.println("In MessageDrivenEJB::ejbRemove !!");
+ System.out.println("In MessageDrivenEJB::ejbRemove !!");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java
index 5afdbd3..1efa049 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/servlet/JmsServlet.java
@@ -32,21 +32,21 @@
private QueueConnectionFactory qcFactory;
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In jmsservlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext context = new InitialContext();
- UserTransaction userTx = (UserTransaction)
+ UserTransaction userTx = (UserTransaction)
context.lookup("java:comp/UserTransaction");
qcFactory = (QueueConnectionFactory) context.lookup("java:comp/env/jms/MyQueueConnectionFactory");
@@ -66,20 +66,20 @@
out.println("<HTML> <HEAD> <TITLE> JMS Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>DatabaseServelt :: All information I can give </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
- out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
+ out.println("<FONT size=+1 color=red> Context Path : </FONT> " + req.getContextPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Servlet Path : </FONT> " + req.getServletPath() + "<br>" );
+ out.println("<FONT size=+1 color=red> Path Info : </FONT> " + req.getPathInfo() + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("jmsservlet test failed");
throw new ServletException(ex);
- }
+ }
}
/**
- * Send a message.
+ * Send a message.
*/
public String sendMessage(String msg) throws JMSException {
QueueConnection connection = null;
@@ -129,9 +129,9 @@
} catch(Exception e) {}
}
}
-
+
public void destroy() {
System.out.println("in jmsservlet destroy");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/jms/run_test.sh b/appserver/tests/appserv-tests/devtests/jms/run_test.sh
index 1c8a643..ad22962 100755
--- a/appserver/tests/appserv-tests/devtests/jms/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/jms/run_test.sh
@@ -18,7 +18,7 @@
list_test_ids(){
echo jms_all
}
-
+
test_run(){
cd ${APS_HOME}/devtests/jms
ant ${TARGET} | tee ${TEST_RUN_LOG}
@@ -34,13 +34,13 @@
generate_junit_report ${1}
change_junit_report_class_names
}
-
+
get_test_target(){
- case ${1} in
- jms_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ jms_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/naming/build.xml b/appserver/tests/appserv-tests/devtests/naming/build.xml
index 4e49844..06be80d 100644
--- a/appserver/tests/appserv-tests/devtests/naming/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/build.xml
@@ -33,25 +33,25 @@
<property file="build.properties" />
<target name="all">
- <delete>
+ <delete>
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
</delete>
<delete>
<fileset dir="." includes="*.output"/>
</delete>
<record name="naming.output" action="start" />
- <ant dir="externalnameservicelookup" target="all"/>
- <ant dir="injection" target="all"/>
- <ant dir="listjndi" target="all"/>
-<!-- <ant dir="loadbalancing" target="all"/> -->
- <ant dir="lookup" target="all"/>
- <ant dir="naming2" target="all"/>
-<!-- <ant dir="nonfailover" target="all"/> -->
- <ant dir="orb_annotation" target="all"/>
-<!-- <ant dir="visibroker/lookup" target="all">
- <ant dir="visibroker/rmiiiop" target="all"> -->
- <record name="naming.output" action="stop" />
-
+ <ant dir="externalnameservicelookup" target="all"/>
+ <ant dir="injection" target="all"/>
+ <ant dir="listjndi" target="all"/>
+<!-- <ant dir="loadbalancing" target="all"/> -->
+ <ant dir="lookup" target="all"/>
+ <ant dir="naming2" target="all"/>
+<!-- <ant dir="nonfailover" target="all"/> -->
+ <ant dir="orb_annotation" target="all"/>
+<!-- <ant dir="visibroker/lookup" target="all">
+ <ant dir="visibroker/rmiiiop" target="all"> -->
+ <record name="naming.output" action="stop" />
+
</target>
-</project>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.properties b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.properties
index b278fd1..effa8cd 100644
--- a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/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="externalnameservicelookup"/>
-<property name="appname" value="${module}-App"/>
+<property name="appname" value="${module}-App"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="app.type" value="war"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.xml b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.xml
index 68e5f2b..d931bcb 100755
--- a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<exec executable="${env.JAVA_HOME}/bin/idlj" failonerror="false">
<arg line="-fall src/Hello.idl"/>
@@ -52,40 +52,40 @@
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</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>
</target>
<!--target name="build" depends="compile">
- <antcall target="package-war-common">
+ <antcall target="package-war-common">
</antcall>
- </target-->
-
-
+ </target-->
+
+
<target name="deploy" depends="init-common">
<echo message="Deploying via asadmin..."/>
<antcall target="deploy-war-common"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="externalnameservicelookup"/>
- </antcall>
+ <param name="testsuite.id" value="externalnameservicelookup"/>
+ </antcall>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloClient.java b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloClient.java
index 18029d8..1ac75a3 100644
--- a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloClient.java
@@ -27,22 +27,22 @@
public static void main(String args[])
{
try{
- Properties p2 = new Properties();
+ Properties p2 = new Properties();
p2.put( "org.omg.CORBA.ORBInitialHost", "localhost" );
p2.put( "org.omg.CORBA.ORBInitialPort", "3700" );
- //p2.put( "com.sun.CORBA.ORBServerPort","33700");
- //p2.put( "com.sun.CORBA.POA.ORBPersistentServerPort","33700");
+ //p2.put( "com.sun.CORBA.ORBServerPort","33700");
+ //p2.put( "com.sun.CORBA.POA.ORBPersistentServerPort","33700");
org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( new String[]{"",""}, p2 );
// create and initialize the ORB
- //ORB orb = ORB.init(args, null);
+ //ORB orb = ORB.init(args, null);
// get the root naming context
- org.omg.CORBA.Object objRef =
- orb.resolve_initial_references("NameService");
- // Use NamingContextExt instead of NamingContext. This is
- // part of the Interoperable naming Service.
+ org.omg.CORBA.Object objRef =
+ orb.resolve_initial_references("NameService");
+ // Use NamingContextExt instead of NamingContext. This is
+ // part of the Interoperable naming Service.
NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
-
+
// resolve the Object Reference in Naming
String name = "Hello";
helloImpl = HelloHelper.narrow(ncRef.resolve_str(name));
@@ -51,10 +51,10 @@
System.out.println(helloImpl.sayHello());
helloImpl.shutdown();
- } catch (Exception e) {
+ } catch (Exception e) {
System.out.println("ERROR : " + e) ;
- e.printStackTrace(System.out);
- }
+ e.printStackTrace(System.out);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloServer.java b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloServer.java
index 880e6ed..78ba4b9 100644
--- a/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloServer.java
+++ b/appserver/tests/appserv-tests/devtests/naming/externalnameservicelookup/src/HelloServer.java
@@ -29,14 +29,14 @@
private ORB orb;
public void setORB(ORB orb_val) {
- orb = orb_val;
+ orb = orb_val;
}
-
+
// implement sayHello() method
public String sayHello() {
return "\nHello world !!\n";
}
-
+
// implement shutdown() method
public void shutdown() {
orb.shutdown(false);
@@ -57,12 +57,12 @@
// create servant and register it with the ORB
HelloImpl helloImpl = new HelloImpl();
- helloImpl.setORB(orb);
+ helloImpl.setORB(orb);
// get object reference from the servant
org.omg.CORBA.Object ref = rootpoa.servant_to_reference(helloImpl);
Hello href = HelloHelper.narrow(ref);
-
+
// get the root naming context
// NameService invokes the name service
org.omg.CORBA.Object objRef =
@@ -80,16 +80,16 @@
// wait for invocations from clients
orb.run();
- }
-
+ }
+
catch (Exception e) {
System.err.println("ERROR: " + e);
e.printStackTrace(System.out);
}
-
+
System.out.println("HelloServer Exiting ...");
-
+
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/build.properties b/appserver/tests/appserv-tests/devtests/naming/injection/build.properties
index a842968..38624fa 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="naming-injection"/>
-<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="test.Client"/>
<property name="glassfish-ejb-jar.xml" value="descriptor/glassfish-ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/build.xml b/appserver/tests/appserv-tests/devtests/naming/injection/build.xml
index 46e5ef6..7e46363 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/build.xml
@@ -36,7 +36,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"/>
@@ -46,7 +46,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common-with-endorsed-dir">
<param name="src" value="ejb"/>
@@ -58,12 +58,12 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Hello*.class"/>
</antcall>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -71,9 +71,9 @@
<target name="run" depends="init-common">
<antcall target="run_se"/>
</target>
-
+
<target name="run_se" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${se.client}">
@@ -84,7 +84,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/naming/injection/client/Client.java b/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
index d6767f8..27326c4 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
@@ -23,30 +23,30 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static String appName;
public static void main(String args[]) {
- appName = args[0];
- stat.addDescription(appName);
- Client client = new Client(args);
- client.doTest();
+ appName = args[0];
+ stat.addDescription(appName);
+ Client client = new Client(args);
+ client.doTest();
stat.printSummary(appName + "ID");
}
public Client(String[] args) {}
public void doTest() {
- try {
+ try {
InitialContext ic = new InitialContext();
Hello helloBean = (Hello) ic.lookup("java:global/" + appName + "/HelloBean");
System.out.println("Invoking " + helloBean + ", " + helloBean.injectedURL());
- stat.addStatus(appName, stat.PASS);
- } catch(Exception e) {
- e.printStackTrace();
- stat.addStatus(appName, stat.FAIL);
- }
+ stat.addStatus(appName, stat.PASS);
+ } catch(Exception e) {
+ e.printStackTrace();
+ stat.addStatus(appName, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
index a78df94..eb801a9 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
@@ -54,7 +54,7 @@
if(Arrays.equals(expectedURLs, actualURLs)) {
return ("Got expected " + Arrays.toString(actualURLs));
} else {
- throw new EJBException("Expecting " + Arrays.toString(expectedURLs) +
+ throw new EJBException("Expecting " + Arrays.toString(expectedURLs) +
", actual " + Arrays.toString(actualURLs));
}
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
index 4dd6a48..92fc39a 100644
--- a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
+++ b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
@@ -24,7 +24,7 @@
*/
public class ListJndiEntriesTest extends AdminBaseDevTest {
- public static final String[] EXPECTED_TOKENS =
+ public static final String[] EXPECTED_TOKENS =
{"UserTransaction:", "java:global:", "ejb:", "com.sun.enterprise.naming.impl.TransientContext"};
public static final String INSTANCE_RESOURCE_NAME = "INSTANCE_RESOURCE_NAME";
diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml b/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml
index d16765b..197f801 100644
--- a/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml
@@ -56,12 +56,12 @@
<target name="build">
<mkdir dir="build"/>
- <javac includeAntRuntime="false" destdir="build" debug="true"
+ <javac includeAntRuntime="false" destdir="build" debug="true"
srcdir="${env.APS_HOME}/devtests/admin/cli/src" includes="**/AdminBaseDevTest.java">
<classpath path="${classpath}"/>
</javac>
- <javac includeAntRuntime="false"
+ <javac includeAntRuntime="false"
destdir="build" debug="true" srcdir="." includes="**/*.java">
<classpath path="${classpath}"/>
</javac>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/build.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/build.xml
index e2af7ac..afd0a677c 100644
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/build.xml
@@ -77,15 +77,15 @@
</target>
<target name="usage">
- <echo> Usage:
- ant enroller (Executes the enroller tests)
- ant all (Executes all the ejb bmp tests)
- ant clean (cleans all the ejb bmp tests)
- ant build (builds all the ejb bmp tests)
- ant setup (sets up all resources for bmp tests)
- ant deploy (deploys all the ejb bmp apps)
- ant undeploy (undeploys all the bmp apps)
- ant unsetup (unsets all resources for bmp tests)
- </echo>
+ <echo> Usage:
+ ant enroller (Executes the enroller tests)
+ ant all (Executes all the ejb bmp tests)
+ ant clean (cleans all the ejb bmp tests)
+ ant build (builds all the ejb bmp tests)
+ ant setup (sets up all resources for bmp tests)
+ ant deploy (deploys all the ejb bmp apps)
+ ant undeploy (undeploys all the bmp apps)
+ ant unsetup (unsets all resources for bmp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.properties b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.properties
index 37efb1e..776d55f 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="loadbalancing"/>
-<property name="appname" value="${module}-App"/>
+<property name="appname" value="${module}-App"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="default-instance" value="${env.S1AS_HOME}/domains/domain1"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml
index 25314b0..fd14510 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml
@@ -32,11 +32,11 @@
&run;
<target name="all" depends="cluster-setup,build,setup,deploy,run-appclient1,run-appclient2,run-appclient3,run-appclient4,undeploy,unsetup,cluster-unsetup"/>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="sql" depends="init-common">
<!--
Clean the database after the run since it prohibits re-running
@@ -49,34 +49,34 @@
</antcall>
</target>
<target name="run-appclient1" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml 129.145.133.64 33700"/>
- </antcall>
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml 129.145.133.64 33700"/>
+ </antcall>
<antcall target="sql"/>
</target>
<target name="run-appclient2" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb1.xml 129.145.133.64 33700"/>
- </antcall>
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb1.xml 129.145.133.64 33700"/>
+ </antcall>
<antcall target="sql"/>
</target>
<target name="run-appclient3" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb2.xml 129.145.133.64 33700"/>
- </antcall>
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb2.xml 129.145.133.64 33700"/>
+ </antcall>
<antcall target="sql"/>
</target>
<target name="run-appclient4" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb3.xml 129.145.133.64 33700"/>
- </antcall>
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb3.xml 129.145.133.64 33700"/>
+ </antcall>
<antcall target="sql"/>
</target>
@@ -91,13 +91,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_derby.sql"/>
@@ -106,46 +106,46 @@
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
<param name="appserver.instance.name" value="C1"/>
- </antcall>
- <!--antcall target="deploy-jms-common"/>
- <antcall target="reconfig-common"/-->
+ </antcall>
+ <!--antcall target="deploy-jms-common"/>
+ <antcall target="reconfig-common"/-->
</target>
<target name="deploy" depends="init-common">
- <echo message="Deploying via asadmin..."/>
+ <echo message="Deploying via asadmin..."/>
<antcall target="deploy-common-ee">
<param name="ee" value="enterprise edition"/>
<param name="appserver.instance.name" value="C1"/>
</antcall>
- </target>
+ </target>
<!-- =============================================== -->
<!-- Target to run the standalone client without ACC -->
<!---->
<!-- =============================================== -->
<target name="run-standalone-client" depends="init-common">
- <property name="client.type"
- value="standalone"/>
- <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
+ <property name="client.type"
+ value="standalone"/>
+ <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar" failonerror="true" fork="true">
- <!--jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/-->
+ <!--jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/-->
<jvmarg value="-Djava.naming.provider.url=iiop://129.145.133.64:33700"/>
- <!--jvmarg value="-Dcom.sun.appserv.iiop.endpoints=pathfinder.sfbay.sun.com:3690,pathfinder.sfbay.sun.com:3880"/-->
- <jvmarg value="-Dcom.sun.appserv.iiop.loadbalancingpolicy=ic-based"/>
- <arg value="129.145.133.64"/>
- <arg value="33700"/>
- <arg value="${client.type}"/>
+ <!--jvmarg value="-Dcom.sun.appserv.iiop.endpoints=pathfinder.sfbay.sun.com:3690,pathfinder.sfbay.sun.com:3880"/-->
+ <jvmarg value="-Dcom.sun.appserv.iiop.loadbalancingpolicy=ic-based"/>
+ <arg value="129.145.133.64"/>
+ <arg value="33700"/>
+ <arg value="${client.type}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- <antcall target="undeploy-common">
+ <antcall target="undeploy-common">
<param name="appserver.instance.name" value="C1"/>
</antcall>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<!--antcall target="undeploy-jms-common"/-->
@@ -157,7 +157,7 @@
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
<param name="appserver.instance.name" value="C1"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/client/EnrollerClient.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/client/EnrollerClient.java
index 708b545..7fa533c 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/client/EnrollerClient.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/client/EnrollerClient.java
@@ -36,20 +36,20 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- EnrollerClient client = new EnrollerClient();
+ public static void main(String[] args) {
+ EnrollerClient client = new EnrollerClient();
// run the tests
- client.runTestClient(args);
+ client.runTestClient(args);
}
public void runTestClient(String[] args) {
try{
- Hashtable env = new Hashtable();
+ Hashtable env = new Hashtable();
stat.addDescription("Testing loadbalancing app ...");
test01(env, args);
- stat.printSummary("loadbalancingAppID");
+ stat.printSummary("loadbalancingAppID");
} catch (Exception ex) {
System.out.println("Exception in runTestClient: " + ex.toString());
ex.printStackTrace();
@@ -58,131 +58,131 @@
private void test01(Hashtable env, String[] args) {
-
- try {
- env.put("java.naming.factory.initial",
- "com.sun.appserv.naming.S1ASCtxFactory");
- Context initial = new InitialContext(env);
- System.out.println("Looking up MEJB...");
- Object objref = initial.lookup("ejb/mgmt/MEJB");
- System.out.println("Looked up ejb/mgmt/MEJB with context 0");
- String jndi = "";
- if (args.length == 3 && args[2].equals("standalone")) {
- jndi = "ejb/MyStudent";
- } else jndi = "java:comp/env/ejb/SimpleStudent";
- Context initial1 = new InitialContext(env);
- objref = initial1.lookup(jndi);
- System.out.println("Looked up " + jndi + " with context 1");
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
- StudentHome.class);
+ try {
+ env.put("java.naming.factory.initial",
+ "com.sun.appserv.naming.S1ASCtxFactory");
+ Context initial = new InitialContext(env);
+ System.out.println("Looking up MEJB...");
+ Object objref = initial.lookup("ejb/mgmt/MEJB");
+ System.out.println("Looked up ejb/mgmt/MEJB with context 0");
+
+ String jndi = "";
+ if (args.length == 3 && args[2].equals("standalone")) {
+ jndi = "ejb/MyStudent";
+ } else jndi = "java:comp/env/ejb/SimpleStudent";
+ Context initial1 = new InitialContext(env);
+ objref = initial1.lookup(jndi);
+ System.out.println("Looked up " + jndi + " with context 1");
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome.class);
Student denise = sHome.create("823", "Denise Smith");
- Context initial2 = new InitialContext(env);
- objref= initial2.lookup(jndi);
- System.out.println("Looked up " + jndi + " with context 2");
- sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ Context initial2 = new InitialContext(env);
+ objref= initial2.lookup(jndi);
+ System.out.println("Looked up " + jndi + " with context 2");
+ sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Student jim = sHome.create("828", "Jim Goodyear");
- Context initial3 = new InitialContext(env);
- objref= initial3.lookup("ejb/MyStudent");
- System.out.println("Looked up ejb/MyStudent with context 3");
- sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
- StudentHome.class);
+ Context initial3 = new InitialContext(env);
+ objref= initial3.lookup("ejb/MyStudent");
+ System.out.println("Looked up ejb/MyStudent with context 3");
+ sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome.class);
Student scott = sHome.create("826", "Scott White");
- Context initial4 = new InitialContext(env);
- objref= initial4.lookup("ejb/MyStudent");
- System.out.println("Looked up ejb/MyStudent with context 4");
- sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
- StudentHome.class);
+ Context initial4 = new InitialContext(env);
+ objref= initial4.lookup("ejb/MyStudent");
+ System.out.println("Looked up ejb/MyStudent with context 4");
+ sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome.class);
Student john = sHome.create("844", "John Wayne");
- Context initial5 = new InitialContext(env);
- objref = initial5.lookup("corbaname:iiop:" + args[0] + ":" + args[1] + "#ejb/MyStudent");
- System.out.println("Looked up corbaname:iiop:" + args[0] + ":" + args[1] + "#ejb/MyStudent");
- sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
- StudentHome.class);
+ Context initial5 = new InitialContext(env);
+ objref = initial5.lookup("corbaname:iiop:" + args[0] + ":" + args[1] + "#ejb/MyStudent");
+ System.out.println("Looked up corbaname:iiop:" + args[0] + ":" + args[1] + "#ejb/MyStudent");
+ sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome.class);
Student tim = sHome.create("555", "Tim Duncan");
-
- System.out.println("**************************************");
- System.out.println("Loadbalancing for java:comp names :");
- String[] deniseEndpoint = denise.getServerHostPort();
- System.out.println("Denise Smith created on " +
- deniseEndpoint[0] + ":" + deniseEndpoint[1]);
- String[] jimEndpoint = jim.getServerHostPort();
- System.out.println("Jim Goodyear created on " +
- jimEndpoint[0] + ":" + jimEndpoint[1]);
- System.out.println("**************************************");
- System.out.println("**************************************");
- System.out.println("Loadbalancing for global jndi names :");
- String[] scottEndpoint = scott.getServerHostPort();
- System.out.println("Scott White created on " +
- scottEndpoint[0] + ":" + scottEndpoint[1]);
- String[] johnEndpoint = john.getServerHostPort();
- System.out.println("John Wayne created on " +
- johnEndpoint[0] + ":" + johnEndpoint[1]);
- System.out.println("**************************************");
+ System.out.println("**************************************");
+ System.out.println("Loadbalancing for java:comp names :");
+ String[] deniseEndpoint = denise.getServerHostPort();
+ System.out.println("Denise Smith created on " +
+ deniseEndpoint[0] + ":" + deniseEndpoint[1]);
+ String[] jimEndpoint = jim.getServerHostPort();
+ System.out.println("Jim Goodyear created on " +
+ jimEndpoint[0] + ":" + jimEndpoint[1]);
+ System.out.println("**************************************");
+
+ System.out.println("**************************************");
+ System.out.println("Loadbalancing for global jndi names :");
+ String[] scottEndpoint = scott.getServerHostPort();
+ System.out.println("Scott White created on " +
+ scottEndpoint[0] + ":" + scottEndpoint[1]);
+ String[] johnEndpoint = john.getServerHostPort();
+ System.out.println("John Wayne created on " +
+ johnEndpoint[0] + ":" + johnEndpoint[1]);
+ System.out.println("**************************************");
- System.out.println("**************************************");
- String[] timEndpoint = tim.getServerHostPort();
- System.out.println("Tim Duncan created on " +
- timEndpoint[0] + ":" + timEndpoint[1]);
- System.out.println("**************************************");
- boolean pass = false;
- String[] addr = getAddressPortList(args[0] + ":" + args[1]);
- for (int j = 0; j < addr.length; j++) {
+ System.out.println("**************************************");
+ String[] timEndpoint = tim.getServerHostPort();
+ System.out.println("Tim Duncan created on " +
+ timEndpoint[0] + ":" + timEndpoint[1]);
+ System.out.println("**************************************");
+ boolean pass = false;
+ String[] addr = getAddressPortList(args[0] + ":" + args[1]);
+ for (int j = 0; j < addr.length; j++) {
System.out.println("addr[j]..." + addr[j]);
- if ((addr[j].trim()).equals((timEndpoint[0] + ":" + timEndpoint[1]).trim())) {
- System.out.println("found right address..." + addr[j]);
- pass = true;
- break;
- }
- }
- if (!deniseEndpoint[0].equals(jimEndpoint[0]) &&
- !johnEndpoint[0].equals(scottEndpoint[0]) && pass == true) {
- System.out.println("timEndpoint[0] =" + timEndpoint[0]);
- System.out.println("LOADBALANCING SUCCESSFUL!!");
- stat.addStatus("load balancing", stat.PASS);
- } else if (!deniseEndpoint[1].equals(jimEndpoint[1]) &&
- !johnEndpoint[1].equals(scottEndpoint[1]) && pass == true) {
- System.out.println("LOADBALANCING SUCCESSFUL!!");
- stat.addStatus("load balancing", stat.PASS);
- }
-
+ if ((addr[j].trim()).equals((timEndpoint[0] + ":" + timEndpoint[1]).trim())) {
+ System.out.println("found right address..." + addr[j]);
+ pass = true;
+ break;
+ }
+ }
+ if (!deniseEndpoint[0].equals(jimEndpoint[0]) &&
+ !johnEndpoint[0].equals(scottEndpoint[0]) && pass == true) {
+ System.out.println("timEndpoint[0] =" + timEndpoint[0]);
+ System.out.println("LOADBALANCING SUCCESSFUL!!");
+ stat.addStatus("load balancing", stat.PASS);
+ } else if (!deniseEndpoint[1].equals(jimEndpoint[1]) &&
+ !johnEndpoint[1].equals(scottEndpoint[1]) && pass == true) {
+ System.out.println("LOADBALANCING SUCCESSFUL!!");
+ stat.addStatus("load balancing", stat.PASS);
+ }
+
} catch (Exception ex) {
stat.addStatus("load balancing", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
/**
* following methods (over-loaded) for getting all IP addresses corresponding
* to a particular host.
- * (multi-homed hosts).
+ * (multi-homed hosts).
*/
private String [] getAddressPortList(String host) {
Vector addressPortVector = new Vector();
try {
- IiopUrl url = new IiopUrl("iiop://"+host);
- String [] apList = getAddressPortList(url);
- for (int j=0; j<apList.length; j++) {
- addressPortVector.addElement(apList[j]);
- }
- } catch (MalformedURLException me) {
- me.printStackTrace();
- }
-
+ IiopUrl url = new IiopUrl("iiop://"+host);
+ String [] apList = getAddressPortList(url);
+ for (int j=0; j<apList.length; j++) {
+ addressPortVector.addElement(apList[j]);
+ }
+ } catch (MalformedURLException me) {
+ me.printStackTrace();
+ }
+
String [] ret = new String[addressPortVector.size()];
for (int i=0; i<ret.length; i++) {
ret[i] = (String)addressPortVector.elementAt(i);
@@ -190,18 +190,18 @@
// We return a list of <IP ADDRESS>:<PORT> values
return ret;
}
-
+
private String [] getAddressPortList(IiopUrl iiopUrl) {
// Pull out the host name and port
- IiopUrl.Address iiopUrlAddress =
+ IiopUrl.Address iiopUrlAddress =
(IiopUrl.Address)(iiopUrl.getAddresses().elementAt(0));
String host = iiopUrlAddress.host;
int portNumber = iiopUrlAddress.port;
String port = Integer.toString(portNumber);
// We return a list of <IP ADDRESS>:<PORT> values
- return getAddressPortList(host, port);
+ return getAddressPortList(host, port);
}
-
+
private String [] getAddressPortList(String host, String port) {
// Get the ip addresses corresponding to the host
try {
@@ -213,8 +213,8 @@
// We return a list of <IP ADDRESS>:<PORT> values
return ret;
} catch (UnknownHostException ukhe) {
- ukhe.printStackTrace();
+ ukhe.printStackTrace();
return null;
}
}
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/ejb-jar.xml
index ddf0f6d..1e65877 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/ejb-jar.xml
@@ -28,7 +28,7 @@
<persistence-type>Bean</persistence-type>
<prim-key-class>java.lang.String</prim-key-class>
<reentrant>false</reentrant>
- <resource-ref>
+ <resource-ref>
<res-ref-name>jdbc/bmp-enrollerDB</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb.xml
index 4a66e95..e6a25c7 100644
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb.xml
@@ -19,7 +19,7 @@
<!DOCTYPE client-container PUBLIC "-//Sun Microsystems Inc.//DTD Application Server 8.0 Application Client Container//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client-container_1_0.dtd">
-<client-container>
+<client-container>
<log-service file="../acc.log" level="FINE"/>
<property name="com.sun.appserv.iiop.loadbalancingpolicy" value="ic-based"/>
<property name="com.sun.appserv.iiop.endpoints" value="localhost:33702,localhost:33701"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb3.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb3.xml
index 7ade150..afb33af 100644
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb3.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/descriptor/sun-acc-lb3.xml
@@ -19,7 +19,7 @@
<!DOCTYPE client-container PUBLIC "-//Sun Microsystems Inc.//DTD Application Server 8.0 Application Client Container//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client-container_1_0.dtd">
-<client-container>
+<client-container>
<target-server name="localhost" address="localhost" port="33700"/>
<log-service file="../acc.log" level="FINE"/>
<property name="com.sun.appserv.iiop.loadbalancingpolicy" value="ic-based"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
index 97de523..ac4b33e 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
@@ -22,7 +22,7 @@
public interface Student extends EJBObject {
-
+
/**
* Returns the Name of a student.
* exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
index 8023bb6..9b4e678 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
@@ -59,7 +59,7 @@
this.studentId = studentId;
this.name = name;
- System.out.println("Created Student with ID " + studentId + " and Name " + name);
+ System.out.println("Created Student with ID " + studentId + " and Name " + name);
return studentId;
}
@@ -90,13 +90,13 @@
public void setEntityContext(EntityContext context) {
this.context = context;
- try {
- InitialContext ic = new InitialContext();
- dataSource =
- (DataSource) ic.lookup("java:comp/env/jdbc/bmp-enrollerDB");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ InitialContext ic = new InitialContext();
+ dataSource =
+ (DataSource) ic.lookup("java:comp/env/jdbc/bmp-enrollerDB");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
}
public void unsetEntityContext() {
@@ -227,24 +227,24 @@
public String[] getServerHostPort() {
String orbHost = null, orbPort = null;
- try {
- ServerContext serverContext = ApplicationServer.getServerContext();
-
- ConfigContext configContext = serverContext.getConfigContext();
-
+ try {
+ ServerContext serverContext = ApplicationServer.getServerContext();
+
+ ConfigContext configContext = serverContext.getConfigContext();
+
Server serverBean = ServerBeansFactory.getServerBean(configContext);
-
+
IiopService iiopServiceBean = ServerBeansFactory.getIiopServiceBean(configContext);
- IiopListener[] iiopListenerBeans = iiopServiceBean.getIiopListener();
- Orb orbBean = iiopServiceBean.getOrb();
-
- orbHost = iiopListenerBeans[0].getAddress();
- orbPort = iiopListenerBeans[0].getPort();
+ IiopListener[] iiopListenerBeans = iiopServiceBean.getIiopListener();
+ Orb orbBean = iiopServiceBean.getOrb();
+
+ orbHost = iiopListenerBeans[0].getAddress();
+ orbPort = iiopListenerBeans[0].getPort();
} catch (Exception cfe) {
cfe.printStackTrace();
- }
- return new String[] {orbHost, orbPort};
+ }
+ return new String[] {orbHost, orbPort};
}
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
index 2ae3de5..fca5446 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_derby.sql b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_derby.sql
index f333cd3..7728496 100644
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_derby.sql
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_derby.sql
@@ -1,5 +1,5 @@
-create table student
-(studentid varchar(3) NOT NULL PRIMARY KEY,
+create table student
+(studentid varchar(3) NOT NULL PRIMARY KEY,
name varchar(36));
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_pointbase.sql
index 1e0536e..7e90868 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/sql/create_pointbase.sql
@@ -1,5 +1,5 @@
-create table student
-(studentid varchar(3) constraint pk_student primary key,
+create table student
+(studentid varchar(3) constraint pk_student primary key,
name varchar(36));
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/build.xml b/appserver/tests/appserv-tests/devtests/naming/lookup/build.xml
index b7fad75..e75ebf5 100644
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/build.xml
@@ -82,16 +82,16 @@
</target>
<target name="usage">
- <echo> Usage:
- ant enroller (Executes the enroller tests)
- ant all (Executes all the ejb bmp tests)
- ant clean (cleans all the ejb bmp tests)
- ant build (builds all the ejb bmp tests)
- ant setup (sets up all resources for bmp tests)
- ant deploy (deploys all the ejb bmp apps)
- ant run (Executes all the ejb bmp tests)
- ant undeploy (undeploys all the bmp apps)
- ant unsetup (unsets all resources for bmp tests)
- </echo>
+ <echo> Usage:
+ ant enroller (Executes the enroller tests)
+ ant all (Executes all the ejb bmp tests)
+ ant clean (cleans all the ejb bmp tests)
+ ant build (builds all the ejb bmp tests)
+ ant setup (sets up all resources for bmp tests)
+ ant deploy (deploys all the ejb bmp apps)
+ ant run (Executes all the ejb bmp tests)
+ ant undeploy (undeploys all the bmp apps)
+ ant unsetup (unsets all resources for bmp tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.properties b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.properties
index 37efb1e..776d55f 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="loadbalancing"/>
-<property name="appname" value="${module}-App"/>
+<property name="appname" value="${module}-App"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="default-instance" value="${env.S1AS_HOME}/domains/domain1"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.xml b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.xml
index c774482..e9ccb33 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,13 +49,13 @@
<target name="build" depends="compile">
<antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -63,20 +63,20 @@
<antcall target="deploy-jdbc-common">
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- </antcall>
- <antcall target="deploy-jms-common"/>
- <!--<antcall target="reconfig-common"/>-->
+ </antcall>
+ <antcall target="deploy-jms-common"/>
+ <!--<antcall target="reconfig-common"/>-->
</target>
<target name="deploy" depends="init-common">
<echo message="Deploying via asadmin..."/>
<antcall target="deploy-common"/>
- </target>
+ </target>
<target name="run" depends="init-common">
- <antcall target="runclient-common">
+ <antcall target="runclient-common">
- </antcall>
+ </antcall>
<!--
Clean the database after the run since it prohibits re-running
-->
@@ -86,12 +86,12 @@
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
</antcall>
- <!--antcall target="run-standalone-client-threading">
- <param name="ctxFactory" value="com.sun.appserv.naming.S1ASCtxFactory"/>
- </antcall>
- <antcall target="run-standalone-client-threading">
- <param name="ctxFactory" value="com.sun.enterprise.naming.SerialInitContextFactory"/>
- </antcall-->
+ <!--antcall target="run-standalone-client-threading">
+ <param name="ctxFactory" value="com.sun.appserv.naming.S1ASCtxFactory"/>
+ </antcall>
+ <antcall target="run-standalone-client-threading">
+ <param name="ctxFactory" value="com.sun.enterprise.naming.SerialInitContextFactory"/>
+ </antcall-->
</target>
<target name="sql" depends="init-common">
@@ -106,25 +106,25 @@
</antcall>
</target>
<target name="run-appclient" depends="init-common">
- <echo message="running in ACC with SerialInitContextFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml"/>
- </antcall>
+ <echo message="running in ACC with SerialInitContextFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml"/>
+ </antcall>
</target>
<!-- =============================================== -->
<!-- Target to run the standalone client without ACC -->
<!-- =============================================== -->
<target name="run-standalone-client-threading" depends="init-common">
- <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClientthreading"
+ <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClientthreading"
classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar"
failonerror="true" fork="true">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
<!--jvmarg value="-Djava.naming.provider.url=iiop://${admin.host}:${orb.port}"/-->
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-<!-- <jvmarg value="-Djavax.rmi.CORBA.UtilClass=com.sun.corba.ee.impl.javax.rmi.CORBA.Util"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBClass=com.sun.corba.ee.impl.orb.ORBImpl"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=com.sun.corba.ee.impl.orb.ORBSingleton"/> -->
+ <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+<!-- <jvmarg value="-Djavax.rmi.CORBA.UtilClass=com.sun.corba.ee.impl.javax.rmi.CORBA.Util"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBClass=com.sun.corba.ee.impl.orb.ORBImpl"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=com.sun.corba.ee.impl.orb.ORBSingleton"/> -->
<arg value="${ctxFactory}"/>
</java>
</target>
@@ -133,23 +133,23 @@
<!-- Target to run the standalone client without ACC -->
<!-- =============================================== -->
<target name="run-standalone-client" depends="init-common">
- <property name="client.type"
- value="standalone"/>
- <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
+ <property name="client.type"
+ value="standalone"/>
+ <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar"
failonerror="true" fork="true">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-<!-- <jvmarg value="-Djavax.rmi.CORBA.UtilClass=com.sun.corba.ee.impl.javax.rmi.CORBA.Util"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBClass=com.sun.corba.ee.impl.orb.ORBImpl"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=com.sun.corba.ee.impl.orb.ORBSingleton"/> -->
- <arg value="${client.type}"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+<!-- <jvmarg value="-Djavax.rmi.CORBA.UtilClass=com.sun.corba.ee.impl.javax.rmi.CORBA.Util"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBClass=com.sun.corba.ee.impl.orb.ORBImpl"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=com.sun.corba.ee.impl.orb.ORBSingleton"/> -->
+ <arg value="${client.type}"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="unsetup" depends="init-common">
<antcall target="undeploy-jms-common"/>
@@ -160,7 +160,7 @@
<param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
<param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java
index 6689bf3..b1be1a9 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java
@@ -31,11 +31,11 @@
private SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- EnrollerClient client = new EnrollerClient();
+ public static void main(String[] args) {
+ EnrollerClient client = new EnrollerClient();
// run the tests
- client.runTestClient(args);
+ client.runTestClient(args);
}
public void runTestClient(String[] args) {
@@ -53,61 +53,61 @@
private void test01(String[] args) {
String enrollerString = "";
- String queueString = "";
- try {
- if (args.length != 0 && args[0].equals("standalone")) {
- enrollerString = "ejb/MyEnroller";
- queueString = "jms/SampleQueue";
- } else {
- enrollerString = "java:comp/env/ejb/SimpleEnroller";
- queueString = "java:comp/env/jms/SampleQueue";
- }
- Properties env = new Properties();
- env.put("java.naming.factory.initial", "org.glassfish.jndi.cosnaming.CNCtxFactory");
- ORBLocator orbLocator = Globals.getDefaultHabitat().getService(ORBLocator.class);
-
- env.put("java.naming.corba.orb", orbLocator.getORB());
- // Initialize the Context with JNDI specific properties
- InitialContext ctx = new InitialContext(env);
- System.out.println("looking up ejb/MyStudent using org.glassfish.jndi.cosnaming.CNCtxFactory...");
- Object obj = ctx.lookup("ejb/MyStudent");
- System.out.println("Looked up ejb/MyStudent with CnCtxFactory...");
- StudentHome sH =
- (StudentHome) PortableRemoteObject.narrow(obj,
- StudentHome.class);
- Student denise1 = sH.create("111", "Tiffany Moore");
- System.out.println("Created student id 111 for Tiffany Moore");
-
- Context initial = new InitialContext();
- System.out.println("Looking up MEJB...");
- Object objref = initial.lookup("ejb/mgmt/MEJB");
- System.out.println("Looked up ejb/mgmt/MEJB");
- System.out.println("Looking up EJB REFs whose jndi name is specified as a corbaname: url ==>");
- System.out.println("Creating new Context 1..");
-
- System.out.println("Using Context 1, Looking up EJB using corbaname: url with global jndi name ==>");
-
- objref = initial.lookup("corbaname:iiop:localhost:3700#ejb/MyStudent");
- System.out.println("Looked up corbaname:iiop:localhost:3700#ejb/MyStudent");
-
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
+ String queueString = "";
+ try {
+ if (args.length != 0 && args[0].equals("standalone")) {
+ enrollerString = "ejb/MyEnroller";
+ queueString = "jms/SampleQueue";
+ } else {
+ enrollerString = "java:comp/env/ejb/SimpleEnroller";
+ queueString = "java:comp/env/jms/SampleQueue";
+ }
+ Properties env = new Properties();
+ env.put("java.naming.factory.initial", "org.glassfish.jndi.cosnaming.CNCtxFactory");
+ ORBLocator orbLocator = Globals.getDefaultHabitat().getService(ORBLocator.class);
+
+ env.put("java.naming.corba.orb", orbLocator.getORB());
+ // Initialize the Context with JNDI specific properties
+ InitialContext ctx = new InitialContext(env);
+ System.out.println("looking up ejb/MyStudent using org.glassfish.jndi.cosnaming.CNCtxFactory...");
+ Object obj = ctx.lookup("ejb/MyStudent");
+ System.out.println("Looked up ejb/MyStudent with CnCtxFactory...");
+ StudentHome sH =
+ (StudentHome) PortableRemoteObject.narrow(obj,
+ StudentHome.class);
+ Student denise1 = sH.create("111", "Tiffany Moore");
+ System.out.println("Created student id 111 for Tiffany Moore");
+
+ Context initial = new InitialContext();
+ System.out.println("Looking up MEJB...");
+ Object objref = initial.lookup("ejb/mgmt/MEJB");
+ System.out.println("Looked up ejb/mgmt/MEJB");
+ System.out.println("Looking up EJB REFs whose jndi name is specified as a corbaname: url ==>");
+ System.out.println("Creating new Context 1..");
+
+ System.out.println("Using Context 1, Looking up EJB using corbaname: url with global jndi name ==>");
+
+ objref = initial.lookup("corbaname:iiop:localhost:3700#ejb/MyStudent");
+ System.out.println("Looked up corbaname:iiop:localhost:3700#ejb/MyStudent");
+
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
StudentHome.class);
Student denise = sHome.create("823", "Denise Smith");
- System.out.println("Using Context 1, looking up global jndi name ==>");
- Object objRef = initial.lookup("ejb/MyCourse");
- System.out.println("Looked up ejb/MyCourse");
- CourseHome cHome = (CourseHome)
- PortableRemoteObject.narrow(objRef,
- CourseHome.class);
- Course power = cHome.create("220", "Power J2EE Programming");
+ System.out.println("Using Context 1, looking up global jndi name ==>");
+ Object objRef = initial.lookup("ejb/MyCourse");
+ System.out.println("Looked up ejb/MyCourse");
+ CourseHome cHome = (CourseHome)
+ PortableRemoteObject.narrow(objRef,
+ CourseHome.class);
+ Course power = cHome.create("220", "Power J2EE Programming");
- objref = initial.lookup(enrollerString);
- System.out.println("Looked up " + enrollerString);
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
+ objref = initial.lookup(enrollerString);
+ System.out.println("Looked up " + enrollerString);
+ EnrollerHome eHome =
+ (EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
Enroller enroller = eHome.create();
enroller.enroll("823", "220");
@@ -125,7 +125,7 @@
System.out.println(courseId + " " + course.getName());
}
System.out.println();
-
+
Course intro = cHome.findByPrimaryKey("777");
System.out.println(intro.getName() + ":");
courses = intro.getStudentIds();
@@ -136,47 +136,47 @@
System.out.println(studentId + " " + student.getName());
}
- System.out.println("Looking up JMS Resource Refs ==>");
- System.out.println("Creating new Context 2..");
- Context initial1 = new InitialContext();
- jakarta.jms.Queue queue = (jakarta.jms.Queue) initial1.lookup(queueString);
- System.out.println("looked up " + queueString);
+ System.out.println("Looking up JMS Resource Refs ==>");
+ System.out.println("Creating new Context 2..");
+ Context initial1 = new InitialContext();
+ jakarta.jms.Queue queue = (jakarta.jms.Queue) initial1.lookup(queueString);
+ System.out.println("looked up " + queueString);
- System.out.println("Creating new Context 3...");
- Context initial2 = new InitialContext();
- jakarta.jms.QueueConnectionFactory queueConnectionFactory =
- (QueueConnectionFactory)
- initial2.lookup("jms/QCFactory");
- System.out.println("Looked up jms/QCFactory");
-
+ System.out.println("Creating new Context 3...");
+ Context initial2 = new InitialContext();
+ jakarta.jms.QueueConnectionFactory queueConnectionFactory =
+ (QueueConnectionFactory)
+ initial2.lookup("jms/QCFactory");
+ System.out.println("Looked up jms/QCFactory");
+
stat.addStatus("load balancing", stat.PASS);
} catch (Exception ex) {
stat.addStatus("load balancing", stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
}
- }
+ }
- private void testInAppClientContainer() {
- System.out.println("Creating new Context ...");
- try {
- InitialContext ctx = new InitialContext();
- Object obj = ctx.lookup("java:comp/InAppClientContainer");
- if (obj == null) {
- stat.addStatus("testInAppClientContainer", stat.FAIL);
- return;
- }
- Boolean result = (Boolean) obj;
- if (!result) {
- stat.addStatus("testInAppClientContainer", stat.FAIL);
- }
- System.out.println("Looked up java:comp/InAppClientContainer :"
- + result);
- stat.addStatus("testInAppClientContainer", stat.PASS);
- } catch (Exception ex) {
- stat.addStatus("testInAppClientContainer", stat.FAIL);
- System.err.println("Caught an unexpected exception!");
- ex.printStackTrace();
- }
- }
-}
+ private void testInAppClientContainer() {
+ System.out.println("Creating new Context ...");
+ try {
+ InitialContext ctx = new InitialContext();
+ Object obj = ctx.lookup("java:comp/InAppClientContainer");
+ if (obj == null) {
+ stat.addStatus("testInAppClientContainer", stat.FAIL);
+ return;
+ }
+ Boolean result = (Boolean) obj;
+ if (!result) {
+ stat.addStatus("testInAppClientContainer", stat.FAIL);
+ }
+ System.out.println("Looked up java:comp/InAppClientContainer :"
+ + result);
+ stat.addStatus("testInAppClientContainer", stat.PASS);
+ } catch (Exception ex) {
+ stat.addStatus("testInAppClientContainer", stat.FAIL);
+ System.err.println("Caught an unexpected exception!");
+ ex.printStackTrace();
+ }
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClientthreading.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClientthreading.java
index 522afd8..57cd708 100644
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClientthreading.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClientthreading.java
@@ -31,30 +31,30 @@
public static int count = 0;
public static String ctxFactory;
- public static void main(String[] args) {
+ public static void main(String[] args) {
ctxFactory = args[0];
- System.out.println("Using " + ctxFactory);
- for (int i = 0; i < 300; i++) {
- new EnrollerClientthreading().start();
- }
+ System.out.println("Using " + ctxFactory);
+ for (int i = 0; i < 300; i++) {
+ new EnrollerClientthreading().start();
}
-
+ }
+
public void run() {
try {
- Properties env = new Properties();
- env.put("java.naming.factory.initial", ctxFactory);
- InitialContext ctx = new InitialContext(env);
-
- Object objref = ctx.lookup("ejb/MyStudent");
- System.out.println("Thread #" + ++count + " looked up...ejb/MyStudent");
-
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
- StudentHome.class);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+ Properties env = new Properties();
+ env.put("java.naming.factory.initial", ctxFactory);
+ InitialContext ctx = new InitialContext(env);
+
+ Object objref = ctx.lookup("ejb/MyStudent");
+ System.out.println("Thread #" + ++count + " looked up...ejb/MyStudent");
+
+ StudentHome sHome =
+ (StudentHome) PortableRemoteObject.narrow(objref,
+ StudentHome.class);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
index d2a4674..05b9fc0 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
@@ -22,24 +22,24 @@
public interface Course extends EJBObject {
-
+
/**
* Returns an arraylist of StudentIds taking the course.
- * @exception RemoteException
+ * @exception RemoteException
*/
public ArrayList getStudentIds() throws RemoteException;
/**
* Returns the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public String getName() throws RemoteException;
/**
* Sets the name of the course.
- * @exception RemoteException
- *
+ * @exception RemoteException
+ *
*/
public void setName(String name) throws RemoteException;
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
index c0ff8c4..16bf639 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
@@ -105,7 +105,7 @@
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-enrollerDB");
Context initial = new InitialContext();
Object objref = initial.lookup("ejb/MyEnroller");
- enrollerHome =
+ enrollerHome =
(EnrollerHome) PortableRemoteObject.narrow(objref,
EnrollerHome.class);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
index a969a3b..de8e4fb 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
@@ -30,12 +30,12 @@
*/
public Course create(String courseId, String name)
throws RemoteException, CreateException;
-
+
/**
* Gets a reference to the remote interface to the CourseBean object by Primary Key.
* @exception throws FinderException and RemoteException.
*
*/
- public Course findByPrimaryKey(String courseId)
+ public Course findByPrimaryKey(String courseId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
index 1ed88fd..7cdeee8 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
@@ -21,7 +21,7 @@
import java.rmi.RemoteException;
public interface Enroller extends EJBObject {
-
+
/**
* Enrolls a Student in a course
* @param studentId primary key of the student object
@@ -40,7 +40,7 @@
public void unEnroll(String studentId, String courseId)
throws RemoteException;
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -49,7 +49,7 @@
throws RemoteException;
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
index ce9877f..a0b847a 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
@@ -16,7 +16,7 @@
package com.sun.s1peqe.ejb.bmp.enroller.ejb;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.*;
import java.sql.*;
import javax.sql.*;
@@ -24,7 +24,7 @@
import javax.naming.*;
public class EnrollerBean implements SessionBean {
-
+
private Connection con;
private String dbName = "java:comp/env/jdbc/bmp-enrollerDB";
private SessionContext context;
@@ -59,7 +59,7 @@
}
/**
- * Deletes a Student
+ * Deletes a Student
* @param studentId primary key of the student object
* @exception RemoteException
*/
@@ -72,7 +72,7 @@
}
/**
- * Deletes a Course
+ * Deletes a Course
* @param courseId primary key of the course object
* @exception RemoteException
*/
@@ -162,7 +162,7 @@
String insertStatement =
"insert into enrollment values ( ? , ? )";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(insertStatement);
prepStmt.setString(1, studentId);
@@ -172,7 +172,7 @@
prepStmt.close();
}
- private void deleteEntry(String studentId, String courseId)
+ private void deleteEntry(String studentId, String courseId)
throws SQLException {
String deleteStatement =
@@ -215,13 +215,13 @@
prepStmt.close();
}
- private ArrayList selectStudent(String courseId)
+ private ArrayList selectStudent(String courseId)
throws SQLException {
String selectStatement =
"select studentid " +
"from enrollment where courseid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, courseId);
@@ -237,13 +237,13 @@
return a;
}
- private ArrayList selectCourse(String studentId)
+ private ArrayList selectCourse(String studentId)
throws SQLException {
String selectStatement =
"select courseid " +
"from enrollment where studentid = ? ";
- PreparedStatement prepStmt =
+ PreparedStatement prepStmt =
con.prepareStatement(selectStatement);
prepStmt.setString(1, studentId);
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
index 6a8bd29..ce3cec4 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
@@ -22,9 +22,9 @@
public interface Student extends EJBObject {
-
+
/**
- * Returns the CourseIds that a student is enrolled in.
+ * Returns the CourseIds that a student is enrolled in.
* @param studentId primary key of the student object
* @param courseId primary key of the course object
* @exception RemoteException
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
index 04d951e..6b39aad 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
@@ -98,7 +98,7 @@
courseIds = new ArrayList();
try {
InitialContext ic = new InitialContext();
- dataSource =
+ dataSource =
(DataSource) ic.lookup("java:comp/env/jdbc/bmp-enrollerDB");
Context initial = new InitialContext();
Object objref = initial.lookup("ejb/MyEnroller");
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
index 2ae3de5..fca5446 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
@@ -36,7 +36,7 @@
* @exception throws FinderException and RemoteException.
*
*/
-
- public Student findByPrimaryKey(String studentId)
+
+ public Student findByPrimaryKey(String studentId)
throws FinderException, RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/create_pointbase.sql b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/create_pointbase.sql
index 205d60f..963a923 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/create_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/create_pointbase.sql
@@ -1,37 +1,37 @@
-create table student
-(studentid varchar(3) constraint pk_student primary key,
-name varchar(36));
-
-insert into student
-values ('123', 'Sal Jones');
-insert into student
-values ('221', 'Alice Smith');
-insert into student
-values ('388', 'Elizabeth Willis');
-insert into student
-values ('456', 'Joe Smith');
-
-
-create table course
-(courseid varchar(3) constraint pk_course primary key,
-name varchar(36));
-
-insert into course
-values ('999', 'Advanced Java Programming');
-insert into course
-values ('111', 'J2EE for Smart People');
-insert into course
-values ('333', 'XML Made Easy');
-insert into course
-values ('777', 'An Introduction to Java Programming');
-
-create table enrollment
-(studentid varchar(3),
-courseid varchar(3),
-constraint fk_studentid
-foreign key (studentid)
-references student(studentid),
-constraint fk_courseid
-foreign key (courseid)
-references course(courseid));
-
+create table student
+(studentid varchar(3) constraint pk_student primary key,
+name varchar(36));
+
+insert into student
+values ('123', 'Sal Jones');
+insert into student
+values ('221', 'Alice Smith');
+insert into student
+values ('388', 'Elizabeth Willis');
+insert into student
+values ('456', 'Joe Smith');
+
+
+create table course
+(courseid varchar(3) constraint pk_course primary key,
+name varchar(36));
+
+insert into course
+values ('999', 'Advanced Java Programming');
+insert into course
+values ('111', 'J2EE for Smart People');
+insert into course
+values ('333', 'XML Made Easy');
+insert into course
+values ('777', 'An Introduction to Java Programming');
+
+create table enrollment
+(studentid varchar(3),
+courseid varchar(3),
+constraint fk_studentid
+foreign key (studentid)
+references student(studentid),
+constraint fk_courseid
+foreign key (courseid)
+references course(courseid));
+
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/drop_pointbase.sql b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/drop_pointbase.sql
index 2d0ed15..06e5705 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/drop_pointbase.sql
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/sql/drop_pointbase.sql
@@ -1,3 +1,3 @@
-drop table enrollment;
-drop table student;
-drop table course;
+drop table enrollment;
+drop table student;
+drop table course;
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml
index 58abbd2..6364074 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml
@@ -46,4 +46,4 @@
</artifact:mvn>
</target>
</project>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
index c3df817..bcc6765 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
@@ -37,7 +37,7 @@
InitialContext ic = new InitialContext(props);
return (T) ic.lookup(name);
}
-
+
public NamingEnumeration<NameClassPair> listEmptyString() throws NamingException {
Context context = new InitialContext();
return context.list("");
@@ -57,7 +57,7 @@
Context context = new InitialContext();
return context.listBindings("java:global");
}
-
+
public NamingEnumeration<NameClassPair> listJavaComp() throws NamingException {
Context context = (Context) new InitialContext().lookup("java:comp/");
return context.list("env");
@@ -67,7 +67,7 @@
Context context = (Context) new InitialContext().lookup("java:comp/");
return context.listBindings("env");
}
-
+
public NamingEnumeration<NameClassPair> listJavaModule() throws NamingException {
Context context = (Context) new InitialContext().lookup("java:module/");
return context.list("");
@@ -77,7 +77,7 @@
Context context = (Context) new InitialContext().lookup("java:module/");
return context.listBindings("");
}
-
+
public NamingEnumeration<NameClassPair> listJavaApp() throws NamingException {
Context context = (Context) new InitialContext().lookup("java:app/");
return context.list("");
@@ -87,22 +87,22 @@
Context context = (Context) new InitialContext().lookup("java:app/");
return context.listBindings("");
}
-
+
public void closeNamingEnumerations() throws NamingException {
listEmptyString().close();
listBindingsEmptyString().close();
-
+
listJavaComp().close();
listBindingsJavaComp().close();
-
+
listJavaModule().close();
listBindingsJavaModule().close();
-
+
listJavaApp().close();
listBindingsJavaApp().close();
}
-
- public Boolean getIsInAppClientContainer() {
- return isInAppClientContainer;
- }
+
+ public Boolean getIsInAppClientContainer() {
+ return isInAppClientContainer;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
index 4c855e2..9cbd9de 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
@@ -48,9 +48,9 @@
@Rule
public TestWatcher reportWatcher=new ReportWatcher(stat, "Naming::naming2::ContextTest");
-
+
@Rule public TestName testName = new TestName();
-
+
@BeforeClass public static void setUpClass() {
ejbContainer = EJBContainer.createEJBContainer();
}
@@ -80,34 +80,34 @@
System.out.println("TestBean from lookup: " + b);
System.out.println("DataSource from lookup: " + ds);
}
-
+
@Test public void listEmptyString2() throws NamingException {
System.out.println(testBean.listEmptyString().toString());
}
-
+
@Test public void listEmptyString() throws NamingException {
Context context = ejbContainer.getContext();
NamingEnumeration<NameClassPair> list = context.list("");
assertNotNull(list);
System.out.println("Got NameClassPair: " + toString(list));
}
-
+
@Test public void listBindingsEmptyString2() throws NamingException {
System.out.println(testBean.listBindingsEmptyString().toString());
}
-
+
@Test public void listBindingsEmptyString() throws NamingException {
Context context = ejbContainer.getContext();
NamingEnumeration<Binding> list = context.listBindings("");
assertNotNull(list);
System.out.println("Got Binding: " + toString(list));
}
-
+
@Ignore
@Test public void listGlobal2() throws NamingException {
System.out.println(testBean.listGlobal().toString());
}
-
+
@Ignore //got null componentId
@Test public void listGlobal() throws NamingException {
Context context = ejbContainer.getContext();
@@ -115,12 +115,12 @@
assertNotNull(list);
System.out.println("Got NameClassPair: " + toString(list));
}
-
+
@Ignore
@Test public void listBindingsGlobal2() throws NamingException {
System.out.println(testBean.listBindingsGlobal().toString());
}
-
+
@Ignore
@Test public void listBindingsGlobal() throws NamingException {
Context context = ejbContainer.getContext();
@@ -128,54 +128,54 @@
assertNotNull(list);
System.out.println("Got Binding: " + toString(list));
}
-
+
@Test public void listJavaComp() throws NamingException {
System.out.println(testBean.listJavaComp().toString());
}
-
+
@Test public void listBindingsJavaComp() throws NamingException {
System.out.println(testBean.listBindingsJavaComp().toString());
}
-
+
@Test public void listJavaModule() throws NamingException {
System.out.println(testBean.listJavaModule().toString());
}
-
+
@Test public void listBindingsJavaModule() throws NamingException {
System.out.println(testBean.listBindingsJavaModule().toString());
}
-
+
@Test public void listJavaApp() throws NamingException {
System.out.println(testBean.listJavaApp().toString());
}
-
+
@Test public void listBindingsJavaApp() throws NamingException {
System.out.println(testBean.listBindingsJavaApp().toString());
}
-
+
@Test public void closeNamingEnumerations() throws NamingException {
testBean.closeNamingEnumerations();
}
-
- @Test
- public void getIsInAppClientContainerFromEJB() throws NamingException {
- Boolean isACC = testBean.getIsInAppClientContainer();
- assertFalse(isACC);
- System.out.println("get java:comp/InAppClientContainer from EJB:"
- + isACC);
- }
-
- @Test
- public void getIsInAppClientContainerFromSEClient() throws NamingException {
- String jndiname = "java:comp/InAppClientContainer";
- Context context = new InitialContext();
- Boolean isACC = (Boolean) context.lookup(jndiname);
- assertFalse(isACC);
- System.out
- .println("get "+jndiname+" from java SE client:"
- + isACC);
- }
-
+
+ @Test
+ public void getIsInAppClientContainerFromEJB() throws NamingException {
+ Boolean isACC = testBean.getIsInAppClientContainer();
+ assertFalse(isACC);
+ System.out.println("get java:comp/InAppClientContainer from EJB:"
+ + isACC);
+ }
+
+ @Test
+ public void getIsInAppClientContainerFromSEClient() throws NamingException {
+ String jndiname = "java:comp/InAppClientContainer";
+ Context context = new InitialContext();
+ Boolean isACC = (Boolean) context.lookup(jndiname);
+ assertFalse(isACC);
+ System.out
+ .println("get "+jndiname+" from java SE client:"
+ + isACC);
+ }
+
private String toString(NamingEnumeration<? extends NameClassPair> n) throws NamingException {
StringBuilder sb = new StringBuilder();
sb.append(n.toString()).append(NL);
@@ -185,5 +185,5 @@
}
return sb.toString();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.properties b/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.properties
index 0344ed8..621d009 100644
--- a/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.properties
@@ -15,17 +15,17 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="naming"/>
-<property name="appname" value="${module}-nonfailover"/>
+<property name="appname" value="${module}-nonfailover"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1aspe.naming.nonfailover.client"/>
-<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="test.client"\u0020
+ value="com.sun.s1aspe.naming.nonfailover.client"/>
+<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/naming/nonfailover/build.xml b/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.xml
index facfd62..7274030 100644
--- a/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/nonfailover/build.xml
@@ -32,7 +32,7 @@
&testproperties;
<target name="all" depends="setup,build,run,unsetup"/>
-
+
<target name="setup" depends="init-common">
<antcall target="deploy-jms-common"/>
</target>
@@ -56,10 +56,10 @@
<exec executable="${APPCLIENT}" failonerror="false">
<env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client ${assemble.dir}/${appname}-client.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
+ <arg line="-name ${appname}Client"/>
+ <arg line="-textauth"/>
+ <arg line="-user j2ee"/>
+ <arg line="-password j2ee"/>
</exec>
<sequential>
<sleep seconds="30"/>
@@ -69,7 +69,7 @@
</target>
<target name="restart" depends="init-common">
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="unsetup" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/naming/nonfailover/client/Client.java b/appserver/tests/appserv-tests/devtests/naming/nonfailover/client/Client.java
index 6cfa591..17eb8e5 100644
--- a/appserver/tests/appserv-tests/devtests/naming/nonfailover/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/naming/nonfailover/client/Client.java
@@ -23,30 +23,30 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
- stat.addDescription("This is to test naming nonfailover scenario.\n" +
- "Exisitng and New InitialContexts must be able to "+
- "talk to the server after a restart assuming there "+
- "were no requests during resart.");
+ stat.addDescription("This is to test naming nonfailover scenario.\n" +
+ "Exisitng and New InitialContexts must be able to "+
+ "talk to the server after a restart assuming there "+
+ "were no requests during resart.");
Context jndiContext = null;
QueueConnectionFactory queueConnectionFactory = null;
- Queue queue = null;
- boolean passed = true;
+ Queue queue = null;
+ boolean passed = true;
try {
jndiContext = new InitialContext();
- System.out.println("Context created!!!");
- } catch (NamingException e) {
- System.out.println("Could not create JNDI " +
- "context: " + e.toString());
- stat.addStatus("naming nonfailover main", stat.FAIL);
- stat.printSummary("nonfailoverID");
- passed = false;
+ System.out.println("Context created!!!");
+ } catch (NamingException e) {
+ System.out.println("Could not create JNDI " +
+ "context: " + e.toString());
+ stat.addStatus("naming nonfailover main", stat.FAIL);
+ stat.printSummary("nonfailoverID");
+ passed = false;
System.exit(1);
}
@@ -54,53 +54,53 @@
queueConnectionFactory = (QueueConnectionFactory)
jndiContext.lookup
("java:comp/env/jms/QCFactory");
- System.out.println("looked up QueueConnectionFactory...");
+ System.out.println("looked up QueueConnectionFactory...");
} catch (NamingException e) {
System.out.println("JNDI lookup failed: " +
e.toString());
stat.addStatus("naming nonfailover main", stat.FAIL);
- passed = false;
- stat.printSummary("nonfailoverID");
+ passed = false;
+ stat.printSummary("nonfailoverID");
System.exit(1);
}
- try {
- Thread.sleep(240000);
+ try {
+ Thread.sleep(240000);
} catch (Throwable e) {
System.out.println("Exception occurred: " + e.toString());
- passed = false;
- stat.addStatus("naming nonfailover main", stat.FAIL);
- }
+ passed = false;
+ stat.addStatus("naming nonfailover main", stat.FAIL);
+ }
- try {
- //see if the existing InitialContext is still alive
- if (jndiContext != null) {
- System.out.println("Existing InitialContext is alive after server restart!");
- }
-
- queue = (Queue) jndiContext.lookup("java:comp/env/jms/SampleQueue");
- System.out.println("looked up Queue...");
-
- //creating new InitialContext
- jndiContext = new InitialContext();
- System.out.println("Creating new InitialContext...");
- queueConnectionFactory = (QueueConnectionFactory)
- jndiContext.lookup
- ("java:comp/env/jms/QCFactory");
- System.out.println("looked up QueueConnectionFactory with new InitialContext..." +
- queueConnectionFactory);
-
+ try {
+ //see if the existing InitialContext is still alive
+ if (jndiContext != null) {
+ System.out.println("Existing InitialContext is alive after server restart!");
+ }
+
+ queue = (Queue) jndiContext.lookup("java:comp/env/jms/SampleQueue");
+ System.out.println("looked up Queue...");
+
+ //creating new InitialContext
+ jndiContext = new InitialContext();
+ System.out.println("Creating new InitialContext...");
+ queueConnectionFactory = (QueueConnectionFactory)
+ jndiContext.lookup
+ ("java:comp/env/jms/QCFactory");
+ System.out.println("looked up QueueConnectionFactory with new InitialContext..." +
+ queueConnectionFactory);
+
} catch (NamingException e) {
System.out.println("JNDI lookup failed: " +
e.toString());
stat.addStatus("naming nonfailover main", stat.FAIL);
- stat.printSummary("nonfailoverID");
- passed = false;
+ stat.printSummary("nonfailoverID");
+ passed = false;
System.exit(1);
}
- if (passed) stat.addStatus("naming nonfailover main", stat.PASS);
- stat.printSummary("nonfailoverID");
- System.exit(0);
+ if (passed) stat.addStatus("naming nonfailover main", stat.PASS);
+ stat.printSummary("nonfailoverID");
+ System.exit(0);
} // main
} // class
diff --git a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.properties b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.properties
index f8f0e83..9b6f549 100644
--- a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="orb_annotation"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.xml b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.xml
index b11d957..1a4638d 100644
--- a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,20 +48,20 @@
<param name="hasWebclient" value="true"/>
</antcall>
-
+
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/*Client*.class" />
</antcall>
-
+
<antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
+ </target>
+
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -71,10 +71,10 @@
<param name="appclient.application.args" value="${http.host} ${http.port}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/client/Client.java
index f20859c..9baab08 100644
--- a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/client/Client.java
@@ -24,7 +24,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
private String host;
private String port;
@@ -35,23 +35,23 @@
host = ( args.length > 0) ? args[0] : "localhost";
port = ( args.length > 1) ? args[1] : "4848";
}
-
+
public static void main(String[] args) {
stat.addDescription("orb-annotation-client");
Client client = new Client(args);
client.doTest();
stat.printSummary("orb-annotationID");
}
-
+
public void doTest() {
-
+
String env = null;
try {
- String url = "http://" + host + ":" + port +
+ String url = "http://" + host + ":" + port +
"/orb_annotation/servlet";
System.out.println("invoking webclient servlet at " + url);
int code = invokeServlet(url);
-
+
if(code != 200) {
System.out.println("Incorrect return code: " + code);
stat.addStatus("webclient main", stat.FAIL);
@@ -63,15 +63,15 @@
stat.addStatus("webclient main", stat.FAIL);
ex.printStackTrace();
}
-
+
return;
-
+
}
private int invokeServlet(String url) throws Exception {
-
+
URL u = new URL(url);
-
+
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
@@ -84,6 +84,6 @@
}
return code;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/descriptor/application.xml
index 8438b4a..9e6e5d5 100644
--- a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/descriptor/application.xml
@@ -26,6 +26,6 @@
</web>
</module>
<module>
- <java>orb_annotation-client.jar</java>
+ <java>orb_annotation-client.jar</java>
</module>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/servlet/Servlet.java
index 9d15684..6d7a6db 100644
--- a/appserver/tests/appserv-tests/devtests/naming/orb_annotation/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/naming/orb_annotation/servlet/Servlet.java
@@ -31,54 +31,54 @@
private @Resource(shareable=false) ORB unshareableOrb;
private @Resource ORB shareableOrb;
-
+
public void init( ServletConfig config) throws ServletException {
-
+
super.init(config);
System.out.println("In webclient::servlet... init()");
}
-
+
public void service ( HttpServletRequest req , HttpServletResponse resp ) throws ServletException, IOException {
-
+
resp.setContentType("text/html");
PrintWriter out = resp.getWriter();
-
+
try {
InitialContext ic = new InitialContext();
- //out.println("doing shareable orb test");
+ //out.println("doing shareable orb test");
//out.println("ORB = " + shareableOrb);
POA poa = (POA) shareableOrb.resolve_initial_references("RootPOA");
//out.println("POA = " + poa);
- //out.println("doing unshareable orb test");
+ //out.println("doing unshareable orb test");
//out.println("ORB = " + unshareableOrb);
POA poa1 = (POA) unshareableOrb.resolve_initial_references("RootPOA");
//out.println("POA = " + poa1);
out.println("<HTML> <HEAD> <TITLE> ORB Annotation Test Servlet Output </TITLE> </HEAD> <BODY BGCOLOR=white>");
out.println("<CENTER> <FONT size=+1 COLOR=blue>ORB Annotation Test Servlet </FONT> </CENTER> <p> " );
- out.println("<FONT size=+1 color=red> doing unshareable orb test : </FONT> " + "<br>" );
- out.println("<FONT size=+1 color=red> ORB = " + unshareableOrb + "</FONT> " + "<br>" );
- out.println("<FONT size=+1 color=red> POA = </FONT> " + poa1 + "<br>" );
+ out.println("<FONT size=+1 color=red> doing unshareable orb test : </FONT> " + "<br>" );
+ out.println("<FONT size=+1 color=red> ORB = " + unshareableOrb + "</FONT> " + "<br>" );
+ out.println("<FONT size=+1 color=red> POA = </FONT> " + poa1 + "<br>" );
-out.println("<FONT size=+1 color=red> doing shareable orb test : </FONT> " + "<br>" );
- out.println("<FONT size=+1 color=red> ORB = " + shareableOrb + "</FONT> " + "<br>" );
- out.println("<FONT size=+1 color=red> POA = </FONT> " + poa + "<br>" );
+out.println("<FONT size=+1 color=red> doing shareable orb test : </FONT> " + "<br>" );
+ out.println("<FONT size=+1 color=red> ORB = " + shareableOrb + "</FONT> " + "<br>" );
+ out.println("<FONT size=+1 color=red> POA = </FONT> " + poa + "<br>" );
out.println("</BODY> </HTML> ");
-
+
}catch (Exception ex) {
ex.printStackTrace();
System.out.println("webclient servlet test failed");
throw new ServletException(ex);
- }
+ }
}
-
-
+
+
public void destroy() {
System.out.println("in webclient::servlet destroy");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/run_test.sh b/appserver/tests/appserv-tests/devtests/naming/run_test.sh
index 8764419..6258599 100755
--- a/appserver/tests/appserv-tests/devtests/naming/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/naming/run_test.sh
@@ -50,11 +50,11 @@
}
get_test_target(){
- case $1 in
- naming_all )
- TARGET=all
- export TARGET;;
- esac
+ case $1 in
+ naming_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.properties b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.properties
index c7d9349..8689a1e 100644
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/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="lookup"/>
-<property name="appname" value="${module}-App"/>
+<property name="appname" value="${module}-App"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="app.type" value="war"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.xml b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.xml
index b3aeb5d..8776e9d 100755
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<exec executable="${env.JAVA_HOME}/bin/idlj" failonerror="false">
<arg line="-fall src/Hello.idl"/>
@@ -46,23 +46,23 @@
<copy todir="src/HelloApp">
<fileset dir="HelloApp"/>
</copy>
- <delete dir="HelloApp"/>
-
+ <delete dir="HelloApp"/>
+
<echo message="common.xml: Compiling test source files" level="verbose"/>
<mkdir dir="${build.classes.dir}"/>
<javac srcdir="src"
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</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,**/*.class"/>
+ <param name="webclient.war.classes" value="*.class,**/*.class"/>
</antcall>
</target>
@@ -71,18 +71,18 @@
<target name="deploy" depends="init-common">
<echo message="Deploying via asadmin..."/>
<antcall target="deploy-war-common"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="lookup"/>
- </antcall>
+ <param name="testsuite.id" value="lookup"/>
+ </antcall>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloClient.java b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloClient.java
index 02f36bb..ef92e50 100644
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloClient.java
@@ -29,30 +29,30 @@
public static void main(String args[])
{
try{
- Properties p1 = new Properties();
- p1.put("org.omg.CORBA.ORBClass", "com.inprise.vbroker.orb.ORB");
- p1.put("org.omg.CORBA.ORBSingletonClass", "com.inprise.vbroker.orb.ORBSingleton");
- org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( new String[]{"",""}, p1 );
-
- // get the root naming context
- org.omg.CORBA.Object objRef =
- orb.resolve_initial_references("NameService");
- // Use NamingContextExt instead of NamingContext. This is
- // part of the Interoperable naming Service.
- NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
-
- // resolve the Object Reference in Naming
- String name = "Hello";
- helloImpl = HelloHelper.narrow(ncRef.resolve_str(name));
-
- System.out.println("Obtained a handle on server object: " + helloImpl);
- System.out.println(helloImpl.sayHello());
- helloImpl.shutdown();
+ Properties p1 = new Properties();
+ p1.put("org.omg.CORBA.ORBClass", "com.inprise.vbroker.orb.ORB");
+ p1.put("org.omg.CORBA.ORBSingletonClass", "com.inprise.vbroker.orb.ORBSingleton");
+ org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( new String[]{"",""}, p1 );
- } catch (Exception e) {
+ // get the root naming context
+ org.omg.CORBA.Object objRef =
+ orb.resolve_initial_references("NameService");
+ // Use NamingContextExt instead of NamingContext. This is
+ // part of the Interoperable naming Service.
+ NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
+
+ // resolve the Object Reference in Naming
+ String name = "Hello";
+ helloImpl = HelloHelper.narrow(ncRef.resolve_str(name));
+
+ System.out.println("Obtained a handle on server object: " + helloImpl);
+ System.out.println(helloImpl.sayHello());
+ helloImpl.shutdown();
+
+ } catch (Exception e) {
System.out.println("ERROR : " + e) ;
- e.printStackTrace(System.out);
- }
+ e.printStackTrace(System.out);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloServer.java b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloServer.java
index 4f34597..214a6b6 100644
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloServer.java
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/lookup/src/HelloServer.java
@@ -33,14 +33,14 @@
private ORB orb;
public void setORB(ORB orb_val) {
- orb = orb_val;
+ orb = orb_val;
}
-
+
// implement sayHello() method
public String sayHello() {
return "\nHello world !!\n";
}
-
+
// implement shutdown() method
public void shutdown() {
orb.shutdown(false);
@@ -57,26 +57,26 @@
// add runtime properties here
p.put("org.omg.CORBA.ORBClass", "com.inprise.vbroker.orb.ORB");
p.put("org.omg.CORBA.ORBSingletonClass", "com.inprise.vbroker.orb.ORBSingleton");
-
- // create and initialize the ORB
+
+ // create and initialize the ORB
ORB orb = ORB.init( args, p );
Hashtable env = new Hashtable();
env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY,"org.glassfish.jndi.cosnaming.CNCtxFactory");
env.put("java.naming.corba.orb", orb);
-
-
+
+
// get reference to rootpoa & activate the POAManager
POA rootpoa = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
rootpoa.the_POAManager().activate();
-
+
// create servant and register it with the ORB
HelloImpl helloImpl = new HelloImpl();
- helloImpl.setORB(orb);
-
+ helloImpl.setORB(orb);
+
// get object reference from the servant
org.omg.CORBA.Object ref = rootpoa.servant_to_reference(helloImpl);
Hello href = HelloHelper.narrow(ref);
-
+
// get the root naming context
// NameService invokes the name service
org.omg.CORBA.Object objRef =
@@ -90,27 +90,27 @@
NameComponent path[] = ncRef.to_name( name );
ncRef.rebind(path, href);
-
+
javax.naming.Context nctx = new InitialContext(env);
System.out.println("Bind the HelloServer object to "
+ "name " + "Hello" + "....");
nctx.rebind("Hello", href);
-
+
System.out.println("HelloServer ready and waiting ...");
// wait for invocations from clients
orb.run();
- }
-
+ }
+
catch (Exception e) {
System.err.println("ERROR: " + e);
e.printStackTrace(System.out);
}
-
+
System.out.println("HelloServer Exiting ...");
-
+
}
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.properties b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.properties
index 41479a8..442a990 100644
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.properties
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/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="rmiiiop"/>
-<property name="appname" value="${module}-App"/>
+<property name="appname" value="${module}-App"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="app.type" value="war"/>
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.xml b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.xml
index f62017e..5fdd5c4 100755
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<echo message="common.xml: Compiling source files with vbjc..." level="verbose"/>
<exec executable="/space/Borland/VisiBroker/bin/vbjc" dir="src/Bank" failonerror="false">
@@ -47,54 +47,54 @@
<exec dir="src" executable="/space/Borland/VisiBroker/bin/java2iiop" failonerror="false">
<arg line="Bank.AccountData Bank.AccountManager"/>
</exec>
-
+
<mkdir dir="${build.classes.dir}"/>
<exec dir="src" executable="/space/Borland/VisiBroker/bin/vbjc" failonerror="false">
<arg line="Bank/AccountHelper.java Bank/AccountHolder.java Bank/AccountManagerHelper.java Bank/AccountManagerHolder.java Bank/AccountManagerPOA.java Bank/AccountManagerPOATie.java Bank/AccountOperations.java Bank/AccountPOA.java Bank/_AccountManagerStub.java Bank/_Account_Stub.java Bank/_Account_Tie.java"/>
</exec>
<exec dir="src" executable="/space/Borland/VisiBroker/bin/vbjc" failonerror="false">
- <arg line="AccountImpl.java AccountManagerImpl.java Client.java Server.java"/>
+ <arg line="AccountImpl.java AccountManagerImpl.java Client.java Server.java"/>
</exec>
<copy todir="${build.classes.dir}">
- <fileset dir="src/Bank">
+ <fileset dir="src/Bank">
<exclude name="**/*.java"/>
</fileset>
<fileset dir="src">
- <exclude name="**/*.java"/>
+ <exclude name="**/*.java"/>
</fileset>
-
+
</copy>
-
+
</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,**/*.class"/>
+ <param name="webclient.war.classes" value="*.class,**/*.class"/>
</antcall>
</target>
-
+
<target name="deploy" depends="init-common">
<echo message="Deploying via asadmin..."/>
<antcall target="deploy-war-common"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<antcall target="runwebclient-common">
- <param name="testsuite.id" value="rmiiiop"/>
- </antcall>
+ <param name="testsuite.id" value="rmiiiop"/>
+ </antcall>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/AccountImpl.java b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/AccountImpl.java
index e983e42..86db025 100755
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/AccountImpl.java
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/AccountImpl.java
@@ -17,7 +17,7 @@
// AccountImpl.java
public class AccountImpl extends Bank.AccountPOA {
-
+
public AccountImpl(Bank.AccountData data) {
_name = data.getName();
_balance = data.getBalance();
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Bank/Account.java b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Bank/Account.java
index 8ceb7a8..2da9985 100755
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Bank/Account.java
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Bank/Account.java
@@ -21,4 +21,4 @@
float getBalance () throws java.rmi.RemoteException;
void setBalance (float bal) throws java.rmi.RemoteException;
}
-
+
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Client.java b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Client.java
index 0e93da4..28e6914 100755
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Client.java
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Client.java
@@ -25,8 +25,8 @@
// Get the manager Id
byte[] managerId = "RMIBankManager".getBytes();
// Locate an account manager. Give the full POA name and the servant ID.
- Bank.AccountManager manager =
- Bank.AccountManagerHelper.bind(orb, "/rmi_bank_poa", managerId);
+ Bank.AccountManager manager =
+ Bank.AccountManagerHelper.bind(orb, "/rmi_bank_poa", managerId);
// Use any number of argument pairs to indicate name,balance of accounts to create
if (args.length == 0 || args.length % 2 != 0) {
args = new String[2];
@@ -47,10 +47,10 @@
Bank.Account account = manager.create(data);
System.out.println
("Created account for " + name + " with opening balance of $" + balance);
- }
-
+ }
+
java.util.Hashtable accounts = manager.getAccounts();
-
+
for (java.util.Enumeration e = accounts.elements(); e.hasMoreElements();) {
Bank.Account account = Bank.AccountHelper.narrow((org.omg.CORBA.Object)e.nextElement());
String name = account.name();
diff --git a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Server.java b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Server.java
index ee7e9b8..0b83e37 100755
--- a/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Server.java
+++ b/appserver/tests/appserv-tests/devtests/naming/visibroker/rmiiiop/src/Server.java
@@ -27,11 +27,11 @@
POA rootPOA = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
// Create policies for our persistent POA
- org.omg.CORBA.Policy[] policies = {
- rootPOA.create_lifespan_policy(LifespanPolicyValue.PERSISTENT)
+ org.omg.CORBA.Policy[] policies = {
+ rootPOA.create_lifespan_policy(LifespanPolicyValue.PERSISTENT)
};
// Create myPOA with the right policies
- POA myPOA = rootPOA.create_POA( "rmi_bank_poa", rootPOA.the_POAManager(),
+ POA myPOA = rootPOA.create_POA( "rmi_bank_poa", rootPOA.the_POAManager(),
policies );
// Create the servant
AccountManagerImpl managerServant = new AccountManagerImpl();
@@ -43,7 +43,7 @@
// Activate the POA manager
rootPOA.the_POAManager().activate();
- System.out.println(myPOA.servant_to_reference(managerServant) +
+ System.out.println(myPOA.servant_to_reference(managerServant) +
" is ready.");
// Wait for incoming requests
orb.run();
diff --git a/appserver/tests/appserv-tests/devtests/persistence/persistence-common.xml b/appserver/tests/appserv-tests/devtests/persistence/persistence-common.xml
index ebec747..f81a63b 100644
--- a/appserver/tests/appserv-tests/devtests/persistence/persistence-common.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/persistence-common.xml
@@ -22,16 +22,16 @@
-->
<!--
- -Ddatabase.properties option can be passed to the ant target to run the persistence
- tests with various databases. Test loads derby.properties as default if no database
+ -Ddatabase.properties option can be passed to the ant target to run the persistence
+ tests with various databases. Test loads derby.properties as default if no database
is specified.
-->
<property name="database.properties" value="${env.APS_HOME}/devtests/persistence/config/derby.properties" />
<property file="${database.properties}" />
<!--
- -Dpersistence.provider option can be passed to the ant target to run the persistence
- tests with various providers. Test loads eclipselink as default if no provider
+ -Dpersistence.provider option can be passed to the ant target to run the persistence
+ tests with various providers. Test loads eclipselink as default if no provider
is specified.
-->
<property name="persistence.provider" value="org.eclipse.persistence.jpa.PersistenceProvider" />
@@ -101,7 +101,7 @@
<mkdir dir="${build.classes.dir}/META-INF"/>
<jar jarfile="${assemble.dir}/${entity.jar}" basedir="${build.classes.dir}" update="true" includes = "${entity.class}">
<metainf dir="${build.classes.dir}/META-INF">
- <include name="**/*.xml"/>
+ <include name="**/*.xml"/>
</metainf>
</jar>
<echo message="----GENERATED----${build.classes.dir}/${entity.jar}" />
@@ -114,10 +114,10 @@
<mkdir dir="${build.classes.dir}/META-INF"/>
<mkdir dir="${assemble.dir}/lib"/>
<move file="${assemble.dir}/entity.jar" todir="${assemble.dir}/lib"/>
- <copy file="${application.xml}"
- tofile="${build.classes.dir}/META-INF/application.xml"
+ <copy file="${application.xml}"
+ tofile="${build.classes.dir}/META-INF/application.xml"
failonerror="false"/>
- <copy file="${glassfish-resources.xml}"
+ <copy file="${glassfish-resources.xml}"
tofile="${build.classes.dir}/META-INF/glassfish-resources.xml"
failonerror="false"/>
<jar jarfile="${assemble.dir}/${appname}App.ear">
@@ -174,7 +174,7 @@
</fileset>
<fileset dir="${build.classes.dir}">
<include name="META-INF/sun-application.xml"/>
- <include name="META-INF/application.xml"/>
+ <include name="META-INF/application.xml"/>
</fileset>
</jar>
</target>
@@ -256,7 +256,7 @@
<include name="*.do"/>
</fileset>
<fileset dir="${build.classes.dir}" casesensitive="true">
- <include name="WEB-INF/web.xml"/>
+ <include name="WEB-INF/web.xml"/>
</fileset>
</jar>
<echo message="created war file ${war.file}"/>
@@ -274,8 +274,8 @@
<echo message="webclient.war.classes=${webclient.war.classes}"/>
<copy file="${web.xml}"
tofile="${build.classes.dir}/WEB-INF/web.xml"/>
- <mkdir dir="${build.classes.dir}/WEB-INF/classes/META-INF"/>
- <copy file="${persistence.xml}"
+ <mkdir dir="${build.classes.dir}/WEB-INF/classes/META-INF"/>
+ <copy file="${persistence.xml}"
tofile="${build.classes.dir}/WEB-INF/classes/META-INF/persistence.xml"/>
<copy todir="${build.classes.dir}/WEB-INF/classes">
<fileset dir="${build.classes.dir}">
@@ -294,7 +294,7 @@
<fileset dir="${build.classes.dir}" casesensitive="true">
<include name="WEB-INF/web.xml"/>
</fileset>
- <fileset dir="${build.classes.dir}" casesensitive="true">
+ <fileset dir="${build.classes.dir}" casesensitive="true">
<include name="WEB-INF/classes/META-INF/persistence.xml"/>
</fileset>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/run_test.sh b/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
index e5c82f9..cee57f0 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
@@ -40,11 +40,11 @@
}
get_test_target(){
- case ${1} in
- persistence_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ persistence_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/build.xml b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/build.xml
index 68d1d54..b59d022 100644
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/build.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/build.xml
@@ -43,10 +43,10 @@
</delete>
<record name="persistence_packaging.output" action="start" />
- <ant dir="pkgEarLibTest" target="all"/>
- <ant dir="pkgEjbTest" target="all"/>
- <ant dir="pkgWarTest" target="all"/>
- <ant dir="pkgWarTest1" target="all"/>
+ <ant dir="pkgEarLibTest" target="all"/>
+ <ant dir="pkgEjbTest" target="all"/>
+ <ant dir="pkgWarTest" target="all"/>
+ <ant dir="pkgWarTest1" target="all"/>
<record name="persistence_packaging.output" action="stop" />
@@ -67,10 +67,10 @@
</target>
<target name="pkgEjbTest">
- <record name="pkgEjbTest.output" action="start" />
+ <record name="pkgEjbTest.output" action="start" />
<ant dir="pkgEjbTest" target="all"/>
- <record name="pkgEjbTest.output" action="stop" />
- <antcall target="report"/>
+ <record name="pkgEjbTest.output" action="stop" />
+ <antcall target="report"/>
</target>
<target name="pkgWarTest">
@@ -88,9 +88,9 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the persistence_packaging tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all the persistence_packaging tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.properties b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.properties
index cb1d44d..dd715dc 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp"/>
-<property name="appname" value="${module}-pkgEarLibTest"/>
+<property name="appname" value="${module}-pkgEarLibTest"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.xml b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.xml
index 2dae4e8..4fcda95 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/build.xml
@@ -66,13 +66,13 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
-</target>
+</target>
<target name="pkg-pu" depends="init-common,compile">
<antcall target="package-pu-common">
<param name="entity.jar" value="entity.jar"/>
<param name="entity.class" value="**/*Customer.class,**/*Order.class"/>
- <param name="persistence.xml" value="descriptor/persistence.xml"/>
+ <param name="persistence.xml" value="descriptor/persistence.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
index fbb21b3..e709bb7 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
@@ -29,7 +29,7 @@
public class AppClient {
- @EJB(name="ejb/Test")
+ @EJB(name="ejb/Test")
private static Test sb;
private static String testSuiteID;
private static SimpleReporterAdapter status =
@@ -37,53 +37,53 @@
public static void main(String[] args) {
- System.out.println("args ->"+ args);
- System.out.println("args0 ->"+ args[0]);
- testSuiteID = args[0];
+ System.out.println("args ->"+ args);
+ System.out.println("args0 ->"+ args[0]);
+ testSuiteID = args[0];
AppClient test = new AppClient();
- status.addDescription("Testing JPA packaging scenarious.."+testSuiteID);
- test.runTest();
- status.printSummary(testSuiteID);
+ status.addDescription("Testing JPA packaging scenarious.."+testSuiteID);
+ test.runTest();
+ status.printSummary(testSuiteID);
}
public void runTest() {
-
+
// Persist all entities
- String testInsert = sb.testInsert();
+ String testInsert = sb.testInsert();
System.out.println("Inserting Customer and Orders... " + testInsert);
- if("OK".equals(testInsert)) {
- status.addStatus(testSuiteID + "-InsertCustomer", status.PASS);
- } else {
- status.addStatus(testSuiteID + "-InsertCustomer", status.FAIL);
+ if("OK".equals(testInsert)) {
+ status.addStatus(testSuiteID + "-InsertCustomer", status.PASS);
+ } else {
+ status.addStatus(testSuiteID + "-InsertCustomer", status.FAIL);
}
- String verInsert = sb.verifyInsert();
+ String verInsert = sb.verifyInsert();
// Test query and navigation
System.out.println("Verifying that all are inserted... " + verInsert);
- if("OK".equals(verInsert)) {
+ if("OK".equals(verInsert)) {
status.addStatus(testSuiteID + "-VerifyCustomerInsert", status.PASS);
} else {
status.addStatus(testSuiteID + "-VerifyCustomerInsert", status.FAIL);
}
- // Get a detached instance
+ // Get a detached instance
String c = "Joe Smith";
- String testDelete = sb.testDelete(c);
+ String testDelete = sb.testDelete(c);
// Remove all entities
System.out.println("Removing all... " + testDelete);
- if("OK".equals(testDelete)) {
+ if("OK".equals(testDelete)) {
status.addStatus(testSuiteID + "-DeleteCustomer", status.PASS);
} else {
status.addStatus(testSuiteID + "-DeleteCustomer", status.FAIL);
}
- String verDelete = sb.verifyDelete();
+ String verDelete = sb.verifyDelete();
// Query the results
System.out.println("Verifying that all are removed... " + verDelete);
- if("OK".equals(verDelete)) {
+ if("OK".equals(verDelete)) {
status.addStatus(testSuiteID + "-VerifyDeleteCustomer", status.PASS);
} else {
status.addStatus(testSuiteID + "-VerifyDeleteCustomer", status.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
index 0f2e355..228e62b 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
@@ -52,10 +52,10 @@
order2.setId(200);
order2.setAddress("567 1st St. Random City, USA");
- // Associate orders with the customer. The association
- // must be set on both sides of the relationship: on the
- // customer side for the orders to be persisted when
- // transaction commits, and on the order side because it
+ // Associate orders with the customer. The association
+ // must be set on both sides of the relationship: on the
+ // customer side for the orders to be persisted when
+ // transaction commits, and on the order side because it
// is the owning side.
customer0.getOrders().add(order1);
order1.setCustomer(customer0);
@@ -65,14 +65,14 @@
return "OK";
}
-
+
public String verifyInsert() {
Customer c = findCustomer("Joe Smith");
Collection<Order> orders = c.getOrders();
if (orders == null || orders.size() != 2) {
- throw new RuntimeException("Unexpected number of orders: "
+ throw new RuntimeException("Unexpected number of orders: "
+ ((orders == null)? "null" : "" + orders.size()));
}
@@ -113,10 +113,10 @@
}
public Customer findCustomer(String name) {
- Query q = em.createQuery("select c from Customer c where c.name = :name");
+ Query q = em.createQuery("select c from Customer c where c.name = :name");
q.setParameter("name", name);
Customer c = (Customer)q.getSingleResult();
- return c;
+ return c;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.properties b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.properties
index 4c6a0b8..2c6cfaf 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp"/>
-<property name="appname" value="${module}-pkgEjbTest"/>
+<property name="appname" value="${module}-pkgEjbTest"/> \u0020
<property name="application.xml" value="descriptor/application.xml"/>
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.xml b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.xml
index d8086de..177aa65 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/build.xml
@@ -38,7 +38,7 @@
<target name="setup" depends="init-common">
<copy file="${persistence.xml}_el" tofile="${persistence.xml}"
overwrite="true" failonerror="false"/>
- <replace file="${persistence.xml}" token="@DBPROVIDER@" value="${persistence.provider}"/>
+ <replace file="${persistence.xml}" token="@DBPROVIDER@" value="${persistence.provider}"/>
<antcall target="create-jdbc-persistence-connpool-common"/>
<antcall target="create-jdbc-resource-common"/>
</target>
@@ -66,7 +66,7 @@
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
-</target>
+</target>
<target name="pkg-pu" depends="init-common,compile">
<antcall target="package-entity-ejb">
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
index fbb21b3..e709bb7 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
@@ -29,7 +29,7 @@
public class AppClient {
- @EJB(name="ejb/Test")
+ @EJB(name="ejb/Test")
private static Test sb;
private static String testSuiteID;
private static SimpleReporterAdapter status =
@@ -37,53 +37,53 @@
public static void main(String[] args) {
- System.out.println("args ->"+ args);
- System.out.println("args0 ->"+ args[0]);
- testSuiteID = args[0];
+ System.out.println("args ->"+ args);
+ System.out.println("args0 ->"+ args[0]);
+ testSuiteID = args[0];
AppClient test = new AppClient();
- status.addDescription("Testing JPA packaging scenarious.."+testSuiteID);
- test.runTest();
- status.printSummary(testSuiteID);
+ status.addDescription("Testing JPA packaging scenarious.."+testSuiteID);
+ test.runTest();
+ status.printSummary(testSuiteID);
}
public void runTest() {
-
+
// Persist all entities
- String testInsert = sb.testInsert();
+ String testInsert = sb.testInsert();
System.out.println("Inserting Customer and Orders... " + testInsert);
- if("OK".equals(testInsert)) {
- status.addStatus(testSuiteID + "-InsertCustomer", status.PASS);
- } else {
- status.addStatus(testSuiteID + "-InsertCustomer", status.FAIL);
+ if("OK".equals(testInsert)) {
+ status.addStatus(testSuiteID + "-InsertCustomer", status.PASS);
+ } else {
+ status.addStatus(testSuiteID + "-InsertCustomer", status.FAIL);
}
- String verInsert = sb.verifyInsert();
+ String verInsert = sb.verifyInsert();
// Test query and navigation
System.out.println("Verifying that all are inserted... " + verInsert);
- if("OK".equals(verInsert)) {
+ if("OK".equals(verInsert)) {
status.addStatus(testSuiteID + "-VerifyCustomerInsert", status.PASS);
} else {
status.addStatus(testSuiteID + "-VerifyCustomerInsert", status.FAIL);
}
- // Get a detached instance
+ // Get a detached instance
String c = "Joe Smith";
- String testDelete = sb.testDelete(c);
+ String testDelete = sb.testDelete(c);
// Remove all entities
System.out.println("Removing all... " + testDelete);
- if("OK".equals(testDelete)) {
+ if("OK".equals(testDelete)) {
status.addStatus(testSuiteID + "-DeleteCustomer", status.PASS);
} else {
status.addStatus(testSuiteID + "-DeleteCustomer", status.FAIL);
}
- String verDelete = sb.verifyDelete();
+ String verDelete = sb.verifyDelete();
// Query the results
System.out.println("Verifying that all are removed... " + verDelete);
- if("OK".equals(verDelete)) {
+ if("OK".equals(verDelete)) {
status.addStatus(testSuiteID + "-VerifyDeleteCustomer", status.PASS);
} else {
status.addStatus(testSuiteID + "-VerifyDeleteCustomer", status.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
index 0f2e355..228e62b 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
@@ -52,10 +52,10 @@
order2.setId(200);
order2.setAddress("567 1st St. Random City, USA");
- // Associate orders with the customer. The association
- // must be set on both sides of the relationship: on the
- // customer side for the orders to be persisted when
- // transaction commits, and on the order side because it
+ // Associate orders with the customer. The association
+ // must be set on both sides of the relationship: on the
+ // customer side for the orders to be persisted when
+ // transaction commits, and on the order side because it
// is the owning side.
customer0.getOrders().add(order1);
order1.setCustomer(customer0);
@@ -65,14 +65,14 @@
return "OK";
}
-
+
public String verifyInsert() {
Customer c = findCustomer("Joe Smith");
Collection<Order> orders = c.getOrders();
if (orders == null || orders.size() != 2) {
- throw new RuntimeException("Unexpected number of orders: "
+ throw new RuntimeException("Unexpected number of orders: "
+ ((orders == null)? "null" : "" + orders.size()));
}
@@ -113,10 +113,10 @@
}
public Customer findCustomer(String name) {
- Query q = em.createQuery("select c from Customer c where c.name = :name");
+ Query q = em.createQuery("select c from Customer c where c.name = :name");
q.setParameter("name", name);
Customer c = (Customer)q.getSingleResult();
- return c;
+ return c;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.properties b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.properties
index 083991b..b2851ee 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp"/>
-<property name="appname" value="${module}-pkgWarTest"/>
+<property name="appname" value="${module}-pkgWarTest"/> \u0020
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.xml b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.xml
index 5ec2b48..3f765da 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/build.xml
@@ -56,7 +56,7 @@
<target name="compile" depends="init-common,clean">
<antcall target="compile-common">
- <param name="src" value="${basedir}/../../../util"/>
+ <param name="src" value="${basedir}/../../../util"/>
</antcall>
<antcall target="compile-common">
<param name="src" value="src/entity"/>
@@ -64,7 +64,7 @@
<antcall target="compile-common">
<param name="src" value="src/web"/>
</antcall>
-</target>
+</target>
<target name="build" depends="init-common,compile">
<antcall target="webclient-pu-war"/>
@@ -72,10 +72,10 @@
destdir="${build.classes.dir}"
classpath="${env.APS_HOME}/lib/reporter.jar"
includes="WebTestUtil.java"/>
- <javac srcdir="src/test"
- destdir="${build.classes.dir}"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="WebTest.java"/>
+ <javac srcdir="src/test"
+ destdir="${build.classes.dir}"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="WebTest.java"/>
</target>
<target name="deploy" depends="init-common">
@@ -84,7 +84,7 @@
<target name="run" depends="init-common">
<java classname="test.WebTest" fork="true">
- <arg value="${testsuite.id}"/>
+ <arg value="${testsuite.id}"/>
<arg value="${http.host}"/>
<arg value="${http.port}"/>
<arg value="${contextroot}"/>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/test/WebTest.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/test/WebTest.java
index 45c8372..d76a947 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/test/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/test/WebTest.java
@@ -43,7 +43,7 @@
System.err.println("Usage: java WebTest <TestSuiteID> <host> <port> <contextRoot> <urlPattern> " );
return;
}
-
+
testSuiteID = args[0];
host = args[1];
port = args[2];
@@ -51,24 +51,24 @@
urlPattern = args[4];
TEST_NAME = testSuiteID;
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
-
- try {
- WebTestUtil wtu = new WebTestUtil ( host, port, contextRoot, urlPattern, testSuiteID, stat);
- stat.addDescription("Persistence Package Test ");
+ public void doTest() {
+
+ try {
+ WebTestUtil wtu = new WebTestUtil ( host, port, contextRoot, urlPattern, testSuiteID, stat);
+ stat.addDescription("Persistence Package Test ");
wtu.test("testInsert");
wtu.test("verifyInsert");
wtu.test("testDelete");
wtu.test("verifyDelete");
- stat.printSummary(TEST_NAME);
+ stat.printSummary(TEST_NAME);
} catch (Exception ex) {
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
index dcfbba0..639f20c 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
@@ -39,7 +39,7 @@
private EntityManagerFactory emf;
private EntityManager em;
private @Resource UserTransaction utx;
-
+
private final int customerId = 1;
private final String customerName = "Joe Smith";
@@ -50,31 +50,31 @@
public boolean processParams(HttpServletRequest request) {
- try {
- if (request.getParameter("case") != null) {
- tc = request.getParameter("case");
- }
- return true;
+ try {
+ if (request.getParameter("case") != null) {
+ tc = request.getParameter("case");
+ }
+ return true;
} catch(Exception ex) {
- System.err.println("Exception when processing the request params");
- ex.printStackTrace();
- return false;
+ System.err.println("Exception when processing the request params");
+ ex.printStackTrace();
+ return false;
}
- }
+ }
public EntityManager getEntityManager()
{
- return emf.createEntityManager();
+ return emf.createEntityManager();
}
public boolean testInsert() {
boolean result = false;
- try {
+ try {
utx.begin();
//out.println("createEM EntityManager=" + em);
- em = getEntityManager();
+ em = getEntityManager();
// Create new customer
Customer customer0 = new Customer();
customer0.setId(customerId);
@@ -102,31 +102,31 @@
customer0.getOrders().add(order2);
order2.setCustomer(customer0);
- utx.commit();
+ utx.commit();
result = true;
}catch(Exception ex){
ex.printStackTrace();
} finally {
- if (em != null) {
- em.close();
- }
- }
+ if (em != null) {
+ em.close();
+ }
+ }
return result;
}
public boolean testDelete() {
boolean result = false;
- try {
+ try {
utx.begin();
- em = getEntityManager();
+ em = getEntityManager();
Customer c = findCustomer(customerName);
Customer c0 = em.merge(c);
- em.remove(c0);
+ em.remove(c0);
utx.commit();
result = true;
} catch(Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
} finally {
if (em != null) {
em.close();
@@ -134,13 +134,13 @@
}
return result;
}
-
+
public boolean verifyInsert() {
boolean result = false;
- try {
+ try {
em = getEntityManager();
- System.out.println("Customer name in verifyInsert:"+customerName);
+ System.out.println("Customer name in verifyInsert:"+customerName);
Customer c = findCustomer(customerName);
Collection<Order> orders = c.getOrders();
@@ -150,9 +150,9 @@
}
result = true;
} finally {
- if (em != null) {
+ if (em != null) {
em.close();
- }
+ }
}
return result;
}
@@ -165,14 +165,14 @@
Query q = em.createQuery("select c from Customer c");
List results = q.getResultList();
if (results == null || results.size() != 0) {
- throw new RuntimeException("Unexpected number of customers after delete");
+ throw new RuntimeException("Unexpected number of customers after delete");
}
q = em.createQuery("select o from Order o");
results = q.getResultList();
if (results == null || results.size() != 0) {
- throw new RuntimeException("Unexpected number of orders after delete");
+ throw new RuntimeException("Unexpected number of orders after delete");
}
result = true;
} finally {
@@ -189,5 +189,5 @@
Customer c = (Customer)q.getSingleResult();
return c;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.properties b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.properties
index ca2424e..0d82078 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejb-cmp"/>
-<property name="appname" value="${module}-pkgWarTest1"/>
+<property name="appname" value="${module}-pkgWarTest1"/> \u0020
<property name="persistence.xml" value="descriptor/persistence.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.xml b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.xml
index f108070..fb88012 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/build.xml
@@ -64,7 +64,7 @@
<antcall target="compile-common">
<param name="src" value="src/web"/>
</antcall>
-</target>
+</target>
<target name="pkg-pu" depends="init-common,compile">
<antcall target="package-pu-common">
@@ -80,10 +80,10 @@
destdir="${build.classes.dir}"
classpath="${env.APS_HOME}/lib/reporter.jar"
includes="WebTestUtil.java"/>
- <javac srcdir="src/test"
+ <javac srcdir="src/test"
destdir="${build.classes.dir}"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="WebTest.java"/>
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="WebTest.java"/>
</target>
<target name="deploy" depends="init-common">
@@ -92,11 +92,11 @@
<target name="run" depends="init-common">
<java classname="test.WebTest" fork="true">
- <arg value="${testsuite.id}"/>
+ <arg value="${testsuite.id}"/>
<arg value="${http.host}"/>
<arg value="${http.port}"/>
<arg value="${contextroot}"/>
- <arg value="${urlpattern}"/>
+ <arg value="${urlpattern}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="${build.classes.dir}"/>
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/test/WebTest.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/test/WebTest.java
index ef2a9d4..e0fefdd 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/test/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/test/WebTest.java
@@ -43,7 +43,7 @@
System.err.println("Usage: java WebTest <TestSuiteID> <host> <port> <contextRoot> <urlPattern> " );
return;
}
-
+
testSuiteID = args[0];
host = args[1];
port = args[2];
@@ -51,24 +51,24 @@
urlPattern = args[4];
TEST_NAME = testSuiteID;
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
-
- try {
- WebTestUtil wtu = new WebTestUtil ( host, port, contextRoot, urlPattern, testSuiteID, stat);
- stat.addDescription("Persistence Pakcage Test ");
+ public void doTest() {
+
+ try {
+ WebTestUtil wtu = new WebTestUtil ( host, port, contextRoot, urlPattern, testSuiteID, stat);
+ stat.addDescription("Persistence Pakcage Test ");
wtu.test("testInsert");
wtu.test("verifyInsert");
wtu.test("testDelete");
wtu.test("verifyDelete");
- stat.printSummary(TEST_NAME);
+ stat.printSummary(TEST_NAME);
} catch (Exception ex) {
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
index 6fa14ef..7358e7b 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
@@ -39,7 +39,7 @@
private EntityManagerFactory emf;
private EntityManager em;
private @Resource UserTransaction utx;
-
+
private final int customerId = 1;
private final String customerName = "Joe Smith";
@@ -51,16 +51,16 @@
public EntityManager getEntityManager()
{
- return emf.createEntityManager();
+ return emf.createEntityManager();
}
public boolean testInsert() {
boolean result = false;
- try {
+ try {
utx.begin();
//out.println("createEM EntityManager=" + em);
- em = getEntityManager();
+ em = getEntityManager();
// Create new customer
Customer customer0 = new Customer();
customer0.setId(customerId);
@@ -88,31 +88,31 @@
customer0.getOrders().add(order2);
order2.setCustomer(customer0);
- utx.commit();
+ utx.commit();
result = true;
}catch(Exception ex){
ex.printStackTrace();
} finally {
- if (em != null) {
- em.close();
- }
- }
+ if (em != null) {
+ em.close();
+ }
+ }
return result;
}
public boolean testDelete() {
boolean result = false;
- try {
+ try {
utx.begin();
- em = getEntityManager();
+ em = getEntityManager();
Customer c = findCustomer(customerName);
Customer c0 = em.merge(c);
- em.remove(c0);
+ em.remove(c0);
utx.commit();
result = true;
} catch(Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
} finally {
if (em != null) {
em.close();
@@ -120,13 +120,13 @@
}
return result;
}
-
+
public boolean verifyInsert() {
boolean result = false;
- try {
+ try {
em = getEntityManager();
- System.out.println("Customer name in verifyInsert:"+customerName);
+ System.out.println("Customer name in verifyInsert:"+customerName);
Customer c = findCustomer(customerName);
Collection<Order> orders = c.getOrders();
@@ -136,9 +136,9 @@
}
result = true;
} finally {
- if (em != null) {
+ if (em != null) {
em.close();
- }
+ }
}
return result;
}
@@ -151,14 +151,14 @@
Query q = em.createQuery("select c from Customer c");
List results = q.getResultList();
if (results == null || results.size() != 0) {
- throw new RuntimeException("Unexpected number of customers after delete");
+ throw new RuntimeException("Unexpected number of customers after delete");
}
q = em.createQuery("select o from Order o");
results = q.getResultList();
if (results == null || results.size() != 0) {
- throw new RuntimeException("Unexpected number of orders after delete");
+ throw new RuntimeException("Unexpected number of orders after delete");
}
result = true;
} finally {
@@ -175,5 +175,5 @@
Customer c = (Customer)q.getSingleResult();
return c;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/report.xml b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/report.xml
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java b/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
index 0dcab18..febf489 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
@@ -30,8 +30,8 @@
import java.lang.reflect.Type;
/** ServletUtil.java
- * This program is generic servlet which process the
- * HTTP request and invoke the
+ * This program is generic servlet which process the
+ * HTTP request and invoke the
* proper methods based on the request parameters.
*
* @author Sarada Kommalapati
@@ -42,27 +42,27 @@
public String tc;
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response)
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response)
throws ServletException, IOException {
processAction(request, response);
}
-
- protected void doPost(HttpServletRequest request,
- HttpServletResponse response)
+
+ protected void doPost(HttpServletRequest request,
+ HttpServletResponse response)
throws ServletException, IOException {
processAction(request, response);
}
-
+
public boolean processParams(HttpServletRequest request) {
try {
if (request.getParameter("case") != null) {
tc = request.getParameter("case");
- }
- return true;
+ }
+ return true;
} catch(Exception ex) {
System.err.println("Exception when processing the request params");
- ex.printStackTrace();
+ ex.printStackTrace();
return false;
}
@@ -70,18 +70,18 @@
public void processAction(HttpServletRequest request,
- HttpServletResponse response)
+ HttpServletResponse response)
throws IOException{
-
+
System.out.println("processing test driver request ... ");
-
- processParams(request);
+
+ processParams(request);
boolean status = false;
System.out.println("tc:"+tc);
response.setContentType("text/plain");
ServletOutputStream out = response.getOutputStream();
- out.println("TestCase: "+tc);
+ out.println("TestCase: "+tc);
if (tc != null) {
@@ -95,34 +95,34 @@
if ( !mname.equals(tc.trim() ) ) {
continue;
}
-
+
System.out.println("Invoking : " + mname );
try {
m.setAccessible( true);
Object o = m.invoke( t );
System.out.println("Returned => " + (Boolean)o );
- status = new Boolean((Boolean)o).booleanValue();
+ status = new Boolean((Boolean)o).booleanValue();
//Handle any methods thrown by method to be invoked
} catch ( InvocationTargetException x ) {
Throwable cause = x.getCause();
-
+
System.err.format("invocation of %s failed: %s%n", mname, cause.getMessage() );
} catch ( IllegalAccessException x ) {
x.printStackTrace();
}
-
+
}
- } catch ( Exception ex ) {
- ex.printStackTrace();
+ } catch ( Exception ex ) {
+ ex.printStackTrace();
}
- if (status) {
- out.println(tc+":pass");
- } else {
- out.println(tc+":fail");
- }
+ if (status) {
+ out.println(tc+":pass");
+ } else {
+ out.println(tc+":fail");
+ }
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/util/WebTestUtil.java b/appserver/tests/appserv-tests/devtests/persistence/util/WebTestUtil.java
index 11ca650..831c4cf 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/util/WebTestUtil.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/util/WebTestUtil.java
@@ -23,7 +23,7 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
/** WebTestUtil.java
- * This program opens HttpURLconnection,sends the request to the
+ * This program opens HttpURLconnection,sends the request to the
* servlet , & receives the response from the servlet.
* Using commandline args the user can specify for WebTestUtil
* 1. test suite name
@@ -57,7 +57,7 @@
this.urlPattern = urlPattern;
this.stat = stat;
}
-
+
public void test( String c) throws Exception {
this.test( c, "");
@@ -84,21 +84,21 @@
} else {
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
- String line = null;
- while ((line = input.readLine()) != null) {
+ String line = null;
+ while ((line = input.readLine()) != null) {
// System.out.println("line="+line);
- if (line.contains(EXPECTED_RESPONSE)) {
- stat.addStatus(TEST_CASE, stat.PASS);
- break;
- }
- }
-
- if (line == null) {
- System.out.println("Unable to find " + EXPECTED_RESPONSE +
- " in the response");
- }
- stat.addStatus(TEST_CASE, stat.FAIL);
- }
+ if (line.contains(EXPECTED_RESPONSE)) {
+ stat.addStatus(TEST_CASE, stat.PASS);
+ break;
+ }
+ }
+
+ if (line == null) {
+ System.out.println("Unable to find " + EXPECTED_RESPONSE +
+ " in the response");
+ }
+ stat.addStatus(TEST_CASE, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/build.properties b/appserver/tests/appserv-tests/devtests/security/anyone/build.properties
index 6111203..2fd7299 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/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="security-anyone"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/build.xml b/appserver/tests/appserv-tests/devtests/security/anyone/build.xml
index ea4d953..a5f3bcb 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/build.xml
@@ -89,7 +89,7 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/nonweb"/>
@@ -103,36 +103,36 @@
</antcall>
<antcall target="package-appclientjar-common">
<param name="appclientjar.files" value="${build.classes.dir}/nonweb"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/client/*.class,com/sun/**/ejb/Hello.class"/>
</antcall>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <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/application.xml"/>
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
-
- <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="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
<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"/>
</fileset>
- </jar>
+ <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+ </jar>
+
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <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"/>
+ </fileset>
+ </jar>
</target>
<target name="deploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java b/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
index 945a8d2..f614dab 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
@@ -51,7 +51,7 @@
try {
description = testSuite + " ejb: hello";
hello.hello("Sun");
- stat.addStatus(description, stat.PASS);
+ stat.addStatus(description, stat.PASS);
} catch(Exception ex) {
ex.printStackTrace();
stat.addStatus(description, stat.FAIL);
@@ -71,7 +71,7 @@
ex.printStackTrace();
stat.addStatus(description, stat.FAIL);
}
-
+
stat.printSummary("security-anyone");
}
diff --git a/appserver/tests/appserv-tests/devtests/security/authConf/build.xml b/appserver/tests/appserv-tests/devtests/security/authConf/build.xml
index 0e1686e..475781c 100644
--- a/appserver/tests/appserv-tests/devtests/security/authConf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/authConf/build.xml
@@ -29,7 +29,7 @@
changed at startup. Issue: 3033. If changed to test an
end to end scenario, please change this message. -->
<project name="security-authConf" basedir="." default="usage">
-
+
&commonSetup;
&commonBuild;
&commonRun;
@@ -43,15 +43,15 @@
<!-- stop server -->
<antcall target="stopDomain"/>
<sleep seconds="15"/>
-
+
<!-- add auth.conf file and provider jar -->
<copy file="conffile/auth.conf"
todir="${admin.domain.dir}/${admin.domain}/config"/>
<antcall target="build-provider-jar"/>
-
+
<!-- start server -->
<antcall target="startDomain"/>
-
+
<!-- quick diff of auth conf file -->
<length file="conffile/auth.conf" property="length.original"/>
<length file="${admin.domain.dir}/${admin.domain}/config/auth.conf"
@@ -69,7 +69,7 @@
</condition>
</fail>
<echo message="files are of same length. OK"/>
-
+
<!-- stop server, clean up, and restart -->
<antcall target="stopDomain"/>
<sleep seconds="15"/>
@@ -77,7 +77,7 @@
<delete file="${provider.jar}"/>
<antcall target="startDomain"/>
</target>
-
+
<!-- build and copy the provider jar file to GF/lib -->
<target name="build-provider-jar" depends="clean">
<antcall target="compile-common">
@@ -85,10 +85,10 @@
</antcall>
<jar destfile="${provider.jar}" basedir="${build.classes.dir}"/>
</target>
-
+
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/config/ServletAuthConfigProvider.java b/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/config/ServletAuthConfigProvider.java
index 33eb20d..32014fa 100644
--- a/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/config/ServletAuthConfigProvider.java
+++ b/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/config/ServletAuthConfigProvider.java
@@ -32,30 +32,30 @@
/**
* This interface is implemented by objects that can be used to obtain
- * authentication context configuration objects, that is,
+ * authentication context configuration objects, that is,
* <code>ClientAuthConfig</code> or <code>ServerAuthConfig</code> objects.
*
- * <p> Authentication context configuration objects serve as sources of
+ * <p> Authentication context configuration objects serve as sources of
* the authentication context objects, that is, <code>ClientAuthContext</code> or
* <code>ServerAuthContext</code> objects, for a specific message layer
* and messaging context.
- *
- * <p> Authentication context objects encapsulate the initialization,
+ *
+ * <p> Authentication context objects encapsulate the initialization,
* configuration, and invocation of authentication modules, that is,
* <code>ClientAuthModule</code> or <code>ServerAuthModule</code> objects, for
- * a specific message exchange within a specific message layer and
+ * a specific message exchange within a specific message layer and
* messaging context.
- *
+ *
* <p> Callers do not directly operate on authentication modules.
* Instead, they rely on a ClientAuthContext or ServerAuthContext
* to manage the invocation of modules. A caller obtains an instance
* of ClientAuthContext or ServerAuthContext by calling the respective
* <code>getAuthContext</code> method on a <code>ClientAuthConfig</code>
- * or <code>ServerAuthConfig</code> object obtained from an
+ * or <code>ServerAuthConfig</code> object obtained from an
* AuthConfigProvider.
*
* <p> The following represents a typical sequence of calls for obtaining
- * a client authentication context object, and then using it to secure
+ * a client authentication context object, and then using it to secure
* a request.
* <ol>
* <li>AuthConfigProvider provider;
@@ -72,15 +72,15 @@
* public AuthConfigProviderImpl(Map properties, AuthConfigFactory factory);
* </code>
*</pre>
- * where the properties argument may be null, and where all values and
+ * where the properties argument may be null, and where all values and
* keys occurring in a non-null properties argument must be of type String.
* When the factory argument is not null, it indicates that the
* provider is to self-register at the factory by calling the following
* method on the factory:
* <pre>
* <code>
- * public String
- * registerConfigProvider(AuthConfigProvider provider, String layer,
+ * public String
+ * registerConfigProvider(AuthConfigProvider provider, String layer,
* String appContext, String description);
* </code>
* </pre>
@@ -92,7 +92,7 @@
*/
public class ServletAuthConfigProvider implements AuthConfigProvider {
- private static ReentrantReadWriteLock rwLock =
+ private static ReentrantReadWriteLock rwLock =
new ReentrantReadWriteLock();
private static Lock rLock = rwLock.readLock();;
private static Lock wLock = rwLock.writeLock();
@@ -101,7 +101,7 @@
private static HashMap defaultAuthConfigMap;
private static String HTTP_SERVLET_LAYER = "HttpServlet";
- private static String MANDATORY_KEY =
+ private static String MANDATORY_KEY =
"jakarta.security.auth.message.MessagePolicy.isMandatory";
private static String MANDATORY_CONTEXT_ID = "mandatory";
@@ -109,7 +109,7 @@
private static String CONTEXTS_KEY = "AppContextIDs";
private static String MODULE_KEY = "ServerAuthModule";
-
+
private static String defaultModule = null;
private static Map defaultModuleOptions = null;
@@ -123,148 +123,148 @@
public ServletAuthConfigProvider
(Map properties, AuthConfigFactory factory) throws AuthException {
- if (properties == null) {
- throw new AuthException("properties required for construction");
- }
+ if (properties == null) {
+ throw new AuthException("properties required for construction");
+ }
- String module = (String) properties.get(MODULE_KEY);
- if (module == null) {
- throw new AuthException("ServerAuthModule property is required");
- }
+ String module = (String) properties.get(MODULE_KEY);
+ if (module == null) {
+ throw new AuthException("ServerAuthModule property is required");
+ }
- HashMap options = new HashMap(properties);
- options.remove(MODULE_KEY);
+ HashMap options = new HashMap(properties);
+ options.remove(MODULE_KEY);
- String[] contextID = parseStringValue
- ((String) properties.get(CONTEXTS_KEY));
-
- options.remove(CONTEXTS_KEY);
+ String[] contextID = parseStringValue
+ ((String) properties.get(CONTEXTS_KEY));
- System.err.println("constructing ServletAuthConfigProvider: " +
- module);
+ options.remove(CONTEXTS_KEY);
- if (contextID != null) {
-
- for (String appContext : contextID) {
+ System.err.println("constructing ServletAuthConfigProvider: " +
+ module);
- System.err.println("constructing ServletServerAuthConfig: " +
- appContext);
+ if (contextID != null) {
- if (appContext != null && appContext.length() > 0) {
+ for (String appContext : contextID) {
- ServerAuthConfig sAC = new ServletServerAuthConfig
- (appContext,module,options);
-
- try {
- wLock.lock();
- authConfigMap.put(appContext,sAC);
- } finally {
- wLock.unlock();
- }
+ System.err.println("constructing ServletServerAuthConfig: " +
+ appContext);
- if (factory != null) {
- factory.registerConfigProvider
- (this,HTTP_SERVLET_LAYER,appContext,module);
- }
- }
- }
- } else {
- // record defaults to handle registration for all appcontexts
- try {
- wLock.lock();
- defaultModule = module;
- defaultModuleOptions = options;
- defaultAuthConfigMap = new HashMap();
- } finally {
- wLock.unlock();
- }
- }
+ if (appContext != null && appContext.length() > 0) {
+
+ ServerAuthConfig sAC = new ServletServerAuthConfig
+ (appContext,module,options);
+
+ try {
+ wLock.lock();
+ authConfigMap.put(appContext,sAC);
+ } finally {
+ wLock.unlock();
+ }
+
+ if (factory != null) {
+ factory.registerConfigProvider
+ (this,HTTP_SERVLET_LAYER,appContext,module);
+ }
+ }
+ }
+ } else {
+ // record defaults to handle registration for all appcontexts
+ try {
+ wLock.lock();
+ defaultModule = module;
+ defaultModuleOptions = options;
+ defaultAuthConfigMap = new HashMap();
+ } finally {
+ wLock.unlock();
+ }
+ }
}
private static String[] parseStringValue(String value) {
- String[] rvalue = null;
- if (value != null) {
-
- // removed blank
+ String[] rvalue = null;
+ if (value != null) {
+
+ // removed blank
String delim = new String(":,;");
- StringTokenizer tokenizer = new StringTokenizer(value,delim);
- int count = tokenizer.countTokens();
- if (count > 0) {
- rvalue = new String[count];
- for (int i = 0; i < count; i++) {
- rvalue[i] = tokenizer.nextToken();
- }
- }
- }
- return rvalue;
+ StringTokenizer tokenizer = new StringTokenizer(value,delim);
+ int count = tokenizer.countTokens();
+ if (count > 0) {
+ rvalue = new String[count];
+ for (int i = 0; i < count; i++) {
+ rvalue[i] = tokenizer.nextToken();
+ }
+ }
+ }
+ return rvalue;
}
public ClientAuthConfig getClientAuthConfig
- (String layer, String appContext, CallbackHandler handler)
- throws AuthException {
- throw new AuthException("Not implemented");
+ (String layer, String appContext, CallbackHandler handler)
+ throws AuthException {
+ throw new AuthException("Not implemented");
}
- public ServerAuthConfig getServerAuthConfig
- (String layer, String appContext, CallbackHandler handler)
- throws AuthException {
+ public ServerAuthConfig getServerAuthConfig
+ (String layer, String appContext, CallbackHandler handler)
+ throws AuthException {
- if (!HTTP_SERVLET_LAYER.equals(layer)) {
- throw new AuthException("Layer Not implemented");
- }
-
- if (handler == null) {
- throw new AuthException("default handler Not implemented");
- }
+ if (!HTTP_SERVLET_LAYER.equals(layer)) {
+ throw new AuthException("Layer Not implemented");
+ }
- // reuse config for a given layer and appcontext, handler will be
- // set on first access.
+ if (handler == null) {
+ throw new AuthException("default handler Not implemented");
+ }
- ServletServerAuthConfig sSAC = null;
+ // reuse config for a given layer and appcontext, handler will be
+ // set on first access.
- try {
- rLock.lock();
- sSAC = (ServletServerAuthConfig)
- authConfigMap.get(appContext);
- if (sSAC == null) {
- if (defaultAuthConfigMap != null) {
- sSAC = (ServletServerAuthConfig)
- defaultAuthConfigMap.get(appContext);
- }
- }
- if (sSAC != null) {
- sSAC.setHandlerIfNotSet(handler);
- }
- } finally {
- rLock.unlock();
- }
+ ServletServerAuthConfig sSAC = null;
- if (sSAC == null) {
- try {
- wLock.lock();
- if (defaultAuthConfigMap != null) {
- sSAC = (ServletServerAuthConfig)
- defaultAuthConfigMap.get(appContext);
- }
- if (sSAC == null) {
- sSAC = new ServletServerAuthConfig
- (appContext,defaultModule,defaultModuleOptions);
- defaultAuthConfigMap.put(appContext,sSAC);
- }
- } finally {
- rLock.unlock();
- }
- if (sSAC != null) {
- sSAC.setHandlerIfNotSet(handler);
- }
- }
+ try {
+ rLock.lock();
+ sSAC = (ServletServerAuthConfig)
+ authConfigMap.get(appContext);
+ if (sSAC == null) {
+ if (defaultAuthConfigMap != null) {
+ sSAC = (ServletServerAuthConfig)
+ defaultAuthConfigMap.get(appContext);
+ }
+ }
+ if (sSAC != null) {
+ sSAC.setHandlerIfNotSet(handler);
+ }
+ } finally {
+ rLock.unlock();
+ }
- if (sSAC == null) {
- throw new AuthException("context: " + appContext +
- " not configured");
- }
+ if (sSAC == null) {
+ try {
+ wLock.lock();
+ if (defaultAuthConfigMap != null) {
+ sSAC = (ServletServerAuthConfig)
+ defaultAuthConfigMap.get(appContext);
+ }
+ if (sSAC == null) {
+ sSAC = new ServletServerAuthConfig
+ (appContext,defaultModule,defaultModuleOptions);
+ defaultAuthConfigMap.put(appContext,sSAC);
+ }
+ } finally {
+ rLock.unlock();
+ }
+ if (sSAC != null) {
+ sSAC.setHandlerIfNotSet(handler);
+ }
+ }
- return sSAC;
+ if (sSAC == null) {
+ throw new AuthException("context: " + appContext +
+ " not configured");
+ }
+
+ return sSAC;
}
public void refresh() {
@@ -272,214 +272,214 @@
static class ServletServerAuthConfig implements ServerAuthConfig {
- static final Class[] PARAMS = { };
- static final Object[] ARGS = { };
+ static final Class[] PARAMS = { };
+ static final Object[] ARGS = { };
- Lock rLockConfig;
- Lock wLockConfig;
+ Lock rLockConfig;
+ Lock wLockConfig;
- String appContext;
- CallbackHandler cbh;
+ String appContext;
+ CallbackHandler cbh;
- ServerAuthModule modules[] = null;
+ ServerAuthModule modules[] = null;
- ServerAuthContext mandatoryContext;
- ServerAuthContext optionalContext;
+ ServerAuthContext mandatoryContext;
+ ServerAuthContext optionalContext;
- Map options;
+ Map options;
- static MessagePolicy mandatoryPolicy = new MessagePolicy
- ( new MessagePolicy.TargetPolicy[]
- { new MessagePolicy.TargetPolicy
- ( (MessagePolicy.Target[]) null,
- new ServletProtectionPolicy()) } , true);
+ static MessagePolicy mandatoryPolicy = new MessagePolicy
+ ( new MessagePolicy.TargetPolicy[]
+ { new MessagePolicy.TargetPolicy
+ ( (MessagePolicy.Target[]) null,
+ new ServletProtectionPolicy()) } , true);
- static MessagePolicy optionalPolicy = new MessagePolicy
- ( new MessagePolicy.TargetPolicy[]
- { new MessagePolicy.TargetPolicy
- ((MessagePolicy.Target[]) null,
- new ServletProtectionPolicy()) }, false);
-
- ServletServerAuthConfig (String appContext,
- final String clazz, Map options) throws AuthException {
+ static MessagePolicy optionalPolicy = new MessagePolicy
+ ( new MessagePolicy.TargetPolicy[]
+ { new MessagePolicy.TargetPolicy
+ ((MessagePolicy.Target[]) null,
+ new ServletProtectionPolicy()) }, false);
- ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
- rLockConfig = rwLock.readLock();;
- wLockConfig = rwLock.writeLock();
+ ServletServerAuthConfig (String appContext,
+ final String clazz, Map options) throws AuthException {
- this.appContext = appContext;
- this.options = options;
+ ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
+ rLockConfig = rwLock.readLock();;
+ wLockConfig = rwLock.writeLock();
- try {
+ this.appContext = appContext;
+ this.options = options;
- modules = (ServerAuthModule[]) AccessController.doPrivileged
+ try {
- (new java.security.PrivilegedExceptionAction() {
-
- public Object run() throws
+ modules = (ServerAuthModule[]) AccessController.doPrivileged
- java.lang.ClassNotFoundException,
- java.lang.NoSuchMethodException,
- java.lang.InstantiationException,
- java.lang.IllegalAccessException,
- java.lang.reflect.InvocationTargetException {
+ (new java.security.PrivilegedExceptionAction() {
- ClassLoader loader =
- Thread.currentThread().getContextClassLoader();
+ public Object run() throws
- Class c = Class.forName(clazz, true, loader);
+ java.lang.ClassNotFoundException,
+ java.lang.NoSuchMethodException,
+ java.lang.InstantiationException,
+ java.lang.IllegalAccessException,
+ java.lang.reflect.InvocationTargetException {
- java.lang.reflect.Constructor constructor =
- c.getConstructor(PARAMS);
+ ClassLoader loader =
+ Thread.currentThread().getContextClassLoader();
- return new ServerAuthModule[]
- { (ServerAuthModule) constructor.newInstance(ARGS),
- (ServerAuthModule) constructor.newInstance(ARGS)
- };
- }
-
- });
-
- } catch (java.security.PrivilegedActionException pae) {
- AuthException ae = new AuthException();
- ae.initCause(pae.getCause());
- throw ae;
- }
+ Class c = Class.forName(clazz, true, loader);
- System.out.println("created ServletServerAuthConfig: " +
- appContext + " " + clazz);
+ java.lang.reflect.Constructor constructor =
+ c.getConstructor(PARAMS);
- mandatoryContext = null;
- optionalContext = null;
- }
+ return new ServerAuthModule[]
+ { (ServerAuthModule) constructor.newInstance(ARGS),
+ (ServerAuthModule) constructor.newInstance(ARGS)
+ };
+ }
- public ServerAuthContext
- getAuthContext(String authContextID, Subject serviceSubject,
- Map properties) throws AuthException {
+ });
- boolean mandatory = false;
- if (MANDATORY_CONTEXT_ID.equals(authContextID)) {
- mandatory = true;
- } else if (!OPTIONAL_CONTEXT_ID.equals(authContextID)) {
- throw new AuthException("invalid AuthContext ID");
- }
+ } catch (java.security.PrivilegedActionException pae) {
+ AuthException ae = new AuthException();
+ ae.initCause(pae.getCause());
+ throw ae;
+ }
- ServerAuthContext rvalue = null;
+ System.out.println("created ServletServerAuthConfig: " +
+ appContext + " " + clazz);
- try {
- rLockConfig.lock();
- if (mandatory) {
- rvalue = mandatoryContext;
- } else {
- rvalue = optionalContext;
- }
- } finally {
- rLockConfig.unlock();
- }
- if (rvalue == null) {
- try {
- wLockConfig.lock();
- if (options != null && properties != null) {
- properties = new HashMap(properties);
- properties.putAll(options);
- }
-
- if (mandatory) {
- mandatoryContext = new ServletServerAuthContext
- (modules[1],mandatoryPolicy,cbh,properties);
- rvalue = mandatoryContext;
- } else {
- optionalContext = new ServletServerAuthContext
- (modules[0],optionalPolicy,cbh,properties);
- rvalue = optionalContext;
- }
- } finally {
- wLockConfig.unlock();
- }
- }
- return rvalue;
- }
+ mandatoryContext = null;
+ optionalContext = null;
+ }
- public String getMessageLayer() {
- return HTTP_SERVLET_LAYER;
- }
+ public ServerAuthContext
+ getAuthContext(String authContextID, Subject serviceSubject,
+ Map properties) throws AuthException {
- public String getAppContext() {
- return this.appContext;
- }
-
- public String getAuthContextID(MessageInfo messageInfo) {
- if (messageInfo.getMap().containsKey(MANDATORY_KEY)) {
- return MANDATORY_CONTEXT_ID;
- } else {
- return OPTIONAL_CONTEXT_ID;
- }
- }
+ boolean mandatory = false;
+ if (MANDATORY_CONTEXT_ID.equals(authContextID)) {
+ mandatory = true;
+ } else if (!OPTIONAL_CONTEXT_ID.equals(authContextID)) {
+ throw new AuthException("invalid AuthContext ID");
+ }
- public void refresh() {
- }
+ ServerAuthContext rvalue = null;
- public boolean isProtected() {
- return true;
- }
+ try {
+ rLockConfig.lock();
+ if (mandatory) {
+ rvalue = mandatoryContext;
+ } else {
+ rvalue = optionalContext;
+ }
+ } finally {
+ rLockConfig.unlock();
+ }
+ if (rvalue == null) {
+ try {
+ wLockConfig.lock();
+ if (options != null && properties != null) {
+ properties = new HashMap(properties);
+ properties.putAll(options);
+ }
- boolean setHandlerIfNotSet(CallbackHandler handler) {
- try {
- wLockConfig.lock();
- if (this.cbh == null && handler != null) {
- this.cbh = handler;
- return true;
- } else {
- return false;
- }
- } finally {
- wLockConfig.unlock();
- }
- }
+ if (mandatory) {
+ mandatoryContext = new ServletServerAuthContext
+ (modules[1],mandatoryPolicy,cbh,properties);
+ rvalue = mandatoryContext;
+ } else {
+ optionalContext = new ServletServerAuthContext
+ (modules[0],optionalPolicy,cbh,properties);
+ rvalue = optionalContext;
+ }
+ } finally {
+ wLockConfig.unlock();
+ }
+ }
+ return rvalue;
+ }
- static class ServletProtectionPolicy implements
- MessagePolicy.ProtectionPolicy {
-
- ServletProtectionPolicy() {
- }
-
- public String getID() {
- return MessagePolicy.ProtectionPolicy.AUTHENTICATE_SENDER;
- }
- }
+ public String getMessageLayer() {
+ return HTTP_SERVLET_LAYER;
+ }
+
+ public String getAppContext() {
+ return this.appContext;
+ }
+
+ public String getAuthContextID(MessageInfo messageInfo) {
+ if (messageInfo.getMap().containsKey(MANDATORY_KEY)) {
+ return MANDATORY_CONTEXT_ID;
+ } else {
+ return OPTIONAL_CONTEXT_ID;
+ }
+ }
+
+ public void refresh() {
+ }
+
+ public boolean isProtected() {
+ return true;
+ }
+
+ boolean setHandlerIfNotSet(CallbackHandler handler) {
+ try {
+ wLockConfig.lock();
+ if (this.cbh == null && handler != null) {
+ this.cbh = handler;
+ return true;
+ } else {
+ return false;
+ }
+ } finally {
+ wLockConfig.unlock();
+ }
+ }
+
+ static class ServletProtectionPolicy implements
+ MessagePolicy.ProtectionPolicy {
+
+ ServletProtectionPolicy() {
+ }
+
+ public String getID() {
+ return MessagePolicy.ProtectionPolicy.AUTHENTICATE_SENDER;
+ }
+ }
}
static class ServletServerAuthContext implements ServerAuthContext {
- ServerAuthModule module;
+ ServerAuthModule module;
- ServletServerAuthContext (ServerAuthModule module,
- MessagePolicy requestPolicy,
- CallbackHandler cbh,
- Map options) throws AuthException {
+ ServletServerAuthContext (ServerAuthModule module,
+ MessagePolicy requestPolicy,
+ CallbackHandler cbh,
+ Map options) throws AuthException {
- module.initialize(requestPolicy,null,cbh,options);
- this.module = module;
- }
+ module.initialize(requestPolicy,null,cbh,options);
+ this.module = module;
+ }
- public AuthStatus validateRequest
- (MessageInfo messageInfo, Subject clientSubject,
- Subject serviceSubject) throws AuthException {
- return module.validateRequest
- (messageInfo,clientSubject,serviceSubject);
- }
+ public AuthStatus validateRequest
+ (MessageInfo messageInfo, Subject clientSubject,
+ Subject serviceSubject) throws AuthException {
+ return module.validateRequest
+ (messageInfo,clientSubject,serviceSubject);
+ }
- public AuthStatus secureResponse
- (MessageInfo messageInfo, Subject serviceSubject)
- throws AuthException {
- return module.secureResponse(messageInfo,serviceSubject);
- }
+ public AuthStatus secureResponse
+ (MessageInfo messageInfo, Subject serviceSubject)
+ throws AuthException {
+ return module.secureResponse(messageInfo,serviceSubject);
+ }
- public void cleanSubject(MessageInfo messageInfo, Subject subject)
- throws AuthException {
- module.cleanSubject(messageInfo,subject);
- }
-
+ public void cleanSubject(MessageInfo messageInfo, Subject subject)
+ throws AuthException {
+ module.cleanSubject(messageInfo,subject);
+ }
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/module/SPNEGOServerAuthModule.java b/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/module/SPNEGOServerAuthModule.java
index 6f6d018..e8e4428 100644
--- a/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/module/SPNEGOServerAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/authConf/provider/com/sun/security/auth/message/module/SPNEGOServerAuthModule.java
@@ -51,7 +51,7 @@
import com.sun.security.jgss.GSSUtil;
/**
- * An implementation of this interface is used to validate received service
+ * An implementation of this interface is used to validate received service
* request messages, and to secure service response messages.
*
* @version %I%, %G%
@@ -65,16 +65,16 @@
private static String DEBUG_OPTIONS_KEY ="debug";
- private static String ASSIGN_GROUPS_OPTIONS_KEY =
+ private static String ASSIGN_GROUPS_OPTIONS_KEY =
"assign.groups";
- private static String POLICY_CONTEXT_OPTIONS_KEY =
+ private static String POLICY_CONTEXT_OPTIONS_KEY =
"jakarta.security.jacc.PolicyContext";
- public static final String AUTH_TYPE_INFO_KEY =
+ public static final String AUTH_TYPE_INFO_KEY =
"jakarta.servlet.http.authType";
- private static String IS_MANDATORY_INFO_KEY =
+ private static String IS_MANDATORY_INFO_KEY =
"jakarta.security.auth.message.MessagePolicy.isMandatory";
private static String AUTHORIZATION_HEADER = "authorization";
@@ -85,12 +85,12 @@
private static String NTLM_INITIAL_TOKEN = "NTLMSSP";
- private static Class[] supportedMessageTypes = new Class[]
- {
- jakarta.servlet.http.HttpServletRequest.class,
- jakarta.servlet.http.HttpServletResponse.class
- };
-
+ private static Class[] supportedMessageTypes = new Class[]
+ {
+ jakarta.servlet.http.HttpServletRequest.class,
+ jakarta.servlet.http.HttpServletResponse.class
+ };
+
private MessagePolicy requestPolicy;
private MessagePolicy responsePolicy;
@@ -119,71 +119,71 @@
* <p> The request policy and the response policy must not both be null.
*
* @param requestPolicy The request policy this module must enforce,
- * or null.
+ * or null.
*
* @param responsePolicy The response policy this module must enforce,
- * or null.
+ * or null.
*
* @param handler CallbackHandler used to request information.
*
* @param options A Map of module-specific configuration properties.
*
* @exception AuthException If module initialization fails, including for
- * the case where the options argument contains elements that are not
+ * the case where the options argument contains elements that are not
* supported by the module.
*/
public void initialize(MessagePolicy requestPolicy,
- MessagePolicy responsePolicy,
- CallbackHandler handler,
- Map options)
- throws AuthException {
+ MessagePolicy responsePolicy,
+ CallbackHandler handler,
+ Map options)
+ throws AuthException {
- this.requestPolicy = requestPolicy;
- this.responsePolicy = responsePolicy;
+ this.requestPolicy = requestPolicy;
+ this.responsePolicy = responsePolicy;
- this.isMandatory = requestPolicy.isMandatory();
+ this.isMandatory = requestPolicy.isMandatory();
- this.handler = handler;
- this.options = options;
-
- if (options != null) {
- debug = options.containsKey(DEBUG_OPTIONS_KEY);
- policyContextID = (String)
- options.get(POLICY_CONTEXT_OPTIONS_KEY);
- } else {
- debug = false;
- policyContextID = null;
- }
+ this.handler = handler;
+ this.options = options;
- assignedGroups = getAssignedGroupNames();
+ if (options != null) {
+ debug = options.containsKey(DEBUG_OPTIONS_KEY);
+ policyContextID = (String)
+ options.get(POLICY_CONTEXT_OPTIONS_KEY);
+ } else {
+ debug = false;
+ policyContextID = null;
+ }
- debugLevel = (logger.isLoggable(Level.FINE) && !debug) ?
- Level.FINE : Level.INFO;
+ assignedGroups = getAssignedGroupNames();
- gssManager = GSSManager.getInstance();
+ debugLevel = (logger.isLoggable(Level.FINE) && !debug) ?
+ Level.FINE : Level.INFO;
+
+ gssManager = GSSManager.getInstance();
}
/**
- * Get the one or more Class objects representing the message types
+ * Get the one or more Class objects representing the message types
* supported by the module.
*
- * @return An array of Class objects, with at least one element
+ * @return An array of Class objects, with at least one element
* defining a message type supported by the module.
*/
public Class[] getSupportedMessageTypes() {
- return supportedMessageTypes;
+ return supportedMessageTypes;
}
/**
* Authenticate a received service request.
*
- * This method is called to transform the mechanism-specific request
- * message acquired by calling getRequestMessage (on messageInfo)
- * into the validated application message to be returned to the message
- * processing runtime.
- * If the received message is a (mechanism-specific) meta-message,
- * the method implementation must attempt to transform the meta-message
+ * This method is called to transform the mechanism-specific request
+ * message acquired by calling getRequestMessage (on messageInfo)
+ * into the validated application message to be returned to the message
+ * processing runtime.
+ * If the received message is a (mechanism-specific) meta-message,
+ * the method implementation must attempt to transform the meta-message
* into a corresponding mechanism-specific response message, or to the
* validated application request message.
* The runtime will bind a validated application message into the
@@ -192,27 +192,27 @@
* by returning an AuthStatus value or by throwing an AuthException.
*
* @param messageInfo A contextual object that encapsulates the
- * client request and server response objects, and that may be
- * used to save state across a sequence of calls made to the
- * methods of this interface for the purpose of completing a
+ * client request and server response objects, and that may be
+ * used to save state across a sequence of calls made to the
+ * methods of this interface for the purpose of completing a
* secure message exchange.
*
- * @param clientSubject A Subject that represents the source of the
- * service
+ * @param clientSubject A Subject that represents the source of the
+ * service
* request. It is used by the method implementation to store
- * Principals and credentials validated in the request.
+ * Principals and credentials validated in the request.
*
* @param serviceSubject A Subject that represents the recipient of the
- * service request, or null. It may be used by the method
+ * service request, or null. It may be used by the method
* implementation as the source of Principals or credentials to
- * be used to validate the request. If the Subject is not null,
- * the method implementation may add additional Principals or
- * credentials (pertaining to the recipient of the service
+ * be used to validate the request. If the Subject is not null,
+ * the method implementation may add additional Principals or
+ * credentials (pertaining to the recipient of the service
* request) to the Subject.
*
* @return An AuthStatus object representing the completion status of
* the processing performed by the method.
- * The AuthStatus values that may be returned by this method
+ * The AuthStatus values that may be returned by this method
* are defined as follows:
*
* <ul>
@@ -221,16 +221,16 @@
* available by calling getRequestMessage on messageInfo.
*
* <li> AuthStatus.SEND_SUCCESS to indicate that validation/processing
- * of the request message successfully produced the secured application
- * response message (in messageInfo). The secured response message is
+ * of the request message successfully produced the secured application
+ * response message (in messageInfo). The secured response message is
* available by calling getResponseMessage on messageInfo.
*
* <li> AuthStatus.SEND_CONTINUE to indicate that message validation is
* incomplete, and that a preliminary response was returned as the
* response message in messageInfo.
*
- * When this status value is returned to challenge an
- * application request message, the challenged request must be saved
+ * When this status value is returned to challenge an
+ * application request message, the challenged request must be saved
* by the authentication module such that it can be recovered
* when the module's validateRequest message is called to process
* the request returned for the challenge.
@@ -244,152 +244,152 @@
* establishing a failure response message (in messageInfo).
*/
public AuthStatus validateRequest(MessageInfo messageInfo,
- Subject clientSubject,
- Subject serviceSubject) throws AuthException {
+ Subject clientSubject,
+ Subject serviceSubject) throws AuthException {
- assert (messageInfo.getMap().containsKey(IS_MANDATORY_INFO_KEY) ==
- this.isMandatory);
+ assert (messageInfo.getMap().containsKey(IS_MANDATORY_INFO_KEY) ==
+ this.isMandatory);
- HttpServletRequest request =
- (HttpServletRequest) messageInfo.getRequestMessage();
+ HttpServletRequest request =
+ (HttpServletRequest) messageInfo.getRequestMessage();
- HttpServletResponse response =
- (HttpServletResponse) messageInfo.getResponseMessage();
+ HttpServletResponse response =
+ (HttpServletResponse) messageInfo.getResponseMessage();
- debugRequest(request);
+ debugRequest(request);
- // should specify encoder
- String authorization = request.getHeader(AUTHORIZATION_HEADER);
+ // should specify encoder
+ String authorization = request.getHeader(AUTHORIZATION_HEADER);
- if (authorization != null && authorization.startsWith(NEGOTIATE)) {
+ if (authorization != null && authorization.startsWith(NEGOTIATE)) {
- authorization = authorization.substring(NEGOTIATE.length()+1);
+ authorization = authorization.substring(NEGOTIATE.length()+1);
- // should specify a decoder
- byte[] requestToken = Base64.decode(authorization.getBytes());
+ // should specify a decoder
+ byte[] requestToken = Base64.decode(authorization.getBytes());
- try {
+ try {
- GSSContext gssContext =
- gssManager.createContext((GSSCredential) null);
+ GSSContext gssContext =
+ gssManager.createContext((GSSCredential) null);
- byte[] gssToken = gssContext.acceptSecContext
- (requestToken,0,requestToken.length);
-
- if (gssToken != null) {
+ byte[] gssToken = gssContext.acceptSecContext
+ (requestToken,0,requestToken.length);
- byte[] responseToken = Base64.encode(gssToken);
+ if (gssToken != null) {
- response.setHeader(AUTHENTICATION_HEADER,
- "Negotiate" + responseToken);
+ byte[] responseToken = Base64.encode(gssToken);
- debugToken("jmac.servlet.authentication.token",
- responseToken);
- }
+ response.setHeader(AUTHENTICATION_HEADER,
+ "Negotiate" + responseToken);
- if (!gssContext.isEstablished()) {
+ debugToken("jmac.servlet.authentication.token",
+ responseToken);
+ }
- if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,"jmac.gss_dialog_continued");
- }
+ if (!gssContext.isEstablished()) {
- response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
- return AuthStatus.SEND_CONTINUE;
+ if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,"jmac.gss_dialog_continued");
+ }
- } else {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ return AuthStatus.SEND_CONTINUE;
- String mechID;
- try {
- Oid oid = gssContext.getMech();
- mechID = oid.toString();
- } catch (GSSException gsse) {
- mechID = "Undefined GSS Mechanism";
+ } else {
- if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,
- "jmac.gss_mechanism_undefined",gsse);
- }
- }
+ String mechID;
+ try {
+ Oid oid = gssContext.getMech();
+ mechID = oid.toString();
+ } catch (GSSException gsse) {
+ mechID = "Undefined GSS Mechanism";
- GSSName name = gssContext.getSrcName();
+ if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,
+ "jmac.gss_mechanism_undefined",gsse);
+ }
+ }
- if (!setCallerPrincipal(name,clientSubject)) {
+ GSSName name = gssContext.getSrcName();
- return sendFailureMessage
- (response,
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Failed setting caller principal");
- }
+ if (!setCallerPrincipal(name,clientSubject)) {
- /* we may need to add something like a cookie to the
- * response (that will be returned in subsequent requests).
- * At this point, I am presuming that the browser will
- * resend the authorization token.
- */
- messageInfo.getMap().put(AUTH_TYPE_INFO_KEY,mechID);
+ return sendFailureMessage
+ (response,
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "Failed setting caller principal");
+ }
- if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,"jmac.gss_dialog_complete");
- }
+ /* we may need to add something like a cookie to the
+ * response (that will be returned in subsequent requests).
+ * At this point, I am presuming that the browser will
+ * resend the authorization token.
+ */
+ messageInfo.getMap().put(AUTH_TYPE_INFO_KEY,mechID);
- }
+ if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,"jmac.gss_dialog_complete");
+ }
- } catch (GSSException gsse) {
+ }
- if (requestToken != null) {
+ } catch (GSSException gsse) {
- debugToken("jmac.servlet.authorization.token",
- requestToken);
+ if (requestToken != null) {
- if (isNTLMToken(requestToken)) {
+ debugToken("jmac.servlet.authorization.token",
+ requestToken);
- // until we add support for NTLM
- return sendFailureMessage
- (response,
- HttpServletResponse.SC_NOT_IMPLEMENTED,
- "No support for NTLM");
- }
- }
+ if (isNTLMToken(requestToken)) {
- if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,"jmac.gss_dialog_failed",gsse);
- }
+ // until we add support for NTLM
+ return sendFailureMessage
+ (response,
+ HttpServletResponse.SC_NOT_IMPLEMENTED,
+ "No support for NTLM");
+ }
+ }
- // for other errors throw an AuthException
+ if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,"jmac.gss_dialog_failed",gsse);
+ }
- AuthException ae = new AuthException();
- ae.initCause(gsse);
- throw ae;
- }
+ // for other errors throw an AuthException
- } else if (this.isMandatory) {
+ AuthException ae = new AuthException();
+ ae.initCause(gsse);
+ throw ae;
+ }
- response.setHeader(AUTHENTICATION_HEADER,NEGOTIATE);
- response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ } else if (this.isMandatory) {
- if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,"jmac.sevlet_header_added_to_response",
- NEGOTIATE);
- }
+ response.setHeader(AUTHENTICATION_HEADER,NEGOTIATE);
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
- return AuthStatus.SEND_CONTINUE;
+ if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,"jmac.sevlet_header_added_to_response",
+ NEGOTIATE);
+ }
- } else {
+ return AuthStatus.SEND_CONTINUE;
- if (authorization != null) {
- logger.warning("jmac.servlet_authorization_header_ignored");
- }
+ } else {
- if (!setCallerPrincipal(null,clientSubject)) {
- return sendFailureMessage
- (response,
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Failed setting unauthenticated caller principal");
- }
+ if (authorization != null) {
+ logger.warning("jmac.servlet_authorization_header_ignored");
+ }
- }
+ if (!setCallerPrincipal(null,clientSubject)) {
+ return sendFailureMessage
+ (response,
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "Failed setting unauthenticated caller principal");
+ }
- return AuthStatus.SUCCESS;
+ }
+
+ return AuthStatus.SUCCESS;
}
/**
@@ -402,33 +402,33 @@
* by returning an AuthStatus value or by throwing an AuthException.
*
* @param messageInfo A contextual object that encapsulates the
- * client request and server response objects, and that may be
- * used to save state across a sequence of calls made to the
- * methods of this interface for the purpose of completing a
+ * client request and server response objects, and that may be
+ * used to save state across a sequence of calls made to the
+ * methods of this interface for the purpose of completing a
* secure message exchange.
*
- * @param serviceSubject A Subject that represents the source of the
+ * @param serviceSubject A Subject that represents the source of the
* service
* response, or null. It may be used by the method implementation
- * to retrieve Principals and credentials necessary to secure
- * the response. If the Subject is not null,
- * the method implementation may add additional Principals or
- * credentials (pertaining to the source of the service
+ * to retrieve Principals and credentials necessary to secure
+ * the response. If the Subject is not null,
+ * the method implementation may add additional Principals or
+ * credentials (pertaining to the source of the service
* response) to the Subject.
*
* @return An AuthStatus object representing the completion status of
- * the processing performed by the method.
- * The AuthStatus values that may be returned by this method
+ * the processing performed by the method.
+ * The AuthStatus values that may be returned by this method
* are defined as follows:
*
* <ul>
- * <li> AuthStatus.SEND_SUCCESS when the application response
+ * <li> AuthStatus.SEND_SUCCESS when the application response
* message was successfully secured. The secured response message may be
* obtained by calling getResponseMessage on messageInfo.
*
- * <li> AuthStatus.SEND_CONTINUE to indicate that the application response
- * message (within messageInfo) was replaced with a security message
- * that should elicit a security-specific response (in the form of a
+ * <li> AuthStatus.SEND_CONTINUE to indicate that the application response
+ * message (within messageInfo) was replaced with a security message
+ * that should elicit a security-specific response (in the form of a
* request) from the peer.
*
* This status value serves to inform the calling runtime that
@@ -437,7 +437,7 @@
* at least one additional request/response exchange (after having
* sent the response message returned in messageInfo).
*
- * When this status value is returned, the application response must
+ * When this status value is returned, the application response must
* be saved by the authentication module such that it can be recovered
* when the module's validateRequest message is called to process
* the elicited response.
@@ -450,158 +450,158 @@
* @exception AuthException When the message processing failed without
* establishing a failure response message (in messageInfo).
*/
- public AuthStatus secureResponse(MessageInfo messageInfo,
- Subject serviceSubject) throws AuthException {
- return AuthStatus.SEND_SUCCESS;
+ public AuthStatus secureResponse(MessageInfo messageInfo,
+ Subject serviceSubject) throws AuthException {
+ return AuthStatus.SEND_SUCCESS;
}
/**
* Remove method specific principals and credentials from the subject.
*
* @param messageInfo a contextual object that encapsulates the
- * client request and server response objects, and that may be
- * used to save state across a sequence of calls made to the
- * methods of this interface for the purpose of completing a
+ * client request and server response objects, and that may be
+ * used to save state across a sequence of calls made to the
+ * methods of this interface for the purpose of completing a
* secure message exchange.
*
- * @param subject the Subject instance from which the Principals and
+ * @param subject the Subject instance from which the Principals and
* credentials are to be removed.
*
- * @exception AuthException If an error occurs during the Subject
+ * @exception AuthException If an error occurs during the Subject
* processing.
*/
public void cleanSubject(MessageInfo messageInfo, Subject subject)
- throws AuthException {
+ throws AuthException {
}
AuthStatus sendFailureMessage(HttpServletResponse response,
- int status, String message){
- try {
- response.setStatus(status);
- response.sendError(status,message);
- } catch (Throwable t) {
- // status code has been set, and proper AuthStatus will be returned
- logger.log(Level.WARNING,"jmac.servlet_failed_sending_failure",t);
- } finally {
- return AuthStatus.SEND_FAILURE;
- }
+ int status, String message){
+ try {
+ response.setStatus(status);
+ response.sendError(status,message);
+ } catch (Throwable t) {
+ // status code has been set, and proper AuthStatus will be returned
+ logger.log(Level.WARNING,"jmac.servlet_failed_sending_failure",t);
+ } finally {
+ return AuthStatus.SEND_FAILURE;
+ }
}
private boolean setCallerPrincipal(GSSName name,Subject clientSubject) {
-
- Principal caller = null;
- if (name != null) {
+ Principal caller = null;
- // create Subject with principals from name
- Subject s = GSSUtil.createSubject(name,null);
+ if (name != null) {
- Set principals = s.getPrincipals();
-
- if (principals.size() > 0) {
+ // create Subject with principals from name
+ Subject s = GSSUtil.createSubject(name,null);
- clientSubject.getPrincipals().addAll(principals);
+ Set principals = s.getPrincipals();
- // if more than 1 prin, caller selection is unpredictable
+ if (principals.size() > 0) {
- caller = (Principal) principals.iterator().next();
- } else if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,"jmac.no_gss_caller_principal");
- }
- }
+ clientSubject.getPrincipals().addAll(principals);
- CallerPrincipalCallback cPCB =
- new CallerPrincipalCallback(clientSubject,caller);
+ // if more than 1 prin, caller selection is unpredictable
- GroupPrincipalCallback gPCB = new GroupPrincipalCallback
- (clientSubject,(caller == null ? null : assignedGroups));
+ caller = (Principal) principals.iterator().next();
+ } else if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,"jmac.no_gss_caller_principal");
+ }
+ }
- try {
- handler.handle(new Callback[] { cPCB, gPCB } );
- if (debug || logger.isLoggable(Level.FINE)){
- logger.log(debugLevel,"jmac.caller_principal",
- new Object[] { caller } );
- }
- return true;
- } catch (Exception e) {
- // should not happen
- logger.log(Level.WARNING,"jmac.failed_to_set_caller",e);
- }
+ CallerPrincipalCallback cPCB =
+ new CallerPrincipalCallback(clientSubject,caller);
- return false;
+ GroupPrincipalCallback gPCB = new GroupPrincipalCallback
+ (clientSubject,(caller == null ? null : assignedGroups));
+
+ try {
+ handler.handle(new Callback[] { cPCB, gPCB } );
+ if (debug || logger.isLoggable(Level.FINE)){
+ logger.log(debugLevel,"jmac.caller_principal",
+ new Object[] { caller } );
+ }
+ return true;
+ } catch (Exception e) {
+ // should not happen
+ logger.log(Level.WARNING,"jmac.failed_to_set_caller",e);
+ }
+
+ return false;
}
boolean isNTLMToken(byte[] bytes) {
- String s = new String(bytes);
- return s.startsWith(NTLM_INITIAL_TOKEN);
+ String s = new String(bytes);
+ return s.startsWith(NTLM_INITIAL_TOKEN);
}
void debugToken(String message, byte[] bytes) {
- if (debug || logger.isLoggable(Level.FINE)) {
+ if (debug || logger.isLoggable(Level.FINE)) {
- StringBuffer sb = new StringBuffer();
- sb.append("\n");
- sb.append("Token " +
- (Base64.isArrayByteBase64(bytes) ? "is" : "is Not") +
- " Base64 encoded" + "\n");
- sb.append("bytes: " );
- boolean first = true;
- for (byte b : bytes) {
- int i = b;
- if (first) {
- sb.append(i);
- first = false;
- } else {
- sb.append(", " + i);
- }
- }
+ StringBuffer sb = new StringBuffer();
+ sb.append("\n");
+ sb.append("Token " +
+ (Base64.isArrayByteBase64(bytes) ? "is" : "is Not") +
+ " Base64 encoded" + "\n");
+ sb.append("bytes: " );
+ boolean first = true;
+ for (byte b : bytes) {
+ int i = b;
+ if (first) {
+ sb.append(i);
+ first = false;
+ } else {
+ sb.append(", " + i);
+ }
+ }
- logger.log(debugLevel,message,sb);
- }
+ logger.log(debugLevel,message,sb);
+ }
}
void debugRequest(HttpServletRequest request) {
- if (debug || logger.isLoggable(Level.FINE)){
- StringBuffer sb = new StringBuffer();
- sb.append("\n");
- try {
- sb.append("Request: " +request.getRequestURL() + "\n");
- sb.append("UserPrincipal: " + request.getUserPrincipal() + "\n");
- sb.append("AuthType: " + request.getAuthType()+ "\n");
- sb.append("Headers:" + "\n");
- Enumeration names = request.getHeaderNames();
- while (names.hasMoreElements()) {
- String name = (String) names.nextElement();
- sb.append("\t" + name + "\t" + request.getHeader(name) + "\n");
- }
-
- logger.log(debugLevel,"jmac.servlet_request",sb);
+ if (debug || logger.isLoggable(Level.FINE)){
+ StringBuffer sb = new StringBuffer();
+ sb.append("\n");
+ try {
+ sb.append("Request: " +request.getRequestURL() + "\n");
+ sb.append("UserPrincipal: " + request.getUserPrincipal() + "\n");
+ sb.append("AuthType: " + request.getAuthType()+ "\n");
+ sb.append("Headers:" + "\n");
+ Enumeration names = request.getHeaderNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
+ sb.append("\t" + name + "\t" + request.getHeader(name) + "\n");
+ }
- } catch(Throwable t) {
- logger.log(Level.WARNING,"jmac.servlet_debug_request",t);
- }
- }
+ logger.log(debugLevel,"jmac.servlet_request",sb);
+
+ } catch(Throwable t) {
+ logger.log(Level.WARNING,"jmac.servlet_debug_request",t);
+ }
+ }
}
private String[] getAssignedGroupNames() {
- String groupList = (String)
- options.get(ASSIGN_GROUPS_OPTIONS_KEY);
- String[] groups = null;
- if (groupList != null) {
- StringTokenizer tokenizer =
- new StringTokenizer(groupList," ,:,;");
- int count = tokenizer.countTokens();
- if (count > 0) {
- groups = new String[count];
- for (int i = 0; i < count; i++) {
- groups[i] = tokenizer.nextToken();
- }
- }
- }
- return groups;
+ String groupList = (String)
+ options.get(ASSIGN_GROUPS_OPTIONS_KEY);
+ String[] groups = null;
+ if (groupList != null) {
+ StringTokenizer tokenizer =
+ new StringTokenizer(groupList," ,:,;");
+ int count = tokenizer.countTokens();
+ if (count > 0) {
+ groups = new String[count];
+ for (int i = 0; i < count; i++) {
+ groups[i] = tokenizer.nextToken();
+ }
+ }
+ }
+ return groups;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/build.xml b/appserver/tests/appserv-tests/devtests/security/build.xml
index 9d0c12a..a3b200b 100644
--- a/appserver/tests/appserv-tests/devtests/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/build.xml
@@ -85,8 +85,8 @@
<target name="ejb">
<ant dir="negativeRealmPerApp" target="all"/>
- <ant dir="realmPerApp" target="all"/>
- <ant dir="sful" target="all"/>
+ <ant dir="realmPerApp" target="all"/>
+ <ant dir="sful" target="all"/>
</target>
<target name="soteria">
<delete>
@@ -97,13 +97,13 @@
<record name="soteria.output" action="stop" />
<antcall target="report"/>
</target>
-
+
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all security tests)
+ <echo>
+ Usage:
+ ant all (Executes all security tests)
ant ejb (Executes all ejb-related security tests
- ant web (Executes the web tests TBD)
- </echo>
+ ant web (Executes the web tests TBD)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/WebSSLClient.java b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/WebSSLClient.java
index 4def3c4..43913b7 100644
--- a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/WebSSLClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/WebSSLClient.java
@@ -34,7 +34,7 @@
public class WebSSLClient {
private static final String TEST_NAME
- = "security-cert-realm-custom-loginmodule";
+ = "security-cert-realm-custom-loginmodule";
private static final String EXPECTED_RESPONSE
= "This is CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US from index.jsp";
@@ -53,7 +53,7 @@
String sslPassword = args[5];
System.out.println("host/port=" + host + "/" + port);
-
+
try {
stat.addDescription(TEST_NAME);
SSLSocketFactory ssf = getSSLSocketFactory(sslPassword,
@@ -63,9 +63,9 @@
+ port + contextRoot
+ "/index.jsp",
ssf);
-
+
parseResponse(connection);
-
+
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
t.printStackTrace();
@@ -82,7 +82,7 @@
try {
in = new BufferedReader(new InputStreamReader(
connection.getInputStream()));
-
+
String line = null;
while ((line = in.readLine()) != null) {
if (EXPECTED_RESPONSE.equals(line)) {
@@ -112,7 +112,7 @@
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = sslPassword.toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -126,7 +126,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.properties b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.properties
index dab8273..228aa1c 100644
--- a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/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="cert-realm-custom-loginmodule"/>
<property name="appname" value="${module}" />
@@ -27,6 +27,6 @@
<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="appname" value="statefulLoginBean"/>
+<property name="appname" value="statefulLoginBean"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.xml b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.xml
index 3900329..bb14c38 100644
--- a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&commonSecurity;
&testProperties;
-
+
<target name="all" depends="build, setup, deploy, run, undeploy, unsetup"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
@@ -47,7 +47,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" />
</antcall>
@@ -97,24 +97,24 @@
<target name="setup" depends="init-common,prepare-store-common">
<antcall target="env-check" />
- <copy file="${assemble.dir}/test-${appname}.jar"
+ <copy file="${assemble.dir}/test-${appname}.jar"
todir="${env.S1AS_HOME}/lib"/>
- <copy file="${admin.domain.dir}/${admin.domain}/config/login.conf"
+ <copy file="${admin.domain.dir}/${admin.domain}/config/login.conf"
tofile="${admin.domain.dir}/${admin.domain}/config/login.conf.ORIG"/>
- <concat destfile="${admin.domain.dir}/${admin.domain}/config/login.conf" append="true"><![CDATA[certRealm {
+ <concat destfile="${admin.domain.dir}/${admin.domain}/config/login.conf" append="true"><![CDATA[certRealm {
com.sun.s1asdev.security.certrealm.lm.CertificateLM required;
};]]>
- </concat>
+ </concat>
<antcall target="restart-server-instance-common"/>
- <antcall target="asadmin-common">
+ <antcall target="asadmin-common">
<param name="admin.command"
value="set" />
<param name="as.props" value="${as.props}"/>
<param name="operand.props"
value="configs.config.server-config.security-service.auth-realm.certificate.property.jaas-context=certRealm" />
- </antcall>
+ </antcall>
</target>
-
+
<target name="unsetup">
<antcall target="restore"/>
</target>
@@ -130,7 +130,7 @@
<antcall target="remove-store-common"/>
<move file="${admin.domain.dir}/${admin.domain}/config/login.conf.ORIG"
tofile="${admin.domain.dir}/${admin.domain}/config/login.conf"/>
- <delete file="${env.S1AS_HOME}/lib/test-${appname}.jar" failonerror="false"/>
+ <delete file="${env.S1AS_HOME}/lib/test-${appname}.jar" failonerror="false"/>
<antcall target="restart-server-instance-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/descriptor/web.xml
index ca59f71..c49305b 100644
--- a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/descriptor/web.xml
@@ -22,10 +22,10 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
+ <web-resource-name>Protected Area</web-resource-name>
<url-pattern>/index.jsp</url-pattern>
<http-method>DELETE</http-method>
<http-method>GET</http-method>
diff --git a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/src/CertificateLM.java b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/src/CertificateLM.java
index 9e6d334..4a56ba3 100644
--- a/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/src/CertificateLM.java
+++ b/appserver/tests/appserv-tests/devtests/security/cert-realm-custom-loginmodule/src/CertificateLM.java
@@ -38,11 +38,11 @@
// At this point, one has the application name and the DN of
// the certificate. A suitable login decision can be made here.
if (next.startsWith("CN=")) {
- String cname = next.substring(3);
- if (cname.equals("SSLTest")){
- commitUserAuthentication(new String[]{getAppName() + ":alice-group"});
- return;
- }
+ String cname = next.substring(3);
+ if (cname.equals("SSLTest")){
+ commitUserAuthentication(new String[]{getAppName() + ":alice-group"});
+ return;
+ }
}
}
throw new LoginException("No OU found.");
diff --git a/appserver/tests/appserv-tests/devtests/security/ciphertest/CipherTest.java b/appserver/tests/appserv-tests/devtests/security/ciphertest/CipherTest.java
index fbb5e0a..3a4a6cc 100644
--- a/appserver/tests/appserv-tests/devtests/security/ciphertest/CipherTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/ciphertest/CipherTest.java
@@ -77,7 +77,7 @@
}
private static void verbose(String msg) {
- if( VERBOSE_FLAG)
+ if( VERBOSE_FLAG)
System.out.println(msg);
}
@@ -110,7 +110,7 @@
serverPort = Integer.parseInt(args[++i]);
} else if( args[i].intern() == SHOULD_PASS_OPTION.intern() ) {
shouldPass = args[++i];
-
+
/*
* Workaround for JavaSE bug (6518827) where
* arguments of length 0 are not passed in on Windows.
@@ -166,10 +166,10 @@
}
- private static void interactive()
+ private static void interactive()
throws IOException {
- BufferedReader reader =
+ BufferedReader reader =
new BufferedReader(new InputStreamReader(System.in));
while(true) {
@@ -190,7 +190,7 @@
}
}
- private static void nonInteractive(String enabledCipher,
+ private static void nonInteractive(String enabledCipher,
String shouldPass, String shouldFail) {
// if( enabledCipher == null ) {
@@ -207,13 +207,13 @@
ct.run();
}
- private static void nonInteractive(String[] enabledCipher,
+ private static void nonInteractive(String[] enabledCipher,
String shouldPass, String shouldFail) {
// TODO
}
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private int startCipher = -1;
@@ -228,7 +228,7 @@
ciphers[0] = SUPPORTED_CIPHERS[startCipher];
this.shouldPass = shouldPass;
- this.shouldFail = shouldFail;
+ this.shouldFail = shouldFail;
}
@@ -237,9 +237,9 @@
ciphers = new String[1];
ciphers[0] = cipherName;
}
-
+
this.shouldPass = shouldPass;
- this.shouldFail = shouldFail;
+ this.shouldFail = shouldFail;
}
public void run() {
@@ -274,7 +274,7 @@
int index = shouldPass.indexOf(thatPassed[i]);
if( index < 0 ) {
// is not in the should pass, test failed
- System.out.println("Cipher - " + thatPassed[i] +
+ System.out.println("Cipher - " + thatPassed[i] +
" - pased, but should not have. Test failed");
stat.addStatus(testId, stat.FAIL);
return;
@@ -292,7 +292,7 @@
int index = shouldPass.indexOf(thatFailed[i]);
if( index >= 0 ) {
// is in the should pass, but did not
- System.out.println("Cipher - " + thatFailed[i] +
+ System.out.println("Cipher - " + thatFailed[i] +
" - failed, but should have passed. Test failed");
stat.addStatus(testId, stat.FAIL);
return;
@@ -307,7 +307,7 @@
private void doSSLTest(String[] enableCiphers) throws IOException {
- SSLSocketFactory sslSocketFactory =
+ SSLSocketFactory sslSocketFactory =
(SSLSocketFactory)SSLSocketFactory.getDefault();
SSLSocket secureSocket = (SSLSocket)
@@ -319,7 +319,7 @@
BufferedWriter buffWriter = new BufferedWriter(
new OutputStreamWriter(secureSocket.getOutputStream()));
buffWriter.write(HTTP_GET_REQUEST);
- buffWriter.newLine();
+ buffWriter.newLine();
buffWriter.newLine();
buffWriter.flush();
//buffWriter.close();
diff --git a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.properties b/appserver/tests/appserv-tests/devtests/security/ciphertest/build.properties
index 5da4bf9..6fa17b9 100644
--- a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ciphertest/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="security"/>
<property name="sub-module" value="ciphertest"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml b/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml
index 838c8da..d64d7ab 100644
--- a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml
@@ -35,19 +35,19 @@
&commonSecurity;
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all ciphertests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all ciphertests)
+ </echo>
</target>
<target name="all" depends="build, setup, deploy,run, undeploy, unsetup">
</target>
<target name="setup" depends="init-common, prepare-store-common">
- <property name="https.1.port" value="1${https.port}" />
- <property name="https.2.port" value="2${https.port}" />
- <copy file="testsetup.asadmin.template" tofile="testsetup.asadmin" overwrite="true"/>
+ <property name="https.1.port" value="1${https.port}" />
+ <property name="https.2.port" value="2${https.port}" />
+ <copy file="testsetup.asadmin.template" tofile="testsetup.asadmin" overwrite="true"/>
<replace file="testsetup.asadmin">
<replacefilter token="@HTTPS1PORT@" value="${https.1.port}"/>
<replacefilter token="@HTTPS2PORT@" value="${https.2.port}"/>
@@ -101,7 +101,7 @@
<java classname="CipherTest" fork="true">
<classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
</classpath>
<jvmarg value="-Djavax.net.ssl.trustStore=${mytruststore.db.file}"/>
<jvmarg value="-Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
@@ -125,7 +125,7 @@
<property name="https.1.port" value="1${https.port}" />
<property name="https.2.port" value="2${https.port}" />
-
+
<antcall target="cipher-test">
<param name="should-pass-cipher" value=""/>
<param name="enable-cipher" value="SSL_RSA_WITH_DES_CBC_SHA"/>
@@ -159,11 +159,11 @@
<target name="runciphertest-2" depends="init-common">
-
+
<property name="https.1.port" value="1${https.port}" />
<property name="https.2.port" value="2${https.port}" />
-
-<!-- JDK 8 u172 - 3DES cipher suites disabled
+
+<!-- JDK 8 u172 - 3DES cipher suites disabled
<antcall target="cipher-test">
<param name="should-pass-cipher" value="SSL_RSA_WITH_3DES_EDE_CBC_SHA"/>
<param name="enable-cipher" value="SSL_RSA_WITH_3DES_EDE_CBC_SHA"/>
@@ -190,7 +190,7 @@
<param name="enable-cipher" value="SSL_RSA_WITH_NULL_MD5"/>
<param name="https.port" value="${https.2.port}"/>
</antcall>
-
+
<antcall target="cipher-test">
<param name="should-pass-cipher" value="SSL_RSA_WITH_NULL_SHA"/>
<param name="enable-cipher" value="SSL_RSA_WITH_NULL_SHA"/>
@@ -204,8 +204,8 @@
</antcall>
</target>
- <target name="runciphertest-3" depends="init-common">
- <property name="https.1.port" value="1${https.port}" />
+ <target name="runciphertest-3" depends="init-common">
+ <property name="https.1.port" value="1${https.port}" />
<property name="https.2.port" value="2${https.port}" />
<antcall target="cipher-test">
<param name="should-pass-cipher" value=""/>
diff --git a/appserver/tests/appserv-tests/devtests/security/common.xml b/appserver/tests/appserv-tests/devtests/security/common.xml
index 49d52b9..ab81928 100644
--- a/appserver/tests/appserv-tests/devtests/security/common.xml
+++ b/appserver/tests/appserv-tests/devtests/security/common.xml
@@ -71,9 +71,9 @@
<target name="create-user">
<antcall target="create-user-common">
- <param name="user" value="harpreet"/>
- <param name="password" value="harpreet"/>
- <param name="groups" value="employee"/>
+ <param name="user" value="harpreet"/>
+ <param name="password" value="harpreet"/>
+ <param name="groups" value="employee"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/build.properties b/appserver/tests/appserv-tests/devtests/security/container-auth/build.properties
index 34b4055..fd99e29 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/build.properties
@@ -15,6 +15,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="security"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml b/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml
index a1f2537..88e6670 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&commonRun;
&testProperties;
-
+
<target name="all" depends="build, run"/>
<target name="clean" depends="init-common">
@@ -40,41 +40,41 @@
</target>
<target name="compile" depends="clean">
- <mkdir dir="${build.classes.dir}"/>
- <echo message="Compiling test source files" level="verbose"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <echo message="Compiling test source files" level="verbose"/>
<javac srcdir="jauth"
- destdir="${build.classes.dir}"
- classpath="${env.S1AS_HOME}/lib/appserv-rt.jar:${s1astest.classpath}"
- debug="on"
- failonerror="true"
- />
+ destdir="${build.classes.dir}"
+ classpath="${env.S1AS_HOME}/lib/appserv-rt.jar:${s1astest.classpath}"
+ debug="on"
+ failonerror="true"
+ />
</target>
<target name="build" depends="compile">
</target>
<target name="run" depends="init-common">
- <antcall target="runaccxml"/>
+ <antcall target="runaccxml"/>
</target>
-
+
<target name="runaccxml" depends="init-common">
<!--TODO uncomment later-->
- <java classname="AuthConfigTest" fork="yes">
- <classpath>
- <pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}"/>
- <pathelement path="${env.S1AS_HOME}/lib/appserv-admin.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/jmac-api.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/dtds"/>
- <pathelement path="${env.S1AS_HOME}/lib/schemas"/>
- <pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
- </classpath>
- <arg value="xml-parse" />
- <sysproperty key="java.security.debug" value="configfile,configxmlparser"/>
- <sysproperty key="sun-acc.xml.url" value="${env.APS_HOME}/devtests/security/container-auth/testConfig/sun-acc.xml"/>
- <!--<jvmarg value="-Xdebug" />
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8008"/>-->
- </java>
+ <java classname="AuthConfigTest" fork="yes">
+ <classpath>
+ <pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}"/>
+ <pathelement path="${env.S1AS_HOME}/lib/appserv-admin.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/jmac-api.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/dtds"/>
+ <pathelement path="${env.S1AS_HOME}/lib/schemas"/>
+ <pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
+ </classpath>
+ <arg value="xml-parse" />
+ <sysproperty key="java.security.debug" value="configfile,configxmlparser"/>
+ <sysproperty key="sun-acc.xml.url" value="${env.APS_HOME}/devtests/security/container-auth/testConfig/sun-acc.xml"/>
+ <!--<jvmarg value="-Xdebug" />
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8008"/>-->
+ </java>
</target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java
index f8d3eac..286389b 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/AuthConfigTest.java
@@ -28,24 +28,24 @@
* 1. domain.xml test:
*
* %java -Ddomain.xml.url=domain.xml
- * -Djava.security.debug=configfile,configxmlparser
- * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar
- * AuthConfigTest xml-parse
- *
+ * -Djava.security.debug=configfile,configxmlparser
+ * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar
+ * AuthConfigTest xml-parse
+ *
* 2. sun-acc.xml test:
*
* %java -Dsun-acc.xml.url=sun-acc.xml
- * -Djava.security.debug=configfile,configxmlparser
- * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar
- * AuthConfigTest xml-parse
- *
+ * -Djava.security.debug=configfile,configxmlparser
+ * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar
+ * AuthConfigTest xml-parse
+ *
* 3. custom module config file test:
*
* %java -Djava.authconfig=testConfig/config.module
- * -Dconfigfile.parser=file
- * -Djava.security.debug=configfile,configfileparser
- * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar
- * AuthConfigTest file-parse
+ * -Dconfigfile.parser=file
+ * -Djava.security.debug=configfile,configfileparser
+ * -classpath .:classes:config-api.jar:appserv-commons.jar:schema2beans.jar
+ * AuthConfigTest file-parse
*/
public class AuthConfigTest extends Thread {
@@ -53,44 +53,44 @@
private static final String SOAP = "SOAP";
private static final String HTTP = "HTTP";
private static final String EJB = "EJB";
-
+
private static final String testId = "Sec::Container-Auth_Test_Num_";
private static final AuthPolicy configRequest =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_SENDER, true, true);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_SENDER, true, true);
private static final AuthPolicy configResponse =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_CONTENT, true, false);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_CONTENT, true, false);
private static final AuthPolicy ddRequest =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_CONTENT, false, false);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_CONTENT, false, false);
private static final AuthPolicy ddResponse =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_SENDER, false, false);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_SENDER, false, false);
private static final AuthPolicy ddHttpRequest =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_NONE, false, false);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_NONE, false, false);
private static final AuthPolicy ddHttpResponse =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_CONTENT, false, false);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_CONTENT, false, false);
private static final AuthPolicy ddEjbResponse =
- new AuthPolicy(AuthPolicy.SOURCE_AUTH_NONE, true, false);
+ new AuthPolicy(AuthPolicy.SOURCE_AUTH_NONE, true, false);
private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) throws Exception {
-
+
int testnum = 0;
if (args == null || args.length == 0 ||
args[0].equalsIgnoreCase("xml-parse")) {
-
+
testnum = xmlParse(testnum);
-
+
} else if (args[0].equalsIgnoreCase("file-parse")) {
-
+
testnum = fileParse(testnum);
-
+
} else {
throw new Exception("unrecognized command for AuthConfigTest");
}
@@ -103,11 +103,11 @@
AuthConfig config = AuthConfig.getAuthConfig();
ClientAuthContext cac;
ServerAuthContext sac;
-
+
Subject subject = new Subject();
HashMap options;
TestCredential cred1;
-
+
/**
* Test NULL return
*/
@@ -119,18 +119,18 @@
stat.addStatus(testid, stat.PASS);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
if (config.getServerAuthContext(EJB, null, null, null, null) != null) {
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
testnum++;
-
+
/**
* SOAP - CLIENT
*/
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP, "foo", null, null, null);
cac.secureRequest(null, subject, null);
options = new HashMap();
@@ -147,7 +147,7 @@
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
"app1",
ddRequest,
@@ -158,7 +158,7 @@
new HashMap(),
ddRequest,
ddResponse);
-
+
if (!subject.getPublicCredentials().contains(cred1)) {
stat.addStatus(testid+testnum, stat.FAIL);
}else
@@ -166,7 +166,7 @@
cac.disposeSubject(subject, null);
testnum++;
-
+
System.out.println("Testing Container-auth testid = "+testnum);
cac = config.getClientAuthContext(SOAP,
"app4",
@@ -177,7 +177,7 @@
cred1 = new TestCredential("ClientModule1",
new HashMap(),
ddRequest,
- null);
+ null);
if (!subject.getPublicCredentials().contains(cred1)) {
stat.addStatus(testid+testnum, stat.FAIL);
}else
@@ -186,7 +186,7 @@
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
"app3",
null,
@@ -201,11 +201,11 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
"foo",
ddRequest,
@@ -222,11 +222,11 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
null,
ddRequest,
@@ -243,12 +243,12 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
-
+
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
"app1",
ddRequest,
@@ -263,11 +263,11 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
"app1",
null,
@@ -282,13 +282,13 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
// SKIP DD URI8 entry in XML-PARSE case
-
+
cac = config.getClientAuthContext(SOAP,
null,
ddRequest,
@@ -309,7 +309,7 @@
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
cac = config.getClientAuthContext(SOAP,
null,
null,
@@ -326,15 +326,15 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
/**
* SOAP - SERVER
*/
-
+
sac = config.getServerAuthContext(SOAP,
null,
ddRequest,
@@ -352,7 +352,7 @@
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
sac = config.getServerAuthContext(SOAP,
null,
null,
@@ -367,15 +367,15 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
cac.disposeSubject(subject, null);
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
-
+
/**
* SOAP - check null request/response policies
*/
-
+
if (config.getServerAuthContext(SOAP,
"app6",
null,
@@ -384,33 +384,33 @@
stat.addStatus(testid+testnum, stat.FAIL);
}else
stat.addStatus(testid+testnum, stat.PASS);
-
+
testnum++;
System.out.println("Testing Container-auth testid = "+testnum);
}finally{
stat.printSummary();
}
-
+
return testnum;
}
-
+
private static int fileParse(int testnum) throws Exception {
-
+
AuthConfig config = AuthConfig.getAuthConfig();
ClientAuthContext cac;
ServerAuthContext sac;
-
+
Subject subject = new Subject();
HashMap options;
TestCredential cred1;
TestCredential cred2;
-
+
testnum = xmlParse(testnum);
-
+
/**
* test case for multiple modules
*/
-
+
cac = config.getClientAuthContext(SOAP,
"app5",
ddRequest,
@@ -431,11 +431,11 @@
}
cac.disposeSubject(subject, null);
testnum++;
-
+
/**
* HTTP - SERVER
*/
-
+
sac = config.getServerAuthContext(HTTP,
null,
ddHttpRequest,
@@ -452,7 +452,7 @@
}
sac.disposeSubject(subject, null);
testnum++;
-
+
sac = config.getServerAuthContext(HTTP,
"app9",
null,
@@ -469,7 +469,7 @@
}
sac.disposeSubject(subject, null);
testnum++;
-
+
/**
* EJB - SERVER
*/
@@ -489,7 +489,7 @@
}
sac.disposeSubject(subject, null);
testnum++;
-
+
return testnum;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule1.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule1.java
index 0a7ea6a..ea930e5 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule1.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule1.java
@@ -26,26 +26,26 @@
/*
public void initialize(AuthPolicy requestPolicy,
- AuthPolicy responsePolicy,
- CallbackHandler handler,
- Map options) {
+ AuthPolicy responsePolicy,
+ CallbackHandler handler,
+ Map options) {
}
public void secureRequest(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void validateResponse(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void disposeSubject(Subject subject,
- Map sharedState)
- throws AuthException {
+ Map sharedState)
+ throws AuthException {
}
*/
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule2.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule2.java
index 01ccabc..7ee3497 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule2.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ClientModule2.java
@@ -26,26 +26,26 @@
/*
public void initialize(AuthPolicy requestPolicy,
- AuthPolicy responsePolicy,
- CallbackHandler handler,
- Map options) {
+ AuthPolicy responsePolicy,
+ CallbackHandler handler,
+ Map options) {
}
public void secureRequest(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void validateResponse(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void disposeSubject(Subject subject,
- Map sharedState)
- throws AuthException {
+ Map sharedState)
+ throws AuthException {
}
*/
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/CommonModule.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/CommonModule.java
index cb9c5d8..61f8eeb 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/CommonModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/CommonModule.java
@@ -32,73 +32,73 @@
protected CommonModule() { }
public void initialize(AuthPolicy requestPolicy,
- AuthPolicy responsePolicy,
- CallbackHandler handler,
- Map options) {
- this.requestPolicy = requestPolicy;
- this.responsePolicy = responsePolicy;
- this.handler = handler;
- this.options = options;
+ AuthPolicy responsePolicy,
+ CallbackHandler handler,
+ Map options) {
+ this.requestPolicy = requestPolicy;
+ this.responsePolicy = responsePolicy;
+ this.handler = handler;
+ this.options = options;
}
public void secureRequest(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
- if (cred == null) {
- cred = new TestCredential(this.getClass().getName(),
- options,
- requestPolicy,
- responsePolicy);
- }
- subject.getPublicCredentials().add(cred);
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
+ if (cred == null) {
+ cred = new TestCredential(this.getClass().getName(),
+ options,
+ requestPolicy,
+ responsePolicy);
+ }
+ subject.getPublicCredentials().add(cred);
}
public void validateResponse(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
- if (cred == null) {
- cred = new TestCredential(this.getClass().getName(),
- options,
- requestPolicy,
- responsePolicy);
- }
- subject.getPublicCredentials().add(cred);
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
+ if (cred == null) {
+ cred = new TestCredential(this.getClass().getName(),
+ options,
+ requestPolicy,
+ responsePolicy);
+ }
+ subject.getPublicCredentials().add(cred);
}
public void validateRequest(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
- if (cred == null) {
- cred = new TestCredential(this.getClass().getName(),
- options,
- requestPolicy,
- responsePolicy);
- }
- subject.getPublicCredentials().add(cred);
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
+ if (cred == null) {
+ cred = new TestCredential(this.getClass().getName(),
+ options,
+ requestPolicy,
+ responsePolicy);
+ }
+ subject.getPublicCredentials().add(cred);
}
public void secureResponse(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
- if (cred == null) {
- cred = new TestCredential(this.getClass().getName(),
- options,
- requestPolicy,
- responsePolicy);
- }
- subject.getPublicCredentials().add(cred);
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
+ if (cred == null) {
+ cred = new TestCredential(this.getClass().getName(),
+ options,
+ requestPolicy,
+ responsePolicy);
+ }
+ subject.getPublicCredentials().add(cred);
}
public void disposeSubject(Subject subject,
- Map sharedState)
- throws AuthException {
- if (cred != null) {
- subject.getPublicCredentials().remove(cred);
- }
+ Map sharedState)
+ throws AuthException {
+ if (cred != null) {
+ subject.getPublicCredentials().remove(cred);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule1.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule1.java
index 5f58dc6..0b69dab 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule1.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule1.java
@@ -26,26 +26,26 @@
/*
public void initialize(AuthPolicy requestPolicy,
- AuthPolicy responsePolicy,
- CallbackHandler handler,
- Map options) {
+ AuthPolicy responsePolicy,
+ CallbackHandler handler,
+ Map options) {
}
public void validateRequest(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void secureResponse(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void disposeSubject(Subject subject,
- Map sharedState)
- throws AuthException {
+ Map sharedState)
+ throws AuthException {
}
*/
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule2.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule2.java
index e3571fc..b021e34 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule2.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/ServerModule2.java
@@ -26,26 +26,26 @@
/*
public void initialize(AuthPolicy requestPolicy,
- AuthPolicy responsePolicy,
- CallbackHandler handler,
- Map options) {
+ AuthPolicy responsePolicy,
+ CallbackHandler handler,
+ Map options) {
}
public void validateRequest(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void secureResponse(AuthParam param,
- Subject subject,
- Map sharedState)
- throws AuthException {
+ Subject subject,
+ Map sharedState)
+ throws AuthException {
}
public void disposeSubject(Subject subject,
- Map sharedState)
- throws AuthException {
+ Map sharedState)
+ throws AuthException {
}
*/
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/TestCredential.java b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/TestCredential.java
index 5c90820..f092889 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/TestCredential.java
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/jauth/TestCredential.java
@@ -26,40 +26,40 @@
AuthPolicy responsePolicy;
public TestCredential(String moduleClass,
- Map options,
- AuthPolicy requestPolicy,
- AuthPolicy responsePolicy) {
- this.moduleClass = moduleClass;
- this.options = options;
- this.requestPolicy = requestPolicy;
- this.responsePolicy = responsePolicy;
+ Map options,
+ AuthPolicy requestPolicy,
+ AuthPolicy responsePolicy) {
+ this.moduleClass = moduleClass;
+ this.options = options;
+ this.requestPolicy = requestPolicy;
+ this.responsePolicy = responsePolicy;
}
public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
+ if (this == o) {
+ return true;
+ }
- if (!(o instanceof TestCredential)) {
- return false;
- }
- TestCredential that = (TestCredential)o;
+ if (!(o instanceof TestCredential)) {
+ return false;
+ }
+ TestCredential that = (TestCredential)o;
- if (this.moduleClass.equals(that.moduleClass) &&
- this.options.equals(that.options) &&
- (this.requestPolicy == that.requestPolicy ||
- (this.requestPolicy != null &&
- this.requestPolicy.equals(that.requestPolicy))) &&
- (this.responsePolicy == that.responsePolicy ||
- (this.responsePolicy != null &&
- this.responsePolicy.equals(that.responsePolicy)))) {
- return true;
- }
+ if (this.moduleClass.equals(that.moduleClass) &&
+ this.options.equals(that.options) &&
+ (this.requestPolicy == that.requestPolicy ||
+ (this.requestPolicy != null &&
+ this.requestPolicy.equals(that.requestPolicy))) &&
+ (this.responsePolicy == that.responsePolicy ||
+ (this.responsePolicy != null &&
+ this.responsePolicy.equals(that.responsePolicy)))) {
+ return true;
+ }
- return false;
+ return false;
}
public int hashCode() {
- return moduleClass.hashCode() + options.hashCode();
+ return moduleClass.hashCode() + options.hashCode();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/domain.xml b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/domain.xml
index 3b2cd7c..2edda60c 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/domain.xml
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/domain.xml
@@ -143,48 +143,48 @@
- <message-security-config auth-layer="SOAP" default-provider="app7" default-client-provider="app2">
- <provider-config provider-id="app1" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- <provider-config provider-id="app2" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- <property name="option1" value="true"/>
- </provider-config>
- <provider-config provider-id="app3" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- </provider-config>
- <provider-config provider-id="app4" provider-type="client" class-name="ClientModule1">
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- <provider-config provider-id="app5" provider-type="client" class-name="ClientModule1">
- </provider-config>
- <provider-config provider-id="app6" provider-type="server" class-name="ServerModule1">
- </provider-config>
- <provider-config provider-id="app7" provider-type="server" class-name="ServerModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- </message-security-config>
+ <message-security-config auth-layer="SOAP" default-provider="app7" default-client-provider="app2">
+ <provider-config provider-id="app1" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ <provider-config provider-id="app2" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ <property name="option1" value="true"/>
+ </provider-config>
+ <provider-config provider-id="app3" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ </provider-config>
+ <provider-config provider-id="app4" provider-type="client" class-name="ClientModule1">
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ <provider-config provider-id="app5" provider-type="client" class-name="ClientModule1">
+ </provider-config>
+ <provider-config provider-id="app6" provider-type="server" class-name="ServerModule1">
+ </provider-config>
+ <provider-config provider-id="app7" provider-type="server" class-name="ServerModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ </message-security-config>
<!-- not supported yet
- <message-security-config auth-layer="HTTP" default-provider="app8">
- </provider-config>
- <provider-config provider-id="app8" provider-type="server" class-name="ServerModule1">
- </provider-config>
- <provider-config provider-id="app9" provider-type="server" class-name="ServerModule1">
- </message-security-config>
+ <message-security-config auth-layer="HTTP" default-provider="app8">
+ </provider-config>
+ <provider-config provider-id="app8" provider-type="server" class-name="ServerModule1">
+ </provider-config>
+ <provider-config provider-id="app9" provider-type="server" class-name="ServerModule1">
+ </message-security-config>
- <message-security-config auth-layer="EJB" default-provider="app10">
- </provider-config>
- <provider-config provider-id="app10" provider-type="server" class-name="ServerModule1">
- </message-security-config>
+ <message-security-config auth-layer="EJB" default-provider="app10">
+ </provider-config>
+ <provider-config provider-id="app10" provider-type="server" class-name="ServerModule1">
+ </message-security-config>
-->
diff --git a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml
index 690acab..85ef039 100644
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml
@@ -23,48 +23,48 @@
<target-server name="d-usca14-133-73.SFBay.Sun.COM" address="d-usca14-133-73.SFBay.Sun.COM" port="3700"/>
<log-service file="" level="WARNING"/>
- <message-security-config auth-layer="SOAP" default-provider="app7" default-client-provider="app2">
- <provider-config provider-id="app1" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- <provider-config provider-id="app2" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- <property name="option1" value="true"/>
- </provider-config>
- <provider-config provider-id="app3" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- </provider-config>
- <provider-config provider-id="app4" provider-type="client" class-name="ClientModule1">
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- <provider-config provider-id="app5" provider-type="client" class-name="ClientModule1">
- </provider-config>
- <provider-config provider-id="app6" provider-type="server" class-name="ServerModule1">
- </provider-config>
- <provider-config provider-id="app7" provider-type="server" class-name="ServerModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- </message-security-config>
+ <message-security-config auth-layer="SOAP" default-provider="app7" default-client-provider="app2">
+ <provider-config provider-id="app1" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ <provider-config provider-id="app2" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ <property name="option1" value="true"/>
+ </provider-config>
+ <provider-config provider-id="app3" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ </provider-config>
+ <provider-config provider-id="app4" provider-type="client" class-name="ClientModule1">
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ <provider-config provider-id="app5" provider-type="client" class-name="ClientModule1">
+ </provider-config>
+ <provider-config provider-id="app6" provider-type="server" class-name="ServerModule1">
+ </provider-config>
+ <provider-config provider-id="app7" provider-type="server" class-name="ServerModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ </message-security-config>
<!-- not supported yet
- <message-security-config auth-layer="HTTP" default-provider="app8">
- </provider-config>
- <provider-config provider-id="app8" provider-type="server" class-name="ServerModule1">
- </provider-config>
- <provider-config provider-id="app9" provider-type="server" class-name="ServerModule1">
- </message-security-config>
+ <message-security-config auth-layer="HTTP" default-provider="app8">
+ </provider-config>
+ <provider-config provider-id="app8" provider-type="server" class-name="ServerModule1">
+ </provider-config>
+ <provider-config provider-id="app9" provider-type="server" class-name="ServerModule1">
+ </message-security-config>
- <message-security-config auth-layer="EJB" default-provider="app10">
- </provider-config>
- <provider-config provider-id="app10" provider-type="server" class-name="ServerModule1">
- </message-security-config>
+ <message-security-config auth-layer="EJB" default-provider="app10">
+ </provider-config>
+ <provider-config provider-id="app10" provider-type="server" class-name="ServerModule1">
+ </message-security-config>
-->
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/build.properties b/appserver/tests/appserv-tests/devtests/security/cplogin/build.properties
index e1bb6d7..48b58bd 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/build.properties
@@ -15,28 +15,28 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="sec-plogin"/>
-<property name="appname" value="${module}-converter"/>
+<property name="appname" value="${module}-converter"/> \u0020
-<property name="assemble"
- value="${build.classes.dir}/archive"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
+<property name="assemble"\u0020
+ value="${build.classes.dir}/archive"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
+<property name="appclient.jar"\u0020
+ value="${assemble.dir}/${appname}-client.jar"/> \u0020
-<property name="test.client"
- value="com.sun.devtest.security.plogin.converter.client.ConverterClient"/>
+<property name="test.client"\u0020
+ value="com.sun.devtest.security.plogin.converter.client.ConverterClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="app.type" value="application"/>
@@ -45,8 +45,8 @@
<!-- ============================================================ -->
<!--
<property name="jndi.name" value="PLoginConverter"/>
-<property name="provider.url" value="iiop://localhost:${orb.port}"/>
-<property name="ctxfactory" value="com.sun.enterprise.naming.SerialInitContextFactory"/>
-<property name="ctxfactory" value="com.sun.jndi.cosnaming.CNCtxFactory"/>
+<property name="provider.url" value="iiop://localhost:${orb.port}"/>\u0020
+<property name="ctxfactory" value="com.sun.enterprise.naming.SerialInitContextFactory"/>\u0020
+<property name="ctxfactory" value="com.sun.jndi.cosnaming.CNCtxFactory"/>\u0020
-->
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/build.xml b/appserver/tests/appserv-tests/devtests/security/cplogin/build.xml
index 4192da7..f535056 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/build.xml
@@ -39,7 +39,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,7 +51,7 @@
<target name="build" depends="compile">
<antcall target="build-ear-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="create-auth-filerealm">
@@ -93,7 +93,7 @@
</target>
<target name="create-permission" depends="init-common">
- <copy file="${admin.domain.dir}/../lib/appclient/client.policy"
+ <copy file="${admin.domain.dir}/../lib/appclient/client.policy"
tofile="${admin.domain.dir}/../lib/appclient/client.policy.org"
overwrite="true"/>
<!-- replace "\" by "/" in PC env -->
@@ -110,18 +110,18 @@
</target>
<target name="restore-permission" depends="init-common">
- <copy file="${admin.domain.dir}/../lib/appclient/client.policy.org"
+ <copy file="${admin.domain.dir}/../lib/appclient/client.policy.org"
tofile="${admin.domain.dir}/../lib/appclient/client.policy"
- overwrite="true"/>
+ overwrite="true"/>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-local"/>
- <antcall target="run-standalone-client"/>
+ <antcall target="runclient-local"/>
+ <antcall target="run-standalone-client"/>
</target>
<target name="runclient-local" depends="init-common">
@@ -129,12 +129,12 @@
<exec executable="${APPCLIENT}">
<arg value="-client" />
<arg value="${assemble.dir}/${appname}AppClient.jar"/>
- <!-- dummy user added as appclient throwing login window -->
+ <!-- dummy user added as appclient throwing login window -->
</exec>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<!-- =============================================== -->
<!-- Target to run the standalone client without ACC -->
@@ -152,7 +152,7 @@
<jvmarg value="-Djava.security.auth.login.config=${admin.domain.dir}/../lib/appclient/appclientlogin.conf"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <jvmarg value="-Dcom.sun.CORBA.connection.ORBSocketFactoryClass=com.sun.enterprise.iiop.IIOPSSLSocketFactory"/>
+ <jvmarg value="-Dcom.sun.CORBA.connection.ORBSocketFactoryClass=com.sun.enterprise.iiop.IIOPSSLSocketFactory"/>
<!--
<jvmarg value="-Djavax.rmi.CORBA.UtilClass=com.sun.corba.ee.impl.javax.rmi.CORBA.Util"/>
<jvmarg value="-Djavax.rmi.CORBA.StubClass=com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java b/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java
index da51275..59441ae 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/client/ConverterClient.java
@@ -29,7 +29,7 @@
/**
* A simple java client. This uses the services provided by the <code>ConverterBean</code> and
- * converts 100 US dollars to Yen and 100 Yen to Euro.
+ * converts 100 US dollars to Yen and 100 Yen to Euro.
* <p>In this regard, it does the following in order
* <ul>
* <li>Locates the home interface of the enterprise bean
@@ -39,21 +39,21 @@
* <br>
* <b>Locating the home interface:</b>
* <blockquote><pre>
- * Context initial = new InitialContext();
- * Context myEnv = (Context)initial.lookup("java:comp/env");
- * Object objref = myEnv.lookup("ejb/SimpleConverter");
+ * Context initial = new InitialContext();
+ * Context myEnv = (Context)initial.lookup("java:comp/env");
+ * Object objref = myEnv.lookup("ejb/SimpleConverter");
* ConverterHome home = (ConverterHome)PortableRemoteObject.narrow(objref, ConverterHome.class);
* </pre></blockquote>
* <br>
* <b>Creating the remote interface:</b>
* <blockquote><pre>
- * Converter currencyConverter = home.create();
+ * Converter currencyConverter = home.create();
* </pre></blockquote>
* <br>
* <b>Invoking business methods:</b>
* <blockquote><pre>
* BigDecimal param = new BigDecimal ("100.00");
- * amount = currencyConverter.dollarToYen(param);
+ * amount = currencyConverter.dollarToYen(param);
* amount = currencyConverter.yenToEuro(param);
* </pre></blockquote>
* <br>
@@ -82,25 +82,25 @@
*
*/
public static void main(String[] args) {
- ConverterClient client = new ConverterClient();
- client.run(args);
+ ConverterClient client = new ConverterClient();
+ client.run(args);
}
private void run(String[] args) {
String url = null;
- String testIdPrefix = null;
- String testId = "";
+ String testIdPrefix = null;
+ String testId = "";
String jndiName = null;
Context context = null;
String ctxFactory = null;
- java.lang.Object obj = null;
+ java.lang.Object obj = null;
try {
stat.addDescription("Security::client side programmatic login");
if (args.length == 3) {
url = args[0];
ctxFactory = args[1];
- jndiName = args[2];
+ jndiName = args[2];
}
String user = "shingwai";
@@ -109,7 +109,7 @@
ProgrammaticLogin plogin = new ProgrammaticLogin();
plogin.login(user, password);
boolean isAppClientTest = (url == null) || (ctxFactory == null);
-
+
/*
* User tx is to test issue:
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=1568
@@ -117,7 +117,7 @@
UserTransaction ut = null;
if (isAppClientTest) {
- testIdPrefix = "Sec::PLogin Converter Sample AppClient";
+ testIdPrefix = "Sec::PLogin Converter Sample AppClient";
testId = testIdPrefix;
// Initialize the Context with default properties
context = new InitialContext();
@@ -126,7 +126,7 @@
obj = context.lookup("java:comp/env/ejb/PLoginSimpleConverter");
ut = (UserTransaction) context.lookup("UserTransaction");
} else {
- testIdPrefix = "Sec::PLogin Standalone-Client";
+ testIdPrefix = "Sec::PLogin Standalone-Client";
testId = testIdPrefix;
Properties env = new Properties();
env.put("java.naming.provider.url", url);
@@ -137,7 +137,7 @@
"URL: " + url + ", Factory: " + ctxFactory);
// Create Home object
obj = context.lookup(jndiName);
-
+
ut = (UserTransaction) context.lookup("UserTransaction");
}
ConverterRemoteHome home =
@@ -145,7 +145,7 @@
ConverterRemoteHome.class);
ConverterRemote currencyConverter = home.create();
-
+
System.out.println("\n\n\n===========Beginning Simple Test=====\n\n");
testId = testIdPrefix + " Programmatic Login";
processRequest(home, "100");
@@ -166,7 +166,7 @@
stat.addStatus(testId, stat.PASS);
System.out.println("OK! Got an expected java.rmi.AccessException");
}
-
+
testId = testIdPrefix + " Programmatic Relogin after logout";
plogin.login(user, password);
processRequest(home, "500");
@@ -190,7 +190,7 @@
processRequest(home, "800");
stat.addStatus(testId, stat.PASS);
} catch (Throwable ex) {
- System.err.println("TestID" +testId);
+ System.err.println("TestID" +testId);
stat.addStatus(testId, stat.FAIL);
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
@@ -202,33 +202,33 @@
// default method that does not require transaction
private void processRequest(ConverterRemoteHome home, String amt)
throws Exception {
-
+
processRequest(home, amt, null);
}
-
+
private void processRequest(ConverterRemoteHome home, String amt,
UserTransaction tx) throws Exception {
ConverterRemote currencyConverter = home.create();
-
- String s = currencyConverter.myCallerPrincipal();
+
+ String s = currencyConverter.myCallerPrincipal();
System.out.println(" The caller principal received from ejb ->"+s);
-
+
BigDecimal param = new BigDecimal (amt);
if (tx != null) {
System.out.println("Beginning user transaction");
tx.begin();
}
-
+
BigDecimal amount = currencyConverter.dollarToYen(param);
System.out.println("$" + amt + " is : "+amount+"Yen");
amount = currencyConverter.yenToEuro(param);
System.out.println("Yen is :"+amount+"Euro\n");
-
+
if (tx != null) {
System.out.println("Committing user transaction");
tx.commit();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/cplogin/descriptor/application.xml
index d02d09c..d0141ee 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/descriptor/application.xml
@@ -23,7 +23,7 @@
<small-icon></small-icon>
<large-icon></large-icon>
</icon>
- <display-name>PLoginConverterApp</display-name>
+ <display-name>PLoginConverterApp</display-name>
<module>
<java>sec-plogin-converter-client.jar</java>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
index 6a82460..eff6667 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
@@ -33,7 +33,7 @@
BigDecimal yenRate = new BigDecimal("121.6000");
BigDecimal euroRate = new BigDecimal("0.0077");
SessionContext mysc = null;
-
+
public String myCallerPrincipal(){
return mysc.getCallerPrincipal().toString();
}
@@ -41,7 +41,7 @@
* Returns the yen value for a given dollar amount.
* @param dollars dollar amount to be converted to yen.
*/
- public BigDecimal dollarToYen(BigDecimal dollars) {
+ public BigDecimal dollarToYen(BigDecimal dollars) {
BigDecimal result = dollars.multiply(yenRate);
return result.setScale(2,BigDecimal.ROUND_UP);
}
@@ -75,7 +75,7 @@
* Loads the state of the bean from secondary storage. Required by EJB spec.
*/
public void ejbActivate() {}
-
+
/**
* Keeps the state of the bean to secondary storage. Required by EJB spec.
*/
diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
index bc31d75..24cd5f5 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
@@ -44,7 +44,7 @@
* @param yen yen amount to be converted to euro.
*/
public BigDecimal yenToEuro(BigDecimal yen) throws RemoteException;
-
+
public String myCallerPrincipal() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.properties b/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.properties
index b98e0ff..6bdb735 100644
--- a/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/defaultp2r/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="security-defaultp2r"/>
<property name="appname" value="${module}" />
diff --git a/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.xml b/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.xml
index 889c8cd..a20f4ac 100644
--- a/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/defaultp2r/build.xml
@@ -26,7 +26,7 @@
]>
<project name="security-defaultp2r" basedir="." default="usage">
-
+
&commonSetup;
&commonBuild;
&commonRun;
@@ -38,10 +38,10 @@
<antcall target="test-p2r-disabled"/>
<antcall target="unsetup"/>
</target>
-
+
<target name="test-p2r-enabled"
depends="enable-p2r, deploy, run, undeploy"/>
-
+
<target name="test-p2r-disabled"
depends="disable-p2r, deploy, run-negative, undeploy"/>
@@ -49,25 +49,25 @@
<delete dir="${build.classes.dir}"/>
<delete dir="${assemble.dir}"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="web"/>
</antcall>
</target>
-
+
<target name="build" depends="compile">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes" />
+ <param name="hasWebclient" value="yes" />
</antcall>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common">
<param name="contextroot" value="${appname}"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runweb">
<param name="servlet" value="TestServlet"/>
@@ -86,7 +86,7 @@
<param name="testcaseid" value="user-auth-with-get"/>
</antcall>
</target>
-
+
<target name="run-negative" depends="init-common">
<antcall target="runweb-403">
<param name="servlet" value="TestServlet"/>
@@ -96,7 +96,7 @@
<param name="testcaseid" value="user-auth-should-fail"/>
</antcall>
</target>
-
+
<target name="runweb" depends="init-common">
<taskdef name="webtest" classname="${webtest.classname}"
classpath="${webtest.classpath}" />
@@ -126,7 +126,7 @@
testCaseDescription="Testing default principal to role mapping"
testStrategy="Testing default principal to role mapping"/>
</target>
-
+
<target name="runweb-403" depends="init-common">
<taskdef name="webtest" classname="${webtest.classname}"
classpath="${webtest.classpath}" />
@@ -156,15 +156,15 @@
testCaseDescription="Testing default p2r mapping disabled"
testStrategy="Testing default p2r mapping disabled"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
<target name="setup">
<antcall target="create-user-common">
<param name="user" value="bobby"/>
@@ -173,14 +173,14 @@
</antcall>
<!-- <antcall target="reconfig-common"/>-->
</target>
-
+
<target name="unsetup">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
<param name="user" value="bobby"/>
</antcall>
</target>
-
+
<target name="enable-p2r" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
@@ -188,7 +188,7 @@
value="server-config.security-service.activate-default-principal-to-role-mapping=true"/>
</antcall>
</target>
-
+
<target name="disable-p2r" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/defaultp2r/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/defaultp2r/descriptor/web.xml
index 2550d2e..3b48987 100644
--- a/appserver/tests/appserv-tests/devtests/security/defaultp2r/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/defaultp2r/descriptor/web.xml
@@ -19,7 +19,7 @@
-->
<web-app>
-
+
<display-name>security-defaultp2r</display-name>
<distributable></distributable>
<servlet>
@@ -30,7 +30,7 @@
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
</servlet-mapping>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>secure</web-resource-name>
@@ -45,14 +45,14 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>default</realm-name>
</login-config>
-
+
<security-role>
<role-name>mygroup</role-name>
</security-role>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/defaultp2r/web/TestServlet.java b/appserver/tests/appserv-tests/devtests/security/defaultp2r/web/TestServlet.java
index dd4e883..22082e8 100644
--- a/appserver/tests/appserv-tests/devtests/security/defaultp2r/web/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/defaultp2r/web/TestServlet.java
@@ -24,10 +24,10 @@
import java.io.PrintWriter;
public class TestServlet extends HttpServlet {
-
+
public void service(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
-
+
String method = req.getMethod();
if (method.equals("FOO")) {
doFoo(req, resp);
@@ -35,18 +35,18 @@
super.service(req, resp);
}
}
-
+
public void doFoo(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
-
+
PrintWriter out = resp.getWriter();
out.println("doFoo with " + req.getUserPrincipal());
out.close();
}
-
+
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
-
+
PrintWriter out = resp.getWriter();
out.println("doGet with " + req.getUserPrincipal());
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/build.properties b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/build.properties
index 34b4055..fd99e29 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/build.properties
@@ -15,6 +15,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="security"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.properties b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.properties
index 8cb034d..003d005 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="sec-ssl"/>
-<property name="appname" value="${module}-converter"/>
+<property name="appname" value="${module}-converter"/> \u0020
-<property name="test.client"
- value="com.sun.s1peqe.security.ssl.converter.client.ConverterClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.security.ssl.converter.client.ConverterClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.xml b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.xml
index ba1b38e..ce55423 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/build.xml
@@ -46,7 +46,7 @@
<antcall target="prepare-store-common"/>
<antcall target="restart"/>
</target>
-
+
<target name="unsetup" depends="init-common">
<antcall target="remove-store-common"/>
<!--antcall target="restart"/-->
@@ -63,15 +63,15 @@
<target name="build" depends="compile">
<antcall target="build-ear-common"/>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-local"/>
- <antcall target="run-standalone-client"/>
+ <antcall target="runclient-local"/>
+ <antcall target="run-standalone-client"/>
</target>
<target name="runclient-local" depends="init-common">
@@ -83,7 +83,7 @@
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<!-- =============================================== -->
<!-- Target to run the standalone client without ACC -->
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java
index acedf8e..e3d4046 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/client/ConverterClient.java
@@ -27,7 +27,7 @@
/**
* A simple java client. This uses the services provided by the <code>ConverterBean</code> and
- * converts 100 US dollars to Yen and 100 Yen to Euro.
+ * converts 100 US dollars to Yen and 100 Yen to Euro.
* <p>In this regard, it does the following in order
* <ul>
* <li>Locates the home interface of the enterprise bean
@@ -37,21 +37,21 @@
* <br>
* <b>Locating the home interface:</b>
* <blockquote><pre>
- * Context initial = new InitialContext();
- * Context myEnv = (Context)initial.lookup("java:comp/env");
- * Object objref = myEnv.lookup("ejb/SimpleConverter");
+ * Context initial = new InitialContext();
+ * Context myEnv = (Context)initial.lookup("java:comp/env");
+ * Object objref = myEnv.lookup("ejb/SimpleConverter");
* ConverterHome home = (ConverterHome)PortableRemoteObject.narrow(objref, ConverterHome.class);
* </pre></blockquote>
* <br>
* <b>Creating the remote interface:</b>
* <blockquote><pre>
- * Converter currencyConverter = home.create();
+ * Converter currencyConverter = home.create();
* </pre></blockquote>
* <br>
* <b>Invoking business methods:</b>
* <blockquote><pre>
* BigDecimal param = new BigDecimal ("100.00");
- * amount = currencyConverter.dollarToYen(param);
+ * amount = currencyConverter.dollarToYen(param);
* amount = currencyConverter.yenToEuro(param);
* </pre></blockquote>
* <br>
@@ -66,7 +66,7 @@
public class ConverterClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
ConverterClient() {
@@ -80,35 +80,35 @@
*
*/
public static void main(String[] args) {
- ConverterClient client = new ConverterClient();
- client.run(args);
+ ConverterClient client = new ConverterClient();
+ client.run(args);
}
private void run(String[] args) {
String url = null;
- String testId = null;
+ String testId = null;
String jndiName = null;
Context context = null;
String ctxFactory = null;
- java.lang.Object obj = null;
+ java.lang.Object obj = null;
try {
stat.addDescription("Security::SSL tester -converter sample.");
if (args.length == 3) {
url = args[0];
ctxFactory = args[1];
- jndiName = args[2];
+ jndiName = args[2];
}
if ( (url == null) || (ctxFactory == null) ) {
- testId = "Sec::Mutual_SSL_simple Converter Sample AppClient";
+ testId = "Sec::Mutual_SSL_simple Converter Sample AppClient";
// Initialize the Context with default properties
context = new InitialContext();
System.out.println("Default Context Initialized...");
// Create Home object
obj = context.lookup("java:comp/env/ejb/SSLSimpleConverter");
} else {
- testId = "Sec::Mutual_SSL_simple Standalone-Client";
+ testId = "Sec::Mutual_SSL_simple Standalone-Client";
Properties env = new Properties();
env.put("java.naming.provider.url", url);
env.put("java.naming.factory.initial", ctxFactory);
@@ -126,12 +126,12 @@
ConverterRemoteHome.class);
ConverterRemote currencyConverter = home.create();
-
-
- String s = currencyConverter.myCallerPrincipal();
-
+
+
+ String s = currencyConverter.myCallerPrincipal();
+
System.out.println(" The caller principal received from ejb ->"+s);
-
+
if(!mys.equalsIgnoreCase(s)){
String error = "The caller principals dont match!! - Test Failed";
System.out.println(error);
@@ -151,7 +151,7 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
} finally {
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application-client.xml
index abede97..dc41f8d 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application-client.xml
@@ -24,7 +24,7 @@
<env-entry-name>certname</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US</env-entry-value>
- </env-entry>
+ </env-entry>
<ejb-ref>
<ejb-ref-name>ejb/SSLSimpleConverter</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application.xml
index 26b2189..6614993 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/descriptor/application.xml
@@ -23,7 +23,7 @@
<small-icon></small-icon>
<large-icon></large-icon>
</icon>
- <display-name>SSLConverterApp</display-name>
+ <display-name>SSLConverterApp</display-name>
<module>
<java>sec-ssl-converter-client.jar</java>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
index 24ab044..3efc729 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
@@ -33,7 +33,7 @@
BigDecimal yenRate = new BigDecimal("121.6000");
BigDecimal euroRate = new BigDecimal("0.0077");
SessionContext mysc = null;
-
+
public String myCallerPrincipal(){
return mysc.getCallerPrincipal().toString();
}
@@ -41,7 +41,7 @@
* Returns the yen value for a given dollar amount.
* @param dollars dollar amount to be converted to yen.
*/
- public BigDecimal dollarToYen(BigDecimal dollars) {
+ public BigDecimal dollarToYen(BigDecimal dollars) {
BigDecimal result = dollars.multiply(yenRate);
return result.setScale(2,BigDecimal.ROUND_UP);
}
@@ -75,7 +75,7 @@
* Loads the state of the bean from secondary storage. Required by EJB spec.
*/
public void ejbActivate() {}
-
+
/**
* Keeps the state of the bean to secondary storage. Required by EJB spec.
*/
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
index aa1e91b..9517aaf 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
@@ -44,7 +44,7 @@
* @param yen yen amount to be converted to euro.
*/
public BigDecimal yenToEuro(BigDecimal yen) throws RemoteException;
-
+
public String myCallerPrincipal() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.properties b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.properties
index 8fc4e23..515ce47 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="sec-ssl"/>
<property name="appname" value="${module}-converter"/>
-<property name="test.client"
- value="com.sun.s1peqe.security.ssl.converter.client.ConverterClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.security.ssl.converter.client.ConverterClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.xml b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.xml
index f8b8b6b..120b4b8 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/build.xml
@@ -39,7 +39,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -51,14 +51,14 @@
<target name="build" depends="compile">
<antcall target="build-ear-common"/>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-local"/>
+ <antcall target="runclient-local"/>
<antcall target="run-standalone-client"/>
</target>
@@ -71,7 +71,7 @@
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<!-- =============================================== -->
<!-- Target to run the standalone client without ACC -->
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/client/ConverterClient.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/client/ConverterClient.java
index ddbc504..551af20 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/client/ConverterClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/client/ConverterClient.java
@@ -27,7 +27,7 @@
/**
* A simple java client. This uses the services provided by the <code>ConverterBean</code> and
- * converts 100 US dollars to Yen and 100 Yen to Euro.
+ * converts 100 US dollars to Yen and 100 Yen to Euro.
* <p>In this regard, it does the following in order
* <ul>
* <li>Locates the home interface of the enterprise bean
@@ -37,21 +37,21 @@
* <br>
* <b>Locating the home interface:</b>
* <blockquote><pre>
- * Context initial = new InitialContext();
- * Context myEnv = (Context)initial.lookup("java:comp/env");
- * Object objref = myEnv.lookup("ejb/SimpleConverter");
+ * Context initial = new InitialContext();
+ * Context myEnv = (Context)initial.lookup("java:comp/env");
+ * Object objref = myEnv.lookup("ejb/SimpleConverter");
* ConverterHome home = (ConverterHome)PortableRemoteObject.narrow(objref, ConverterHome.class);
* </pre></blockquote>
* <br>
* <b>Creating the remote interface:</b>
* <blockquote><pre>
- * Converter currencyConverter = home.create();
+ * Converter currencyConverter = home.create();
* </pre></blockquote>
* <br>
* <b>Invoking business methods:</b>
* <blockquote><pre>
* BigDecimal param = new BigDecimal ("100.00");
- * amount = currencyConverter.dollarToYen(param);
+ * amount = currencyConverter.dollarToYen(param);
* amount = currencyConverter.yenToEuro(param);
* </pre></blockquote>
* <br>
@@ -66,7 +66,7 @@
public class ConverterClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
ConverterClient() {
@@ -80,35 +80,35 @@
*
*/
public static void main(String[] args) {
- ConverterClient client = new ConverterClient();
- client.run(args);
+ ConverterClient client = new ConverterClient();
+ client.run(args);
}
private void run(String[] args) {
String url = null;
- String testId = null;
+ String testId = null;
String jndiName = null;
Context context = null;
String ctxFactory = null;
- java.lang.Object obj = null;
+ java.lang.Object obj = null;
try {
stat.addDescription("Security::SSL One way ssl.");
if (args.length == 3) {
url = args[0];
ctxFactory = args[1];
- jndiName = args[2];
+ jndiName = args[2];
}
if ( (url == null) || (ctxFactory == null) ) {
- testId = "Sec::SSL_simple Converter Sample AppClient";
+ testId = "Sec::SSL_simple Converter Sample AppClient";
// Initialize the Context with default properties
context = new InitialContext();
System.out.println("One way SSL Test \n Default Context Initialized...");
// Create Home object
obj = context.lookup("java:comp/env/ejb/SSLSimpleConverter");
} else {
- testId = "Sec::SSL_simple Standalone-Client";
+ testId = "Sec::SSL_simple Standalone-Client";
Properties env = new Properties();
env.put("java.naming.provider.url", url);
env.put("java.naming.factory.initial", ctxFactory);
@@ -126,12 +126,12 @@
ConverterRemoteHome.class);
ConverterRemote currencyConverter = home.create();
-
-
- String s = currencyConverter.myCallerPrincipal();
-
+
+
+ String s = currencyConverter.myCallerPrincipal();
+
System.out.println(" The caller principal received from ejb ->"+s);
-
+
if(!mys.equalsIgnoreCase(s)){
String error = "The caller principals dont match!! - Test Failed";
System.out.println(error);
@@ -151,7 +151,7 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
} finally {
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/descriptor/application.xml
index 26b2189..6614993 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/descriptor/application.xml
@@ -23,7 +23,7 @@
<small-icon></small-icon>
<large-icon></large-icon>
</icon>
- <display-name>SSLConverterApp</display-name>
+ <display-name>SSLConverterApp</display-name>
<module>
<java>sec-ssl-converter-client.jar</java>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
index 24ab044..3efc729 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
@@ -33,7 +33,7 @@
BigDecimal yenRate = new BigDecimal("121.6000");
BigDecimal euroRate = new BigDecimal("0.0077");
SessionContext mysc = null;
-
+
public String myCallerPrincipal(){
return mysc.getCallerPrincipal().toString();
}
@@ -41,7 +41,7 @@
* Returns the yen value for a given dollar amount.
* @param dollars dollar amount to be converted to yen.
*/
- public BigDecimal dollarToYen(BigDecimal dollars) {
+ public BigDecimal dollarToYen(BigDecimal dollars) {
BigDecimal result = dollars.multiply(yenRate);
return result.setScale(2,BigDecimal.ROUND_UP);
}
@@ -75,7 +75,7 @@
* Loads the state of the bean from secondary storage. Required by EJB spec.
*/
public void ejbActivate() {}
-
+
/**
* Keeps the state of the bean to secondary storage. Required by EJB spec.
*/
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
index aa1e91b..9517aaf 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
@@ -44,7 +44,7 @@
* @param yen yen amount to be converted to euro.
*/
public BigDecimal yenToEuro(BigDecimal yen) throws RemoteException;
-
+
public String myCallerPrincipal() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/httpMethod/build.properties b/appserver/tests/appserv-tests/devtests/security/httpMethod/build.properties
index fb66f29..80ba5a5 100644
--- a/appserver/tests/appserv-tests/devtests/security/httpMethod/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/httpMethod/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="security-httpMethod"/>
<property name="appname" value="${module}" />
diff --git a/appserver/tests/appserv-tests/devtests/security/httpMethod/build.xml b/appserver/tests/appserv-tests/devtests/security/httpMethod/build.xml
index 09a9e31..80425a3 100644
--- a/appserver/tests/appserv-tests/devtests/security/httpMethod/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/httpMethod/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&commonSecurity;
&testProperties;
-
+
<target name="all" depends="build, setup, deploy, run, undeploy, unsetup"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
@@ -48,7 +48,7 @@
<target name="build" depends="compile">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes" />
+ <param name="hasWebclient" value="yes" />
</antcall>
</target>
@@ -169,18 +169,18 @@
<target name="setup">
<antcall target="create-user-common">
- <param name="user" value="shingwai"/>
- <param name="password" value="shingwai"/>
- <param name="groups" value="employee"/>
+ <param name="user" value="shingwai"/>
+ <param name="password" value="shingwai"/>
+ <param name="groups" value="employee"/>
</antcall>
<antcall target="create-user-common">
- <param name="user" value="swchan"/>
- <param name="password" value="swchan"/>
- <param name="groups" value="staff"/>
+ <param name="user" value="swchan"/>
+ <param name="password" value="swchan"/>
+ <param name="groups" value="staff"/>
</antcall>
<!-- <antcall target="reconfig-common"/>-->
</target>
-
+
<target name="unsetup">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/security/httpMethod/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/httpMethod/descriptor/web.xml
index 82a79d9..6052ac6 100644
--- a/appserver/tests/appserv-tests/devtests/security/httpMethod/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/httpMethod/descriptor/web.xml
@@ -52,7 +52,7 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>secure2</web-resource-name>
@@ -71,7 +71,7 @@
<auth-method>BASIC</auth-method>
<realm-name>default</realm-name>
</login-config>
-
+
<security-role>
<role-name>manager</role-name>
</security-role>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/build.properties b/appserver/tests/appserv-tests/devtests/security/jaccApi/build.properties
index 34b4055..fd99e29 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/build.properties
@@ -15,6 +15,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="security"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml
index 46af5ad..ea284df 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/build.xml
@@ -29,7 +29,7 @@
&commonSetup;
&commonBuild;
&commonRun;
- &testProperties;
+ &testProperties;
<property environment="env"/>
<get src="https://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar" dest="${env.APS_HOME}/lib/maven-ant-tasks-2.1.3.jar"/>
<path id="maven-ant-tasks.classpath" path="${env.APS_HOME}/lib/maven-ant-tasks-2.1.3.jar" />
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml
index 8b44f99..1a85f34 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/pom.xml
@@ -25,9 +25,9 @@
<artifactId>prog-auth</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>jaccApi-common</artifactId>
-
+
<packaging>jar</packaging>
<name>Java EE 7 Sample: jaccApi- common</name>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.11.2</version>
+ <version>1.11.2</version>
</dependency>
<dependency>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java
index d9b7c7c..9da9e9c 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/ArquillianBase.java
@@ -48,35 +48,35 @@
/**
*
- *
+ *
*/
public class ArquillianBase {
private static final String WEBAPP_SRC = "src/main/webapp";
private static final Logger logger = Logger.getLogger(ArquillianBase.class.getName());
-
+
private WebClient webClient;
private String response;
-
+
@Rule
public TestWatcher ruleExample = new TestWatcher() {
@Override
protected void failed(Throwable e, Description description) {
super.failed(e, description);
-
- logger.log(SEVERE,
- "\n\nTest failed: " +
+
+ logger.log(SEVERE,
+ "\n\nTest failed: " +
description.getClassName() + "." + description.getMethodName() +
-
+
"\nMessage: " + e.getMessage() +
-
+
"\nLast response: " +
-
+
"\n\n" + formatHTML(response) + "\n\n");
-
+
}
};
-
+
public static String formatHTML(String html) {
try {
return parse(html, "", xmlParser()).toString();
@@ -88,9 +88,9 @@
public static Archive<?> defaultArchive() {
return tryWrapEAR(defaultWebArchive());
}
-
+
public static WebArchive defaultWebArchive() {
- return
+ return
create(WebArchive.class, "test.war")
.addPackages(true, "org.javaee7.jaspic")
.deleteClass(ArquillianBase.class)
@@ -104,23 +104,23 @@
.importFrom(new File("target/" + System.getProperty("finalName") + ".war"))
.as(WebArchive.class);
}
-
+
public static Archive<?> tryWrapEAR(WebArchive webArchive) {
if (getBoolean("useEarForJaspic")) {
return
// EAR archive
create(EnterpriseArchive.class, "test.ear")
-
+
// Liberty needs to have the binding file in an ear.
// TODO: this is no longer the case and this code can be removed (-bnd.xml
// needs to be moved to correct place)
.addAsManifestResource(resource("ibm-application-bnd.xml"))
-
+
// Web module
// This is needed to prevent Arquillian generating an illegal application.xml
.addAsModule(
webArchive
- );
+ );
} else {
return webArchive;
}
@@ -129,7 +129,7 @@
public static File resource(String name) {
return new File(WEBAPP_SRC + "/WEB-INF", name);
}
-
+
public static File web(String name) {
return new File(WEBAPP_SRC, name);
}
@@ -148,8 +148,8 @@
webClient.getCookieManager().clearCookies();
webClient.close();
}
-
-
+
+
protected WebClient getWebClient() {
return webClient;
@@ -162,7 +162,7 @@
/**
* Gets content from the path that's relative to the base URL on which the Arquillian test
* archive is deployed.
- *
+ *
* @param path the path relative to the URL on which the Arquillian test is deployed
* @return the raw content as a string as returned by the server
*/
@@ -178,7 +178,7 @@
throw new IllegalStateException(e);
}
}
-
+
return response;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/BaseServletContextListener.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/BaseServletContextListener.java
index bd13885..2d30d12 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/BaseServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/BaseServletContextListener.java
@@ -20,7 +20,7 @@
import jakarta.servlet.ServletContextListener;
/**
- *
+ *
*/
public class BaseServletContextListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/JaspicUtils.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/JaspicUtils.java
index c09bb10..5b26560 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/JaspicUtils.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/JaspicUtils.java
@@ -22,7 +22,7 @@
/**
*
- *
+ *
*/
public final class JaspicUtils {
@@ -32,7 +32,7 @@
/**
* Registers the given SAM using the standard JASPIC {@link AuthConfigFactory} but using a small set of wrappers that just
* pass the calls through to the SAM.
- *
+ *
* @param serverAuthModule
*/
public static void registerSAM(ServletContext context, ServerAuthModule serverAuthModule) {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestAuthConfigProvider.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestAuthConfigProvider.java
index 717d993..d1fa184 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestAuthConfigProvider.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestAuthConfigProvider.java
@@ -30,7 +30,7 @@
/**
* This class functions as a kind of factory-factory for {@link ServerAuthConfig} instances, which are by themselves factories
* for {@link ServerAuthContext} instances, which are delegates for the actual {@link ServerAuthModule} (SAM) that we're after.
- *
+ *
*/
public class TestAuthConfigProvider implements AuthConfigProvider {
@@ -45,7 +45,7 @@
/**
* Constructor with signature and implementation that's required by API.
- *
+ *
* @param properties
* @param factory
*/
@@ -85,7 +85,7 @@
* Creates a default callback handler via the system property "authconfigprovider.client.callbackhandler", as seemingly
* required by the API (API uses wording "may" create default handler). TODO: Isn't
* "authconfigprovider.client.callbackhandler" JBoss specific?
- *
+ *
* @return
* @throws AuthException
*/
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthConfig.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthConfig.java
index d5fc06d..74e8897 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthConfig.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthConfig.java
@@ -29,7 +29,7 @@
/**
* This class functions as a kind of factory for {@link ServerAuthContext} instances, which are delegates for the actual
* {@link ServerAuthModule} (SAM) that we're after.
- *
+ *
*/
public class TestServerAuthConfig implements ServerAuthConfig {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthContext.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthContext.java
index 8fdac07..814ce57 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthContext.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/common/src/main/java/org/glassfish/jaccApi/common/TestServerAuthContext.java
@@ -34,7 +34,7 @@
* <p>
* Since this simple example only has a single SAM, we delegate directly to that one. Note that this {@link ServerAuthContext}
* and the {@link ServerAuthModule} (SAM) share a common base interface: {@link ServerAuth}.
- *
+ *
*/
public class TestServerAuthContext implements ServerAuthContext {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml
index 430c95f..9587e63 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/pom.xml
@@ -19,11 +19,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.glassfish.jaccApi.test</groupId>
+ <groupId>org.glassfish.jaccApi.test</groupId>
<artifactId>prog-auth</artifactId>
<version>6.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<name>Programmatic authentication with Jakarta Authorization api</name>
<properties>
<glassfish.version>5.0</glassfish.version>
@@ -33,7 +33,7 @@
<modules>
<module>common</module>
- <module>programmatic-authentication</module>
+ <module>programmatic-authentication</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -60,7 +60,7 @@
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
@@ -72,7 +72,7 @@
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-remote-3.1</artifactId>
@@ -87,7 +87,7 @@
<systemPath>${APS_HOME}/lib/reporter.jar</systemPath>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -110,7 +110,7 @@
<GLASSFISH_HOME>${env.S1AS_HOME}/..</GLASSFISH_HOME>
</environmentVariables>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml
index 7494a6f..11251b6 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/pom.xml
@@ -28,7 +28,7 @@
<artifactId>programmatic-authentication-jacc-api</artifactId>
<packaging>war</packaging>
-
+
<name>Java EE 7 Sample: Programmatic-authentication with Jacc api</name>
<build>
<finalName>prog-auth</finalName>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/SamAutoRegistrationListener.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/SamAutoRegistrationListener.java
index 7b6227e..4b4e26d 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/SamAutoRegistrationListener.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/SamAutoRegistrationListener.java
@@ -23,9 +23,9 @@
import org.glassfish.jaccApi.common.JaspicUtils;
/**
- *
+ *
* @author Arjan Tijms
- *
+ *
*/
@WebListener
public class SamAutoRegistrationListener extends BaseServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/TestServerAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/TestServerAuthModule.java
index 68c3c23..2f1da8a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/TestServerAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/main/java/org/glassfish/jaccApi/programmaticauthentication/sam/TestServerAuthModule.java
@@ -40,9 +40,9 @@
/**
* Very basic SAM that returns a single hardcoded user named "test" with role "architect" when the request *attribute*
* <code>doLogin</code> is present.
- *
+ *
* @author Arjan Tijms
- *
+ *
*/
public class TestServerAuthModule implements ServerAuthModule {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/test/java/org/glassfish/jaccApi/programmaticauthentication/ProgrammaticAuthenticationIT.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/test/java/org/glassfish/jaccApi/programmaticauthentication/ProgrammaticAuthenticationIT.java
index 07f30aa..b38f3b8 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/test/java/org/glassfish/jaccApi/programmaticauthentication/ProgrammaticAuthenticationIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/prog-auth/programmatic-authentication/src/test/java/org/glassfish/jaccApi/programmaticauthentication/ProgrammaticAuthenticationIT.java
@@ -33,7 +33,7 @@
* This tests that a call from a Servlet to HttpServletRequest#authenticate can result
* in a successful authentication.
*
- *
+ *
*/
@RunWith(Arquillian.class)
public class ProgrammaticAuthenticationIT extends ArquillianBase {
@@ -49,6 +49,6 @@
String response = getFromServerPath("public/authenticate");
assertTrue("Should contain web user test and architect in subject principals", response.contains("Principals: test, architect"));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java
index 9da4e68..f5d7244 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/DummyPolicyConfigurationFactory.java
@@ -21,9 +21,9 @@
import jakarta.security.jacc.PolicyContextException;
public class DummyPolicyConfigurationFactory extends PolicyConfigurationFactory {
- public PolicyConfiguration
+ public PolicyConfiguration
getPolicyConfiguration(String contextID, boolean remove)
- throws jakarta.security.jacc.PolicyContextException {
+ throws jakarta.security.jacc.PolicyContextException {
return null;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestEJBPerms.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestEJBPerms.java
index 82a7087..f73b7ee 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestEJBPerms.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestEJBPerms.java
@@ -18,7 +18,7 @@
import java.lang.reflect.*;
import java.util.Enumeration;
-import java.security.*;
+import java.security.*;
import jakarta.security.jacc.EJBMethodPermission;
import jakarta.security.jacc.EJBRoleRefPermission;
@@ -50,14 +50,14 @@
Permission p2 = p1;
try {
- FileOutputStream fout = new
+ FileOutputStream fout = new
FileOutputStream("serial-test-file.tmp");
ObjectOutputStream sout = new ObjectOutputStream(fout);
sout.writeObject(p1);
sout.flush();
sout.close();
fout.close();
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
t.printStackTrace();
debug( "-- Serialization Test Failed(write)-" + p1.getName() + "," + p1.getActions());
}
@@ -67,18 +67,18 @@
ObjectInputStream sin = new ObjectInputStream(fin);
p2 = (Permission) sin.readObject();
sin.close();
- fin.close();
- } catch( Throwable t ) {
+ fin.close();
+ } catch( Throwable t ) {
t.printStackTrace();
debug( "-- Serialization Test Failed(read)-" + p1.getName() + "," + p1.getActions());
result = false;
}
if (result == true) {
- if (p2.equals(p1)) {
+ if (p2.equals(p1)) {
debug( "-- Serialization Test Succeeded -----------" + p2.getName() + "," + p2.getActions());
stat.addStatus(description, stat.PASS);
- } else {
+ } else {
debug( "-- Serialization Test Failed-" + p1.getName() + "," + p1.getActions());
stat.addStatus(description, stat.FAIL);
}
@@ -105,7 +105,7 @@
if (expectedToSucceed) {
- p2 = new EJBMethodPermission(p1.getName(),p1.getActions());
+ p2 = new EJBMethodPermission(p1.getName(),p1.getActions());
testSerialization(p2);
if (!p1.equals(p2)) {
@@ -123,7 +123,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -146,7 +146,7 @@
}
private static void doEJBMethodPermission( boolean expectedToSucceed,
- String ejbName, String methodName, String methodInterface,
+ String ejbName, String methodName, String methodInterface,
String[] methodParams) {
String description = "doEJBMethodPermissionWithParams:" +
expectedToSucceed + "-" + ejbName + "-" + methodName +
@@ -163,7 +163,7 @@
methodParams);
if (expectedToSucceed) {
- p2 = new EJBMethodPermission(p1.getName(),p1.getActions());
+ p2 = new EJBMethodPermission(p1.getName(),p1.getActions());
testSerialization(p2);
if (!p1.equals(p2)) {
@@ -181,16 +181,16 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
}
-
+
result = false;
- }
+ }
if (result == expectedToSucceed) {
- if (expectedToSucceed) {
+ if (expectedToSucceed) {
debug( "-- Construct Test Succeeded -------------------------------------");
} else {
debug( "-- Construct Test Succeeded (negative)---------------------------");
@@ -206,7 +206,7 @@
String ejbName, String methodInterface, Method method) {
String description = "doEJBMethodPermissionWithMethod:" +
- expectedToSucceed + "-" + ejbName +
+ expectedToSucceed + "-" + ejbName +
"-" + methodInterface + "-" + method;
boolean result = true;
@@ -241,7 +241,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -251,7 +251,7 @@
}
if (result == expectedToSucceed) {
- if (expectedToSucceed) {
+ if (expectedToSucceed) {
debug( "-- Construct Test Succeeded -------------------------------------");
} else {
debug( "-- Construct Test Succeeded (negative)---------------------------");
@@ -281,7 +281,7 @@
if (expectedToSucceed) {
- p2 = new EJBRoleRefPermission(p1.getName(),p1.getActions());
+ p2 = new EJBRoleRefPermission(p1.getName(),p1.getActions());
testSerialization(p2);
if (!p1.equals(p2)) {
@@ -300,7 +300,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -310,7 +310,7 @@
}
if (result == expectedToSucceed) {
- if (expectedToSucceed) {
+ if (expectedToSucceed) {
debug( "-- Construct Test Succeeded -------------------------------------" + p1.hashCode());
} else {
debug( "-- Construct Test Succeeded (negative)---------------------------");
@@ -324,7 +324,7 @@
private static void doPermissionImplies ( boolean expectedResult,
Permission thisP, Permission p) {
- //SEC is added there so that it will not cut off the
+ //SEC is added there so that it will not cut off the
//first part with space, an issue in reporting tools
String description = "SEC doPermissionImplies:" +
expectedResult + "-" + thisP + "-" + p;
@@ -336,17 +336,17 @@
if (thisP.implies(p) != expectedResult) {
debug(
(expectedResult ? "unexpected failure:" :"unexpected success:")
- + p + (expectedResult ?" not implied by:":" implied by:") +
+ + p + (expectedResult ?" not implied by:":" implied by:") +
thisP);
debug( "-- Permission implies Test Failed ----------------------------------------");
stat.addStatus(description, stat.FAIL);
} else {
- debug(p +
+ debug(p +
(expectedResult ? " implied by:":" not implied by:") + thisP);
debug( "-- Permission implies Test Succeeded -------------------------------------");
stat.addStatus(description, stat.PASS);
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
debug("unexpected exception");
t.printStackTrace();
debug( "-- Permission implies Test Failed ----------------------------------------");
@@ -368,41 +368,41 @@
doEJBMethodPermission(true,"bankbean","withdraw,Home");
doEJBMethodPermission(true,"bankbean","withdraw,Home,java.lang.string");
doEJBMethodPermission(true,"bankbean",",Home");
-
+
doEJBMethodPermission(true,"bankbean",",Home,java.lang.string");
-
+
doEJBMethodPermission(true,"bankbean","withdraw");
doEJBMethodPermission(true,"bankbean","withdraw,Home");
doEJBMethodPermission(true,"bankbean","withdraw,,java.lang.string");
doEJBMethodPermission(true,"bankbean","withdraw,,");
doEJBMethodPermission(false,"bankBean","withdraw","Home",params3);
-
+
doEJBMethodPermission(true,"bankBean","withdraw","Home",params1);
doEJBMethodPermission(true,"bankBean","withdraw","Home",params2);
-
+
doEJBMethodPermission(true,"bankBean","withdraw","Home",null);
-
+
doEJBMethodPermission(true,"bankBean",null,"Home",params1);
-
+
doEJBMethodPermission(true,"bankBean","withdraw",null,params2);
-
+
doEJBMethodPermission(true,"bankBean",null,null,null);
-
- EJBMethodPermission a =
+
+ EJBMethodPermission a =
new EJBMethodPermission("bankBean","withdraw,Home,java.lang.string");
- EJBMethodPermission b =
+ EJBMethodPermission b =
new EJBMethodPermission("myBean","withdraw,Home,java.lang.string");
- EJBMethodPermission c =
+ EJBMethodPermission c =
new EJBMethodPermission("myBean",",Home,java.lang.string");
- EJBMethodPermission d =
+ EJBMethodPermission d =
new EJBMethodPermission("myBean",",,java.lang.string");
- EJBMethodPermission e =
+ EJBMethodPermission e =
new EJBMethodPermission("myBean","withdraw,,java.lang.string");
- EJBMethodPermission f =
+ EJBMethodPermission f =
new EJBMethodPermission("myBean","withdraw,,java.lang.int");
- EJBMethodPermission g =
+ EJBMethodPermission g =
new EJBMethodPermission("myBean","withdraw,Remote,");
- EJBMethodPermission h =
+ EJBMethodPermission h =
new EJBMethodPermission("myBean","withdraw","Remote",new String[0]);
testSerialization(a);
testSerialization(b);
@@ -412,7 +412,7 @@
testSerialization(f);
testSerialization(g);
testSerialization(h);
-
+
doPermissionImplies(false,a,b);
doPermissionImplies(false,b,a);
doPermissionImplies(false,c,a);
@@ -428,7 +428,7 @@
doPermissionImplies(true,d,c);
doPermissionImplies(true,g,h);
doPermissionImplies(true,h,g);
-
+
doEJBRoleRefPermission(true,"EJBName","customer");
EJBRoleRefPermission a1,a2,a3,a4;
@@ -441,7 +441,7 @@
testSerialization(a2);
testSerialization(a3);
testSerialization(a4);
-
+
doPermissionImplies(true,a1,a1);
doPermissionImplies(false,a1,a2);
doPermissionImplies(false,a1,a3);
@@ -468,7 +468,7 @@
for (int i=0; i< m.length; i++) {
for (int j=0; j<m.length; j++) {
- if (i == j) {
+ if (i == j) {
doPermissionImplies(true,p[i],p[j]);
} else {
doPermissionImplies(false,p[i],p[j]);
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestPCF.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestPCF.java
index b56d956..e505e1b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestPCF.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestPCF.java
@@ -32,17 +32,17 @@
stat.addDescription(testSuite);
String description = null;
boolean expectACException =
- (args != null && args.length > 0) ?
+ (args != null && args.length > 0) ?
Boolean.parseBoolean(args[0]) : true;
- String expectedException =
+ String expectedException =
(args != null && args.length > 1) ? args[1] : null;
System.out.println("expect AccessControlException: " + expectACException);
System.out.println("expected Exception: " + expectedException);
-
+
description = testSuite + "-" + expectACException + "-" +
expectedException + " without SecurityManager";
try {
- PolicyConfigurationFactory f =
+ PolicyConfigurationFactory f =
PolicyConfigurationFactory.getPolicyConfigurationFactory();
stat.addStatus(description, stat.PASS);
} catch(Exception ex) {
@@ -64,7 +64,7 @@
description = testSuite + "-" + expectACException + "-" +
expectedException + " with SecurityManager";
try {
- PolicyConfigurationFactory f =
+ PolicyConfigurationFactory f =
PolicyConfigurationFactory.getPolicyConfigurationFactory();
stat.addStatus(description, stat.PASS);
} catch(AccessControlException ace) {
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPattern.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPattern.java
index aa2bb9a..ab6576a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPattern.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPattern.java
@@ -29,7 +29,7 @@
String description = "testPatternType:" + p;
URLPattern u = new URLPattern(p);
int result = u.patternType();
- if (result == expected) {
+ if (result == expected) {
System.out.println("patternType: " + expected + " " +
result + " succeded " + u);
stat.addStatus(description, stat.PASS);
@@ -62,16 +62,16 @@
result + " succeded " + u1 + "\t" + u2);
stat.addStatus(description, stat.PASS);
} else if (result != 0 && unknown) {
- System.out.println("compareTo(->): !0 " +
+ System.out.println("compareTo(->): !0 " +
result + " succeded " + u1 + "\t" + u2);
stat.addStatus(description, stat.PASS);
} else {
- System.out.println("compareTo(->): " + expected + " " +
+ System.out.println("compareTo(->): " + expected + " " +
result + " failed " + u1 + "\t" + u2);
stat.addStatus(description, stat.FAIL);
}
} else {
- System.out.println("compareTo(<-): " + expected * -1 + " " +
+ System.out.println("compareTo(<-): " + expected * -1 + " " +
inverse + " failed " + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
}
@@ -86,13 +86,13 @@
expected = true;
}
break;
- case URLPattern.PT_DEFAULT:
+ case URLPattern.PT_DEFAULT:
expected = true;
break;
case URLPattern.PT_EXTENSION:
if (p2Type == URLPattern.PT_EXTENSION && p1.equals(p2)) {
expected = true;
- } else if (p2Type == URLPattern.PT_EXACT &&
+ } else if (p2Type == URLPattern.PT_EXACT &&
p2.endsWith(p1.substring(1))) {
expected = true;
}
@@ -101,7 +101,7 @@
if (p1.equals("/*")) {
expected = true;
} else if (p2.startsWith(p1.substring(0,p1.length()-2)) &&
- (p2.length() == p1.length()-2 ||
+ (p2.length() == p1.length()-2 ||
p2.substring(p1.length()-2).startsWith("/"))) {
expected = true;
}
@@ -124,16 +124,16 @@
boolean result = u1.implies(u2);
boolean inverse = u2.implies(u1);
- if (result == expected) {
- System.out.println("implies(->): " + expected + " " + result +
+ if (result == expected) {
+ System.out.println("implies(->): " + expected + " " + result +
" succeded " + u1 + "\t" + u2);
stat.addStatus(description, stat.PASS);
} else if (inverse != expectedInverse) {
- System.out.println("implies(<-): " + expectedInverse + " " +
+ System.out.println("implies(<-): " + expectedInverse + " " +
inverse + " failed " + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
} else {
- System.out.println("implies(->): " + expected + " " + result +
+ System.out.println("implies(->): " + expected + " " + result +
" failed " + u1 + "\t" + u2);
stat.addStatus(description, stat.FAIL);
}
@@ -142,7 +142,7 @@
private static void test_equals(
String p1, int p1Type, String p2, int p2Type) {
- String description = "testEquals:" +
+ String description = "testEquals:" +
p1 + "-" + p1Type + "-" + p2 + "-" + p2Type;
URLPattern u1 = new URLPattern(p1);
URLPattern u2 = new URLPattern(p2);
@@ -154,7 +154,7 @@
if (result == inverse) {
if (result == true && (!u1.implies(u2) || !u2.implies(u1))) {
- System.out.println("equals(<->): " + expected + " " +
+ System.out.println("equals(<->): " + expected + " " +
result + " failed " + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
@@ -163,13 +163,13 @@
result + " succeded " + u1 + "\t" + u2);
stat.addStatus(description, stat.PASS);
- } else {
- System.out.println("equals(-->): " + expected + " " +
+ } else {
+ System.out.println("equals(-->): " + expected + " " +
result + " failed " + u1 + "\t" + u2);
stat.addStatus(description, stat.FAIL);
}
} else {
- System.out.println("equals(<--): " + result + " " +
+ System.out.println("equals(<--): " + result + " " +
inverse + " failed " + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
}
@@ -182,7 +182,7 @@
"/a/b/c.jsp",
"/a/c",
"/*",
- "/a/*",
+ "/a/*",
"/a/c/*",
"//*",
"*.jsp",
@@ -204,17 +204,17 @@
/* COMMENTED OUT! ,URLPattern.PT_DEFAULT */
};
- for (int i=0; i<upArray.length; i++) {
+ for (int i=0; i<upArray.length; i++) {
test_patternType(upArray[i],upTypeArray[i]);
}
-
+
for (int i=0; i<upArray.length; i++) {
for (int j=0; j<upArray.length; j++) {
test_compareTo(upArray[i],upTypeArray[i],
upArray[j],upTypeArray[j]);
}
}
-
+
for (int i=0; i<upArray.length; i++) {
for (int j=0; j<upArray.length; j++) {
test_implies(upArray[i],upTypeArray[i],
@@ -222,13 +222,13 @@
}
}
- for (int i=0; i<upArray.length; i++) {
+ for (int i=0; i<upArray.length; i++) {
for (int j=0; j<upArray.length; j++) {
test_equals(upArray[i],upTypeArray[i],
upArray[j],upTypeArray[j]);
}
}
-
+
stat.printSummary(testSuite);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPatternSpec.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPatternSpec.java
index 6399dd5..07881a8 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPatternSpec.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestURLPatternSpec.java
@@ -30,25 +30,25 @@
private static boolean test_constructor(
String p, boolean expectedToSucceed) {
boolean result = expectedToSucceed;
-
+
try {
URLPatternSpec u = new URLPatternSpec(p);
if (expectedToSucceed) {
- System.out.println("constructor( ): " + expectedToSucceed +
+ System.out.println("constructor( ): " + expectedToSucceed +
" succeded " + u.toString());
} else {
- System.out.println("constructor( ): " + expectedToSucceed +
+ System.out.println("constructor( ): " + expectedToSucceed +
" failed " + u.toString());
result = false;
}
} catch (Throwable t) {
- if (!expectedToSucceed) {
- System.out.println("constructor(e): " + expectedToSucceed +
+ if (!expectedToSucceed) {
+ System.out.println("constructor(e): " + expectedToSucceed +
" succeded " + p);
} else {
result = false;
- System.out.println("constructor(e): " + expectedToSucceed +
+ System.out.println("constructor(e): " + expectedToSucceed +
" failed " + p);
t.printStackTrace();
}
@@ -71,7 +71,7 @@
System.out.println("getURLPattern: succeded " + expected + " " +
result + " " + s);
} else {
- System.out.println("getURLPattern: failed " + expected + " " +
+ System.out.println("getURLPattern: failed " + expected + " " +
result + " " + s);
}
}
@@ -88,8 +88,8 @@
if (result == inverse) {
if (result == true && (!u1.implies(u2) || !u2.implies(u1))) {
- System.out.println("equals(<->): " + expected + " " +
- result + " failed " +
+ System.out.println("equals(<->): " + expected + " " +
+ result + " failed " +
"\t" + u1.implies(u2) + u2.implies(u1)+" "+
"\t" + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
@@ -97,13 +97,13 @@
System.out.println("equals(-->): " + expected + " " +
result + " succeded " + u1 + "\t" + u2);
stat.addStatus(description, stat.PASS);
- } else {
- System.out.println("equals(-->): " + expected + " " +
+ } else {
+ System.out.println("equals(-->): " + expected + " " +
result + " failed " + u1 + "\t" + u2);
stat.addStatus(description, stat.FAIL);
}
} else {
- System.out.println("equals(<--): " + result + " " +
+ System.out.println("equals(<--): " + result + " " +
inverse + " failed " + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
}
@@ -149,7 +149,7 @@
URLPatternSpec u2 = new URLPatternSpec(s2.toString());
int other = u2.hashCode();
- if (result == again && result == other) {
+ if (result == again && result == other) {
System.out.println("hashCode: " + result + " " +
again + " " + other + " succeded " + s1 +
" " + u2.toString());
@@ -173,15 +173,15 @@
boolean inverse = u2.implies(u1);
if (result != expected) {
- System.out.println("implies(->): " + expected + " " + result +
+ System.out.println("implies(->): " + expected + " " + result +
" succeded " + u1 + "\t" + u2);
stat.addStatus(description, stat.FAIL);
} else if (inverse != expectedInverse) {
- System.out.println("implies(<-): " + expectedInverse + " " +
+ System.out.println("implies(<-): " + expectedInverse + " " +
inverse + " failed " + u2 + "\t" + u1);
stat.addStatus(description, stat.FAIL);
} else {
- System.out.println("implies(->): " + expected + " " + result +
+ System.out.println("implies(->): " + expected + " " + result +
" failed " + u1 + "\t" + u2);
stat.addStatus(description, stat.PASS);
}
@@ -194,7 +194,7 @@
"/a/c",
"/a/b/c.jsp",
"/a/c/*",
- "/a/*",
+ "/a/*",
"/*",
/* COMMENTED OUT! "//*",*/
"*.jsp",
@@ -228,21 +228,21 @@
test_getURLPattern(s.toString());
test_hashCode(s.toString());
- URLPattern ui = new URLPattern(pArray[i]);
-
+ URLPattern ui = new URLPattern(pArray[i]);
+
for (int j=0; j<pArray.length; j++) {
boolean result = false;
URLPattern uj = new URLPattern(pArray[j]);
- if (j==i || uj.implies(ui)) {
- result = test_constructor(s.toString() + ":" +
+ if (j==i || uj.implies(ui)) {
+ result = test_constructor(s.toString() + ":" +
pArray[j],false);
} else {
switch(pTypeArray[i]) {
case URLPattern.PT_EXACT:
- result = test_constructor(s.toString() + ":" +
+ result = test_constructor(s.toString() + ":" +
pArray[j],false);
break;
case URLPattern.PT_DEFAULT:
@@ -251,18 +251,18 @@
break;
case URLPattern.PT_EXTENSION:
if (pTypeArray[j] == URLPattern.PT_PREFIX) {
- result = test_constructor(s.toString() + ":" +
+ result = test_constructor(s.toString() + ":" +
pArray[j],true);
} else if (pTypeArray[j] == URLPattern.PT_EXACT) {
- if (pArray[j].endsWith(pArray[i].substring(1))) {
- result = test_constructor(s.toString() + ":" +
+ if (pArray[j].endsWith(pArray[i].substring(1))) {
+ result = test_constructor(s.toString() + ":" +
pArray[j],true);
} else {
- result = test_constructor(s.toString() + ":" +
+ result = test_constructor(s.toString() + ":" +
pArray[j],false);
}
- } else {
- result = test_constructor(s.toString() + ":" +
+ } else {
+ result = test_constructor(s.toString() + ":" +
pArray[j],false);
}
break;
@@ -271,14 +271,14 @@
pTypeArray[j] == URLPattern.PT_PREFIX) {
if (ui.implies(uj)) {
- result = test_constructor(s.toString() + ":" +
- pArray[j],true);
+ result = test_constructor(s.toString() + ":" +
+ pArray[j],true);
} else {
- result = test_constructor(s.toString() + ":" +
+ result = test_constructor(s.toString() + ":" +
pArray[j],false);
}
} else {
- result = test_constructor(s.toString() + ":" +
+ result = test_constructor(s.toString() + ":" +
pArray[j],false);
}
break;
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestWebPerms.java b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestWebPerms.java
index 5a383ef..fec5e65 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestWebPerms.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccApi/src/TestWebPerms.java
@@ -18,7 +18,7 @@
import java.lang.reflect.*;
import java.util.Enumeration;
-import java.security.*;
+import java.security.*;
import jakarta.security.jacc.WebResourcePermission;
import jakarta.security.jacc.WebUserDataPermission;
import jakarta.security.jacc.WebRoleRefPermission;
@@ -35,7 +35,7 @@
import java.io.FileOutputStream;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
+
public class TestWebPerms {
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -54,14 +54,14 @@
Permission p2 = p1;
try {
- FileOutputStream fout = new
+ FileOutputStream fout = new
FileOutputStream("serial-test-file.tmp");
ObjectOutputStream sout = new ObjectOutputStream(fout);
sout.writeObject(p1);
sout.flush();
sout.close();
fout.close();
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
t.printStackTrace();
debug( "-- Serialization Test Failed(write)-" + p1.getName() + "," + p1.getActions())
;
@@ -72,17 +72,17 @@
ObjectInputStream sin = new ObjectInputStream(fin);
p2 = (Permission) sin.readObject();
sin.close();
- fin.close();
- } catch( Throwable t ) {
+ fin.close();
+ } catch( Throwable t ) {
t.printStackTrace();
debug( "-- Serialization Test Failed(read)-" + p1.getName() + "," + p1.getActions());
result = false;
}
if (result == true) {
- if (p2.equals(p1)) {
+ if (p2.equals(p1)) {
debug( "-- Serialization Test Succeeded -----------" + p2.getName() + "," + p2.getActions());
- } else {
+ } else {
debug( "-- Serialization Test Failed-" + p1.getName() + "," + p1.getActions());
}
} else {
@@ -124,7 +124,7 @@
if (expectedToSucceed) {
- p2 = new WebResourcePermission(p1.getName(),p1.getActions());
+ p2 = new WebResourcePermission(p1.getName(),p1.getActions());
if (!p1.equals(p2)) {
result = false;
@@ -142,7 +142,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -165,7 +165,7 @@
debug( "-- Construct Test --");
p1 = new WebResourcePermission(URLPattern,methods);
if (expectedToSucceed) {
- p2 = new WebResourcePermission(p1.getName(),p1.getActions());
+ p2 = new WebResourcePermission(p1.getName(),p1.getActions());
if (!p1.equals(p2)) {
result = false;
debug("p != p\n\t" + p1 + "\n\t" + p2);
@@ -178,7 +178,7 @@
debug("unexpected success\t" + p1);
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
}
@@ -203,7 +203,7 @@
if (expectedToSucceed) {
- p2 = new WebResourcePermission(p1.getName(),p1.getActions());
+ p2 = new WebResourcePermission(p1.getName(),p1.getActions());
if (!p1.equals(p2)) {
result = false;
@@ -221,7 +221,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -250,7 +250,7 @@
if (expectedToSucceed) {
- p2 = new WebRoleRefPermission(p1.getName(),p1.getActions());
+ p2 = new WebRoleRefPermission(p1.getName(),p1.getActions());
if (!p1.equals(p2)) {
result = false;
@@ -268,7 +268,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -295,7 +295,7 @@
if (expectedToSucceed) {
- p2 = new WebUserDataPermission(p1.getName(),p1.getActions());
+ p2 = new WebUserDataPermission(p1.getName(),p1.getActions());
if (!p1.equals(p2)) {
result = false;
@@ -313,7 +313,7 @@
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
@@ -338,7 +338,7 @@
(URLPattern,makeWUDActions(methods,transportType));
if (expectedToSucceed) {
- p2 = new WebUserDataPermission(p1.getName(),p1.getActions());
+ p2 = new WebUserDataPermission(p1.getName(),p1.getActions());
if (!p1.equals(p2)) {
result = false;
debug("p != p\n\t" + p1 + "\n\t" + p2);
@@ -351,7 +351,7 @@
debug("unexpected success\t" + p1);
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
if (expectedToSucceed) {
t.printStackTrace();
}
@@ -366,7 +366,7 @@
}
private static boolean doPermissionImplies (boolean expectedResult,
- Permission thisP, Permission p) {
+ Permission thisP, Permission p) {
boolean result = true;
String description = "doPermissionImplies:" +
expectedResult + "-" + thisP + "-" + p;
@@ -377,18 +377,18 @@
if (thisP.implies(p) != expectedResult) {
debug(
(expectedResult ? "unexpected failure:" :"unexpected success:")
- + printP(p) + (expectedResult ?" not implied by:":" implied by:") +
+ + printP(p) + (expectedResult ?" not implied by:":" implied by:") +
printP(thisP));
debug( "-- Permission implies Test failed(not implied)----------------------------");
result = false;
} else {
- debug(printP(p) +
- (expectedResult ? " implied by:":" not implied by:") +
+ debug(printP(p) +
+ (expectedResult ? " implied by:":" not implied by:") +
printP(thisP));
debug( "-- Permission implies Test Succeeded -------------------------------------");
result = true;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
debug("unexpected exception");
t.printStackTrace();
debug( "-- Permission implies Test failed(exception)---------------------------------");
@@ -412,25 +412,25 @@
debug( "-- HttpMethodSpec implies Test failed(not implied)----------------------------");
result = false;
} else {
- debug(thatS +
+ debug(thatS +
(expectedResult ? " implied by:":" not implied by:") + thisS);
result = true;
}
if (!thisS.implies(thisS)) {
- debug( "unexpected failure:"
+ debug( "unexpected failure:"
+ thisS + " not implied by: " + thisS);
debug( "-- HttpMethodSpec implies Test failed(not implied)----------------------------");
result = false;
}
if (!thatS.implies(thatS)) {
- debug( "unexpected failure:"
+ debug( "unexpected failure:"
+ thatS + " not implied by: " + thatS);
debug( "-- HttpMethodSpec implies Test failed(not implied)----------------------------");
result = false;
}
- } catch( Throwable t ) {
+ } catch( Throwable t ) {
debug("unexpected exception");
t.printStackTrace();
debug( "-- HttpMethodSpec implies Test failed(exception)---------------------------------");
@@ -441,11 +441,11 @@
public static void main( String[] args ) {
boolean result = true;
- String tArray[] = {
- null,
- ":NONE",
- ":INTEGRAL",
- ":CONFIDENTIAL"
+ String tArray[] = {
+ null,
+ ":NONE",
+ ":INTEGRAL",
+ ":CONFIDENTIAL"
};
String mArray[] = {
@@ -491,13 +491,13 @@
"/a/c",
"/a/b/c.jsp",
"/a/c/*:/a/c",
- "/a/*:/a/c:/a/b/c.jsp",
+ "/a/*:/a/c:/a/b/c.jsp",
"/*:/a/c:/a/b/c.jsp:/a/c/*:/a/*",
"*.jsp:/a/c/*:/a/*:/a/b/c.jsp",
"*.asp:/a/c/*:/a/*",
"/:/a/c:/a/b/c.jsp:/a/c/*:/a/*:*.jsp:*.asp"
};
-
+
for (int i=0; i<msArray.length; i++) {
HttpMethodSpec s = HttpMethodSpec.getSpec(msArray[i]);
@@ -506,8 +506,8 @@
String actions = s.getActions();
- debug("input actions: " + msArray[i] +
- " hashCode: " + hCode +
+ debug("input actions: " + msArray[i] +
+ " hashCode: " + hCode +
" actions:" + actions);
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.properties b/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.properties
index 09d16d6..241af8f 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/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="jaccmr8"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.xml b/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.xml
index f615a0c..5ad088b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/build.xml
@@ -25,14 +25,14 @@
]>
<project name="jaccmr8" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
&commonSecurity;
-
+
<target name="all" depends="clean, setup, build, deploy, run, undeploy, unsetup"/>
-
+
<target name="setup" depends="init-common">
<antcall target="create-user-common">
<param name="user" value="jaccuser"/>
@@ -57,7 +57,7 @@
<arg value="otheruser"/>
</java>
</target>
-
+
<target name="unsetup" depends="init-common">
<antcall target="delete-user-common">
<param name="user" value="jaccuser"/>
@@ -66,14 +66,14 @@
<param name="user" value="otheruser"/>
</antcall>
</target>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
</target>
-
+
<target name="build" depends="compile">
<antcall target="compile-common">
<param name="src" value="web"/>
@@ -86,15 +86,15 @@
<antcall target="compile-common">
<param name="src" value="ejb"/>
</antcall>
-
+
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="**/Hello**.class"/>
</antcall>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <copy file="${glassfish-application.xml}" tofile="${build.classes.dir}/META-INF/glassfish-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <copy file="${glassfish-application.xml}" tofile="${build.classes.dir}/META-INF/glassfish-application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
@@ -103,13 +103,13 @@
<include name="META-INF/application.xml"/>
<include name="META-INF/glassfish-application.xml"/>
</fileset>
- </jar>
+ </jar>
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -117,7 +117,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java
index 4c2c257..35b1757 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/client/Client.java
@@ -24,483 +24,483 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
- private static String testSuite = "Security::JACCMR8";
- private static String contextPath = "/jaccmr8";
-
- private String host;
- private String port;
- private String username;
- private String password;
- private String rolename;
- private String otheruser;
- private String ejbmode = "None";
+ private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
+ private static String testSuite = "Security::JACCMR8";
+ private static String contextPath = "/jaccmr8";
- public static void main(String[] args) {
- stat.addDescription(testSuite);
- Client client = new Client(args);
- client.doTests();
- stat.printSummary();
- }
+ private String host;
+ private String port;
+ private String username;
+ private String password;
+ private String rolename;
+ private String otheruser;
+ private String ejbmode = "None";
- public Client(String[] args) {
- host = args[0];
- port = args[1];
- username = args[2];
- password = args[3];
- rolename = args[4];
- otheruser = args[5];
- System.out.println(" Host: " + host);
- System.out.println(" Port: " + port);
- System.out.println(" Username: " + username);
- System.out.println(" Rolename: " + rolename);
- System.out.println("Other User: " + otheruser);
- }
+ public static void main(String[] args) {
+ stat.addDescription(testSuite);
+ Client client = new Client(args);
+ client.doTests();
+ stat.printSummary();
+ }
- public void doTests() {
- // Use the stateful EJB inside the servlet
- // The stateful EJB uses annotations to protect the EJB
- ejbmode = "stateful";
- testAnyAuthUser();
- testAnyAuthUserOther();
- testAnyAuthUserNone();
- testDenyUncovered();
- testDenyUncoveredOther();
- testDenyUncoveredNone();
- testStar();
- testStarOther();
- testStarNone();
- testServlet();
- testServletOther();
- testServletNone();
- testAuthUser();
- testAuthUserOther();
- testAuthUserNone();
+ public Client(String[] args) {
+ host = args[0];
+ port = args[1];
+ username = args[2];
+ password = args[3];
+ rolename = args[4];
+ otheruser = args[5];
+ System.out.println(" Host: " + host);
+ System.out.println(" Port: " + port);
+ System.out.println(" Username: " + username);
+ System.out.println(" Rolename: " + rolename);
+ System.out.println("Other User: " + otheruser);
+ }
- // Use the stateless EJB inside the servlet
- // The stateless EJB uses the deployment descriptor to protect the EJB
- // Only repeat tests that actually can invoke the servlet
- ejbmode = "stateless";
- testAnyAuthUser();
- testAnyAuthUserOther();
- testStar();
- testAuthUser();
- testServlet();
- testServletOther();
- testServletNone();
- }
+ public void doTests() {
+ // Use the stateful EJB inside the servlet
+ // The stateful EJB uses annotations to protect the EJB
+ ejbmode = "stateful";
+ testAnyAuthUser();
+ testAnyAuthUserOther();
+ testAnyAuthUserNone();
+ testDenyUncovered();
+ testDenyUncoveredOther();
+ testDenyUncoveredNone();
+ testStar();
+ testStarOther();
+ testStarNone();
+ testServlet();
+ testServletOther();
+ testServletNone();
+ testAuthUser();
+ testAuthUserOther();
+ testAuthUserNone();
- public void testAnyAuthUser() {
- String servlet = "/anyauthuser";
- String description = servlet+"-"+username+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // Use the stateless EJB inside the servlet
+ // The stateless EJB uses the deployment descriptor to protect the EJB
+ // Only repeat tests that actually can invoke the servlet
+ ejbmode = "stateless";
+ testAnyAuthUser();
+ testAnyAuthUserOther();
+ testStar();
+ testAuthUser();
+ testServlet();
+ testServletOther();
+ testServletNone();
+ }
- // Check results in output
- success = checkResults(output,true,true,true,true,true,true);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testAnyAuthUser() {
+ String servlet = "/anyauthuser";
+ String description = servlet+"-"+username+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ // Check results in output
+ success = checkResults(output,true,true,true,true,true,true);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testAnyAuthUserOther() {
- String servlet = "/anyauthuser";
- String description = servlet+"-"+otheruser+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, otheruser, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ stat.addStatus(description, stat.PASS);
+ }
- // Check results in output
- success = checkResults(output,false,true,true,false,false,true);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testAnyAuthUserOther() {
+ String servlet = "/anyauthuser";
+ String description = servlet+"-"+otheruser+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, otheruser, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ // Check results in output
+ success = checkResults(output,false,true,true,false,false,true);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testAnyAuthUserNone() {
- String servlet = "/anyauthuser";
- String description = servlet+"--"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 401, null, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ stat.addStatus(description, stat.PASS);
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ public void testAnyAuthUserNone() {
+ String servlet = "/anyauthuser";
+ String description = servlet+"--"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 401, null, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testAuthUser() {
- String servlet = "/authuser";
- String description = servlet+"-"+username+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- // Check results in output
- success = checkResults(output,true,true,true,true,true,true);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testAuthUser() {
+ String servlet = "/authuser";
+ String description = servlet+"-"+username+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ // Check results in output
+ success = checkResults(output,true,true,true,true,true,true);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testAuthUserOther() {
- String servlet = "/authuser";
- String description = servlet+"-"+otheruser+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 403, otheruser, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ stat.addStatus(description, stat.PASS);
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ public void testAuthUserOther() {
+ String servlet = "/authuser";
+ String description = servlet+"-"+otheruser+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 403, otheruser, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testAuthUserNone() {
- String servlet = "/authuser";
- String description = servlet+"--"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 401, null, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ public void testAuthUserNone() {
+ String servlet = "/authuser";
+ String description = servlet+"--"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 401, null, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testStar() {
- String servlet = "/star";
- String description = servlet+"-"+username+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- // Check results in output
- success = checkResults(output,true,true,true,true,true,true);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testStar() {
+ String servlet = "/star";
+ String description = servlet+"-"+username+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ // Check results in output
+ success = checkResults(output,true,true,true,true,true,true);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testStarOther() {
- String servlet = "/star";
- String description = servlet+"-"+otheruser+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 403, otheruser, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ stat.addStatus(description, stat.PASS);
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ public void testStarOther() {
+ String servlet = "/star";
+ String description = servlet+"-"+otheruser+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 403, otheruser, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testStarNone() {
- String servlet = "/star";
- String description = servlet+"--"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 401, null, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ public void testStarNone() {
+ String servlet = "/star";
+ String description = servlet+"--"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 401, null, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- public void testServlet() {
- String servlet = "/servlet";
- String description = servlet+"-"+username+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- // Check results in output
- success = checkResults(output,false,false,false,false,false,false);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testServlet() {
+ String servlet = "/servlet";
+ String description = servlet+"-"+username+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, username, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
+
+ // Check results in output
+ success = checkResults(output,false,false,false,false,false,false);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ stat.addStatus(description, stat.PASS);
+ }
- public void testServletOther() {
- String servlet = "/servlet";
- String description = servlet+"-"+otheruser+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, otheruser, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testServletOther() {
+ String servlet = "/servlet";
+ String description = servlet+"-"+otheruser+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, otheruser, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- // Check results in output
- success = checkResults(output,false,false,false,false,false,false);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // Check results in output
+ success = checkResults(output,false,false,false,false,false,false);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ stat.addStatus(description, stat.PASS);
+ }
- public void testServletNone() {
- String servlet = "/servlet";
- String description = servlet+"--"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 200, null, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testServletNone() {
+ String servlet = "/servlet";
+ String description = servlet+"--"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 200, null, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- // Check results in output
- success = checkResults(output,false,false,false,false,false,false);
- if (!success) {
- System.out.println("Incorrect results:" + description);
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ // Check results in output
+ success = checkResults(output,false,false,false,false,false,false);
+ if (!success) {
+ System.out.println("Incorrect results:" + description);
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- stat.addStatus(description, stat.PASS);
- }
+ stat.addStatus(description, stat.PASS);
+ }
- public void testDenyUncovered() {
- String servlet = "/denyuncoveredpost";
- String description = servlet+"-"+username+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 403, username, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testDenyUncovered() {
+ String servlet = "/denyuncoveredpost";
+ String description = servlet+"-"+username+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 403, username, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- public void testDenyUncoveredOther() {
- String servlet = "/denyuncoveredpost";
- String description = servlet+"-"+otheruser+"-"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 403, otheruser, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testDenyUncoveredOther() {
+ String servlet = "/denyuncoveredpost";
+ String description = servlet+"-"+otheruser+"-"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 403, otheruser, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- public void testDenyUncoveredNone() {
- String servlet = "/denyuncoveredpost";
- String description = servlet+"--"+ejbmode;
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, 403, null, ejbmode, output);
- if (!success) {
- stat.addStatus(description, stat.FAIL);
- return;
- }
+ public void testDenyUncoveredNone() {
+ String servlet = "/denyuncoveredpost";
+ String description = servlet+"--"+ejbmode;
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, 403, null, ejbmode, output);
+ if (!success) {
+ stat.addStatus(description, stat.FAIL);
+ return;
+ }
- // No results to check!
- stat.addStatus(description, stat.PASS);
- }
+ // No results to check!
+ stat.addStatus(description, stat.PASS);
+ }
- // Validate that all the passed in results are as expected
- // If any value is not as expected the overall results are false
- private boolean checkResults(StringBuffer results,
- boolean EJBisCallerInRole, boolean EJBisUserInAnyAuthUserRole,
- boolean EJBInvokeAnyAuthUser, boolean EJBInvokeAuthUser,
- boolean WEBisUserInRole, boolean WEBisUserInAnyAuthUserRole) {
- int index;
- boolean result = true;
+ // Validate that all the passed in results are as expected
+ // If any value is not as expected the overall results are false
+ private boolean checkResults(StringBuffer results,
+ boolean EJBisCallerInRole, boolean EJBisUserInAnyAuthUserRole,
+ boolean EJBInvokeAnyAuthUser, boolean EJBInvokeAuthUser,
+ boolean WEBisUserInRole, boolean WEBisUserInAnyAuthUserRole) {
+ int index;
+ boolean result = true;
- if (EJBisCallerInRole)
- index = results.indexOf("EJB isCallerInRole: true");
- else
- index = results.indexOf("EJB isCallerInRole: false");
- if (index == -1)
- result = false;
+ if (EJBisCallerInRole)
+ index = results.indexOf("EJB isCallerInRole: true");
+ else
+ index = results.indexOf("EJB isCallerInRole: false");
+ if (index == -1)
+ result = false;
- if (!result) return result;
+ if (!result) return result;
- if (EJBisUserInAnyAuthUserRole)
- index = results.indexOf("EJB isUserInAnyAuthUserRole: true");
- else
- index = results.indexOf("EJB isUserInAnyAuthUserRole: false");
- if (index == -1)
- result = false;
+ if (EJBisUserInAnyAuthUserRole)
+ index = results.indexOf("EJB isUserInAnyAuthUserRole: true");
+ else
+ index = results.indexOf("EJB isUserInAnyAuthUserRole: false");
+ if (index == -1)
+ result = false;
- if (!result) return result;
+ if (!result) return result;
- if (WEBisUserInRole)
- index = results.indexOf("WEB isUserInRole: true");
- else
- index = results.indexOf("WEB isUserInRole: false");
- if (index == -1)
- result = false;
+ if (WEBisUserInRole)
+ index = results.indexOf("WEB isUserInRole: true");
+ else
+ index = results.indexOf("WEB isUserInRole: false");
+ if (index == -1)
+ result = false;
- if (!result) return result;
+ if (!result) return result;
- if (WEBisUserInAnyAuthUserRole)
- index = results.indexOf("WEB isUserInAnyAuthUserRole: true");
- else
- index = results.indexOf("WEB isUserInAnyAuthUserRole: false");
- if (index == -1)
- result = false;
+ if (WEBisUserInAnyAuthUserRole)
+ index = results.indexOf("WEB isUserInAnyAuthUserRole: true");
+ else
+ index = results.indexOf("WEB isUserInAnyAuthUserRole: false");
+ if (index == -1)
+ result = false;
- if (!result) return result;
+ if (!result) return result;
- index = results.indexOf("EJB Invoke AnyAuthUser: Yes");
- if (EJBInvokeAnyAuthUser)
- result = (index != -1);
- else
- result = (index == -1);
+ index = results.indexOf("EJB Invoke AnyAuthUser: Yes");
+ if (EJBInvokeAnyAuthUser)
+ result = (index != -1);
+ else
+ result = (index == -1);
- if (!result) return result;
+ if (!result) return result;
- index = results.indexOf("EJB Invoke AuthUser: Yes");
- if (EJBInvokeAuthUser)
- result = (index != -1);
- else
- result = (index == -1);
+ index = results.indexOf("EJB Invoke AuthUser: Yes");
+ if (EJBInvokeAuthUser)
+ result = (index != -1);
+ else
+ result = (index == -1);
- return result;
- }
+ return result;
+ }
- private boolean doIndividualTest(String servlet, int code, String user, String mode, StringBuffer output) {
- boolean result = false;
- try {
- int rtncode;
- String url = "http://" + host + ":" + port + contextPath + servlet;
+ private boolean doIndividualTest(String servlet, int code, String user, String mode, StringBuffer output) {
+ boolean result = false;
+ try {
+ int rtncode;
+ String url = "http://" + host + ":" + port + contextPath + servlet;
- Hashtable ht = new Hashtable();
- ht.put("mode", URLEncoder.encode(mode,"UTF-8"));
- ht.put("name", URLEncoder.encode(rolename,"UTF-8"));
+ Hashtable ht = new Hashtable();
+ ht.put("mode", URLEncoder.encode(mode,"UTF-8"));
+ ht.put("name", URLEncoder.encode(rolename,"UTF-8"));
- System.out.println("\nInvoking servlet at " + url);
- rtncode = invokeServlet(url, ht, user, output);
- System.out.println("The servlet return code: " + rtncode);
- if (rtncode != code) {
- System.out.println("Incorrect return code, expecting: " + code);
- }
- else result = true;
- } catch (Exception ex) {
- System.out.println("Exception: " + ex.toString());
- //ex.printStackTrace();
- }
- return result;
- }
+ System.out.println("\nInvoking servlet at " + url);
+ rtncode = invokeServlet(url, ht, user, output);
+ System.out.println("The servlet return code: " + rtncode);
+ if (rtncode != code) {
+ System.out.println("Incorrect return code, expecting: " + code);
+ }
+ else result = true;
+ } catch (Exception ex) {
+ System.out.println("Exception: " + ex.toString());
+ //ex.printStackTrace();
+ }
+ return result;
+ }
- private int invokeServlet(String url, Hashtable contentHash, String user, StringBuffer output) throws Exception {
- URL u = new URL(url);
- HttpURLConnection c1 = (HttpURLConnection) u.openConnection();
- c1.setAllowUserInteraction(true);
- if ((user != null) && (user.length() > 0)) {
- // Add BASIC header for authentication
- String auth = user + ":" + password;
- String authEncoded = new sun.misc.BASE64Encoder().encode(auth.getBytes());
- c1.setRequestProperty("Authorization", "Basic " + authEncoded);
- }
- c1.setDoOutput(true);
- c1.setUseCaches(false);
+ private int invokeServlet(String url, Hashtable contentHash, String user, StringBuffer output) throws Exception {
+ URL u = new URL(url);
+ HttpURLConnection c1 = (HttpURLConnection) u.openConnection();
+ c1.setAllowUserInteraction(true);
+ if ((user != null) && (user.length() > 0)) {
+ // Add BASIC header for authentication
+ String auth = user + ":" + password;
+ String authEncoded = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+ c1.setRequestProperty("Authorization", "Basic " + authEncoded);
+ }
+ c1.setDoOutput(true);
+ c1.setUseCaches(false);
- // get the output stream to POST to.
- DataOutputStream out;
- out = new DataOutputStream(c1.getOutputStream());
- String content = "";
+ // get the output stream to POST to.
+ DataOutputStream out;
+ out = new DataOutputStream(c1.getOutputStream());
+ String content = "";
- // Create a single String value to be POSTED from the parameters passed
- // to us. This is done by making "name"="value" pairs for all the keys
- // in the Hashtable passed to us.
- Enumeration e = contentHash.keys();
- boolean first = true;
- while (e.hasMoreElements()) {
- // For each key and value pair in the hashtable
- Object key = e.nextElement();
- Object value = contentHash.get(key);
+ // Create a single String value to be POSTED from the parameters passed
+ // to us. This is done by making "name"="value" pairs for all the keys
+ // in the Hashtable passed to us.
+ Enumeration e = contentHash.keys();
+ boolean first = true;
+ while (e.hasMoreElements()) {
+ // For each key and value pair in the hashtable
+ Object key = e.nextElement();
+ Object value = contentHash.get(key);
- // If this is not the first key-value pair in the hashtable,
- // concantenate an "&" sign to the constructed String
- if (!first)
- content += "&";
+ // If this is not the first key-value pair in the hashtable,
+ // concantenate an "&" sign to the constructed String
+ if (!first)
+ content += "&";
- // append to a single string. Encode the value portion
- content += (String) key + "=" + URLEncoder.encode((String) value,"UTF-8");
+ // append to a single string. Encode the value portion
+ content += (String) key + "=" + URLEncoder.encode((String) value,"UTF-8");
- first = false;
- }
+ first = false;
+ }
- // Write out the bytes of the content string to the stream.
- out.writeBytes(content);
- out.flush();
- out.close();
+ // Write out the bytes of the content string to the stream.
+ out.writeBytes(content);
+ out.flush();
+ out.close();
- // Connect and get the response code and/or output to verify
- c1.connect();
- int code = c1.getResponseCode();
- if (code == HttpURLConnection.HTTP_OK) {
- InputStream is = null;
- BufferedReader input = null;
- String line = null;
- try {
- is = c1.getInputStream();
- input = new BufferedReader(new InputStreamReader(is));
- while ((line = input.readLine()) != null) {
- output.append(line);
- System.out.println(line);
- }
- }
- finally {
- try { if (is != null) is.close(); }
- catch (Exception exc) {}
- try { if (input != null) input.close(); }
- catch (Exception exc) {}
- }
- }
- return code;
- }
+ // Connect and get the response code and/or output to verify
+ c1.connect();
+ int code = c1.getResponseCode();
+ if (code == HttpURLConnection.HTTP_OK) {
+ InputStream is = null;
+ BufferedReader input = null;
+ String line = null;
+ try {
+ is = c1.getInputStream();
+ input = new BufferedReader(new InputStreamReader(is));
+ while ((line = input.readLine()) != null) {
+ output.append(line);
+ System.out.println(line);
+ }
+ }
+ finally {
+ try { if (is != null) is.close(); }
+ catch (Exception exc) {}
+ try { if (input != null) input.close(); }
+ catch (Exception exc) {}
+ }
+ }
+ return code;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/ejb-jar.xml
index cb63e52..35cfe65 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/ejb-jar.xml
@@ -21,46 +21,46 @@
metadata-complete="false" version="3.1"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd">
<module-name>jaccmr8-ejb</module-name>
- <enterprise-beans>
- <!-- See EJB annotations
+ <enterprise-beans>
+ <!-- See EJB annotations
<session>
<display-name>HelloStatefulEJB</display-name>
<ejb-name>HelloStatefulEJB</ejb-name>
<business-local>org.glassfish.jacc.test.mr8.HelloStateful</business-local>
<ejb-class>org.glassfish.jacc.test.mr8.HelloStatefulEJB</ejb-class>
</session>
- -->
- <session>
- <display-name>HelloEJB</display-name>
- <ejb-name>HelloEJB</ejb-name>
- <business-local>org.glassfish.jacc.test.mr8.Hello</business-local>
- <ejb-class>org.glassfish.jacc.test.mr8.HelloEJB</ejb-class>
- <!-- GLASSFISH-20036 fixes IllegalStateException when role-refs are not declared.
- The @DeclareRoles annotation provides the linkage between roles silently.
- <security-role-ref>
- <role-name>javaUsers</role-name>
- <role-link>javaUsers</role-link>
- </security-role-ref>
- -->
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <security-role>
- <role-name>javaUsers</role-name>
- </security-role>
- <method-permission>
- <role-name>javaUsers</role-name>
- <method>
- <ejb-name>HelloEJB</ejb-name>
- <method-name>methodAuthUser</method-name>
- </method>
- </method-permission>
- <method-permission>
- <role-name>**</role-name>
- <method>
- <ejb-name>HelloEJB</ejb-name>
- <method-name>methodAnyAuthUser</method-name>
- </method>
- </method-permission>
- </assembly-descriptor>
+ -->
+ <session>
+ <display-name>HelloEJB</display-name>
+ <ejb-name>HelloEJB</ejb-name>
+ <business-local>org.glassfish.jacc.test.mr8.Hello</business-local>
+ <ejb-class>org.glassfish.jacc.test.mr8.HelloEJB</ejb-class>
+ <!-- GLASSFISH-20036 fixes IllegalStateException when role-refs are not declared.
+ The @DeclareRoles annotation provides the linkage between roles silently.
+ <security-role-ref>
+ <role-name>javaUsers</role-name>
+ <role-link>javaUsers</role-link>
+ </security-role-ref>
+ -->
+ </session>
+ </enterprise-beans>
+ <assembly-descriptor>
+ <security-role>
+ <role-name>javaUsers</role-name>
+ </security-role>
+ <method-permission>
+ <role-name>javaUsers</role-name>
+ <method>
+ <ejb-name>HelloEJB</ejb-name>
+ <method-name>methodAuthUser</method-name>
+ </method>
+ </method-permission>
+ <method-permission>
+ <role-name>**</role-name>
+ <method>
+ <ejb-name>HelloEJB</ejb-name>
+ <method-name>methodAnyAuthUser</method-name>
+ </method>
+ </method-permission>
+ </assembly-descriptor>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/web.xml
index 0d1092f..6af8674 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/descriptor/web.xml
@@ -42,50 +42,50 @@
</servlet-mapping>
-->
- <security-constraint>
- <web-resource-collection>
+ <security-constraint>
+ <web-resource-collection>
<web-resource-name>authuser</web-resource-name>
- <url-pattern>/authuser</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>javaUsers</role-name>
- </auth-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
+ <url-pattern>/authuser</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>javaUsers</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
<web-resource-name>anyauthuser</web-resource-name>
- <url-pattern>/anyauthuser</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>**</role-name>
- </auth-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
+ <url-pattern>/anyauthuser</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>**</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
<web-resource-name>star</web-resource-name>
- <url-pattern>/star</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <!-- Will not include any authenticated user unless declared as security-role -->
- <auth-constraint>
- <role-name>*</role-name>
- <role-name>**</role-name>
- </auth-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
+ <url-pattern>/star</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <!-- Will not include any authenticated user unless declared as security-role -->
+ <auth-constraint>
+ <role-name>*</role-name>
+ <role-name>**</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
<web-resource-name>denyuncoveredpost</web-resource-name>
- <url-pattern>/denyuncoveredpost</url-pattern>
- <http-method>GET</http-method>
- </web-resource-collection>
- </security-constraint>
+ <url-pattern>/denyuncoveredpost</url-pattern>
+ <http-method>GET</http-method>
+ </web-resource-collection>
+ </security-constraint>
- <security-role>
- <role-name>javaUsers</role-name>
- </security-role>
+ <security-role>
+ <role-name>javaUsers</role-name>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
index c36560b..c62c115 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
@@ -24,42 +24,42 @@
@Stateless
public class HelloEJB implements Hello {
- @Resource
- private SessionContext ctx;
-
- public String hello(String name) {
- System.out.println("In HelloEJB::hello('"+name+"')");
- String principalName = "NONE";
- String principalType = "UNKNOWN";
- Principal p = ctx.getCallerPrincipal();
- if (p != null) {
- principalName = p.getName();
- principalType = p.getClass().getName();
- }
- String result = principalName + " is " + principalType;
- System.out.println("Caller Principal: " + result);
- return result;
- }
+ @Resource
+ private SessionContext ctx;
- public boolean inRole(String roleName) {
- System.out.println("In HelloEJB::inRole('"+roleName+"')");
- //try {
- boolean result = ctx.isCallerInRole(roleName);
- System.out.println("In HelloEJB::inRole('"+roleName+"') - " + result);
- return result;
- //}
- //catch (Exception exc) {
- // System.out.println("In HelloEJB - Exception: " + exc.toString());
- // exc.printStackTrace();
- // return false;
- //}
- }
+ public String hello(String name) {
+ System.out.println("In HelloEJB::hello('"+name+"')");
+ String principalName = "NONE";
+ String principalType = "UNKNOWN";
+ Principal p = ctx.getCallerPrincipal();
+ if (p != null) {
+ principalName = p.getName();
+ principalType = p.getClass().getName();
+ }
+ String result = principalName + " is " + principalType;
+ System.out.println("Caller Principal: " + result);
+ return result;
+ }
+
+ public boolean inRole(String roleName) {
+ System.out.println("In HelloEJB::inRole('"+roleName+"')");
+ //try {
+ boolean result = ctx.isCallerInRole(roleName);
+ System.out.println("In HelloEJB::inRole('"+roleName+"') - " + result);
+ return result;
+ //}
+ //catch (Exception exc) {
+ // System.out.println("In HelloEJB - Exception: " + exc.toString());
+ // exc.printStackTrace();
+ // return false;
+ //}
+ }
public void methodAuthUser() {
- System.out.println("In HelloEJB::methodAuthUser()");
+ System.out.println("In HelloEJB::methodAuthUser()");
}
public void methodAnyAuthUser() {
- System.out.println("In HelloEJB::methodAnyAuthUser()");
+ System.out.println("In HelloEJB::methodAnyAuthUser()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
index 79524c3..d0c34d7 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
@@ -30,49 +30,49 @@
@Stateful
public class HelloStatefulEJB implements HelloStateful {
- @Resource
- private SessionContext ctx;
+ @Resource
+ private SessionContext ctx;
- @PostConstruct
- public void postConstruction() {
- System.out.println("In HelloStatefulEJB::postConstruction()");
- }
-
- public String hello(String name) {
- System.out.println("In HelloStatefulEJB::hello('"+name+"')");
- String principalName = "NONE";
- String principalType = "UNKNOWN";
- Principal p = ctx.getCallerPrincipal();
- if (p != null) {
- principalName = p.getName();
- principalType = p.getClass().getName();
- }
- String result = principalName + " is " + principalType;
- System.out.println("Caller Principal: " + result);
- return result;
- }
-
- public boolean inRole(String roleName) {
- System.out.println("In HelloStatefulEJB::inRole('"+roleName+"')");
- //try {
- boolean result = ctx.isCallerInRole(roleName);
- System.out.println("In HelloStatefulEJB::inRole('"+roleName+"') - " + result);
- return result;
- //}
- //catch (Exception exc) {
- // System.out.println("In HelloStatefulEJB - Exception: " + exc.toString());
- // exc.printStackTrace();
- // return false;
- //}
- }
-
- @RolesAllowed({"javaUsers"})
- public void methodAuthUser() {
- System.out.println("In HelloStatefulEJB::methodAuthUser()");
+ @PostConstruct
+ public void postConstruction() {
+ System.out.println("In HelloStatefulEJB::postConstruction()");
}
- @RolesAllowed({"**"})
- public void methodAnyAuthUser() {
- System.out.println("In HelloStatefulEJB::methodAnyAuthUser()");
+ public String hello(String name) {
+ System.out.println("In HelloStatefulEJB::hello('"+name+"')");
+ String principalName = "NONE";
+ String principalType = "UNKNOWN";
+ Principal p = ctx.getCallerPrincipal();
+ if (p != null) {
+ principalName = p.getName();
+ principalType = p.getClass().getName();
+ }
+ String result = principalName + " is " + principalType;
+ System.out.println("Caller Principal: " + result);
+ return result;
+ }
+
+ public boolean inRole(String roleName) {
+ System.out.println("In HelloStatefulEJB::inRole('"+roleName+"')");
+ //try {
+ boolean result = ctx.isCallerInRole(roleName);
+ System.out.println("In HelloStatefulEJB::inRole('"+roleName+"') - " + result);
+ return result;
+ //}
+ //catch (Exception exc) {
+ // System.out.println("In HelloStatefulEJB - Exception: " + exc.toString());
+ // exc.printStackTrace();
+ // return false;
+ //}
+ }
+
+ @RolesAllowed({"javaUsers"})
+ public void methodAuthUser() {
+ System.out.println("In HelloStatefulEJB::methodAuthUser()");
+ }
+
+ @RolesAllowed({"**"})
+ public void methodAnyAuthUser() {
+ System.out.println("In HelloStatefulEJB::methodAnyAuthUser()");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
index 67204cb..8581dd3 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
@@ -31,113 +31,113 @@
@WebServlet(name = "Servlet", urlPatterns = {"/servlet","/authuser","/anyauthuser","/star","/denyuncoveredpost"})
public class Servlet extends HttpServlet {
- @EJB(beanName = "HelloEJB", beanInterface = Hello.class)
- private Hello helloStateless;
+ @EJB(beanName = "HelloEJB", beanInterface = Hello.class)
+ private Hello helloStateless;
- @EJB(beanName = "HelloStatefulEJB", beanInterface = HelloStateful.class)
- private HelloStateful helloStateful;
+ @EJB(beanName = "HelloStatefulEJB", beanInterface = HelloStateful.class)
+ private HelloStateful helloStateful;
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- System.out.println("In jaccmr8::Servlet... init()");
- }
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ System.out.println("In jaccmr8::Servlet... init()");
+ }
- public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- resp.setContentType("text/html");
- PrintWriter out = resp.getWriter();
+ public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ resp.setContentType("text/html");
+ PrintWriter out = resp.getWriter();
- String mode = req.getParameter("mode");
- if (mode == null) mode = "stateful";
- mode = URLDecoder.decode(mode,"UTF-8");
- String name = req.getParameter("name");
- if (name == null) name = "NotDeclared";
- name = URLDecoder.decode(name,"UTF-8");
+ String mode = req.getParameter("mode");
+ if (mode == null) mode = "stateful";
+ mode = URLDecoder.decode(mode,"UTF-8");
+ String name = req.getParameter("name");
+ if (name == null) name = "NotDeclared";
+ name = URLDecoder.decode(name,"UTF-8");
- // EJB information
- String callerPrincipal = "NONE";
- boolean isInEJBRole = false;
- boolean isAnyAuthUserEJB = false;
- String invokeAnyAuthUser = "No";
- String invokeAuthUser = "No";
- if ("stateful".equals(mode)) {
- System.out.println("Invoking Stateful EJB");
- callerPrincipal = helloStateful.hello(name);
- isAnyAuthUserEJB = helloStateful.inRole("**");
- isInEJBRole = helloStateful.inRole(name);
- try {
- helloStateful.methodAnyAuthUser();
- invokeAnyAuthUser = "Yes";
- }
- catch (Exception exc) {
- System.out.println("FAILED invoke of methodAnyAuthUser()");
- invokeAnyAuthUser = exc.toString();
- }
- try {
- helloStateful.methodAuthUser();
- invokeAuthUser = "Yes";
- }
- catch (Exception exc) {
- System.out.println("FAILED invoke of methodAuthUser()");
- invokeAuthUser = exc.toString();
- }
- System.out.println("Successfully invoked Stateful EJB");
- } else if ("stateless".equals(mode)) {
- System.out.println("Invoking Stateless EJB");
- callerPrincipal = helloStateless.hello(name);
- isAnyAuthUserEJB = helloStateless.inRole("**");
- isInEJBRole = helloStateless.inRole(name);
- try {
- helloStateless.methodAnyAuthUser();
- invokeAnyAuthUser = "Yes";
- }
- catch (Exception exc) {
- System.out.println("FAILED invoke of methodAnyAuthUser()");
- invokeAnyAuthUser = exc.toString();
- }
- try {
- helloStateless.methodAuthUser();
- invokeAuthUser = "Yes";
- }
- catch (Exception exc) {
- System.out.println("FAILED invoke of methodAuthUser()");
- invokeAuthUser = exc.toString();
- }
- System.out.println("Successfully invoked Stateless EJB");
- } else {
- System.out.println("Mode: " + mode);
- }
+ // EJB information
+ String callerPrincipal = "NONE";
+ boolean isInEJBRole = false;
+ boolean isAnyAuthUserEJB = false;
+ String invokeAnyAuthUser = "No";
+ String invokeAuthUser = "No";
+ if ("stateful".equals(mode)) {
+ System.out.println("Invoking Stateful EJB");
+ callerPrincipal = helloStateful.hello(name);
+ isAnyAuthUserEJB = helloStateful.inRole("**");
+ isInEJBRole = helloStateful.inRole(name);
+ try {
+ helloStateful.methodAnyAuthUser();
+ invokeAnyAuthUser = "Yes";
+ }
+ catch (Exception exc) {
+ System.out.println("FAILED invoke of methodAnyAuthUser()");
+ invokeAnyAuthUser = exc.toString();
+ }
+ try {
+ helloStateful.methodAuthUser();
+ invokeAuthUser = "Yes";
+ }
+ catch (Exception exc) {
+ System.out.println("FAILED invoke of methodAuthUser()");
+ invokeAuthUser = exc.toString();
+ }
+ System.out.println("Successfully invoked Stateful EJB");
+ } else if ("stateless".equals(mode)) {
+ System.out.println("Invoking Stateless EJB");
+ callerPrincipal = helloStateless.hello(name);
+ isAnyAuthUserEJB = helloStateless.inRole("**");
+ isInEJBRole = helloStateless.inRole(name);
+ try {
+ helloStateless.methodAnyAuthUser();
+ invokeAnyAuthUser = "Yes";
+ }
+ catch (Exception exc) {
+ System.out.println("FAILED invoke of methodAnyAuthUser()");
+ invokeAnyAuthUser = exc.toString();
+ }
+ try {
+ helloStateless.methodAuthUser();
+ invokeAuthUser = "Yes";
+ }
+ catch (Exception exc) {
+ System.out.println("FAILED invoke of methodAuthUser()");
+ invokeAuthUser = exc.toString();
+ }
+ System.out.println("Successfully invoked Stateless EJB");
+ } else {
+ System.out.println("Mode: " + mode);
+ }
- // Servlet information
- String principalName = "NONE";
- String principalType = "UNKNOWN";
- Principal p = req.getUserPrincipal();
- if (p != null) {
- principalName = p.getName();
- principalType = p.getClass().getName();
- }
- String userPrincipal = principalName + " is " + principalType;
- boolean isAnyAuthUserWeb = req.isUserInRole("**");
- boolean isInWebRole = req.isUserInRole(name);
+ // Servlet information
+ String principalName = "NONE";
+ String principalType = "UNKNOWN";
+ Principal p = req.getUserPrincipal();
+ if (p != null) {
+ principalName = p.getName();
+ principalType = p.getClass().getName();
+ }
+ String userPrincipal = principalName + " is " + principalType;
+ boolean isAnyAuthUserWeb = req.isUserInRole("**");
+ boolean isInWebRole = req.isUserInRole(name);
- out.println("<HTML> <HEAD> <TITLE>Servlet Output</TITLE> </HEAD> <BODY>");
- out.println("<CENTER>JACC MR8 Servlet</CENTER> <p> ");
- out.println(" Request URL: " + req.getRequestURL() + "<br>");
- out.println(" HTTP Method: " + req.getMethod() + "<br>");
- out.println("Context Path: " + req.getContextPath() + "<br>");
- out.println("Servlet Path: " + req.getServletPath() + "<br>");
- out.println("<br> <CENTER>Results</CENTER> <p> ");
- out.println("EJB Caller Principal: " + callerPrincipal + "<br>");
- out.println("EJB isCallerInRole: " + isInEJBRole + "<br>");
- out.println("EJB isUserInAnyAuthUserRole: " + isAnyAuthUserEJB + "<br>");
- out.println("EJB Invoke AnyAuthUser: " + invokeAnyAuthUser + "<br>");
- out.println("EJB Invoke AuthUser: " + invokeAuthUser + "<br>");
- out.println("WEB User Principal: " + userPrincipal + "<br>");
- out.println("WEB isUserInRole: " + isInWebRole + "<br>");
- out.println("WEB isUserInAnyAuthUserRole: " + isAnyAuthUserWeb + "<br>");
- out.println("</BODY> </HTML> ");
- }
+ out.println("<HTML> <HEAD> <TITLE>Servlet Output</TITLE> </HEAD> <BODY>");
+ out.println("<CENTER>JACC MR8 Servlet</CENTER> <p> ");
+ out.println(" Request URL: " + req.getRequestURL() + "<br>");
+ out.println(" HTTP Method: " + req.getMethod() + "<br>");
+ out.println("Context Path: " + req.getContextPath() + "<br>");
+ out.println("Servlet Path: " + req.getServletPath() + "<br>");
+ out.println("<br> <CENTER>Results</CENTER> <p> ");
+ out.println("EJB Caller Principal: " + callerPrincipal + "<br>");
+ out.println("EJB isCallerInRole: " + isInEJBRole + "<br>");
+ out.println("EJB isUserInAnyAuthUserRole: " + isAnyAuthUserEJB + "<br>");
+ out.println("EJB Invoke AnyAuthUser: " + invokeAnyAuthUser + "<br>");
+ out.println("EJB Invoke AuthUser: " + invokeAuthUser + "<br>");
+ out.println("WEB User Principal: " + userPrincipal + "<br>");
+ out.println("WEB isUserInRole: " + isInWebRole + "<br>");
+ out.println("WEB isUserInAnyAuthUserRole: " + isAnyAuthUserWeb + "<br>");
+ out.println("</BODY> </HTML> ");
+ }
- public void destroy() {
- System.out.println("In jaccmr8::Servlet destroy");
- }
+ public void destroy() {
+ System.out.println("In jaccmr8::Servlet destroy");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.properties b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.properties
index 1bda8d9..187b329 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/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="security"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml
index 0fa3b3c..1c1feb1 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/build.xml
@@ -33,31 +33,31 @@
&commonRun;
&commonSecurity;
&testProperties;
-
+
<property file="./config.properties"/>
<target name="all" depends="display-header">
- <antcall target="setup"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup"/>
+ <antcall target="setup"/>
+ <antcall target="build"/>
+ <antcall target="deploy"/>
+ <antcall target="run"/>
+ <antcall target="undeploy"/>
+ <antcall target="unsetup"/>
</target>
<target name="all-oracle" depends="display-header">
- <antcall target="setup-oracle"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup-oracle"/>
+ <antcall target="setup-oracle"/>
+ <antcall target="build"/>
+ <antcall target="deploy"/>
+ <antcall target="run"/>
+ <antcall target="undeploy"/>
+ <antcall target="unsetup-oracle"/>
</target>
<target name="display-header">
<echo message="-->Running ${ant.project.name} tests from ${basedir} ..."/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="create-db-schema"/>
<antcall target="create-db-usrgrps"/>
@@ -95,7 +95,7 @@
classpath="${env.APS_HOME}/lib/ojdbc14.jar:${s1astest.classpath}" />
</target>
<target name="delete-db-schema-oracle" depends="init-common">
- <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}"
+ <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}"
level="verbose"/>
<sql
driver="${oracle.db.driver}"
@@ -124,7 +124,7 @@
</target>
<target name="delete-db-schema" depends="init-common">
- <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}"
+ <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}"
level="verbose"/>
<sql
driver="${derby.db.driver}"
@@ -144,7 +144,7 @@
</antcall>
<java classname="com.sun.devtests.security.jdbcrealm.PopulateDB" fork="true">
<classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
</classpath>
<arg value="-url"/>
<arg value="${derby.db.url}"/>
@@ -160,7 +160,7 @@
<target name="create-db-usrgrps-oracle" depends="init-common">
<java classname="com.sun.devtests.security.jdbcrealm.PopulateDB" fork="true">
<classpath>
- <pathelement path="${env.APS_HOME}/lib/ojdbc14.jar:${build.classes.dir}:${s1astest.classpath}"/>
+ <pathelement path="${env.APS_HOME}/lib/ojdbc14.jar:${build.classes.dir}:${s1astest.classpath}"/>
</classpath>
<arg value="-url"/>
<arg value="${oracle.db.url}"/>
@@ -176,7 +176,7 @@
<target name="modify-domain-xml" depends="init-common">
<antcall target="create-jdbcrealm-connection-pool">
- <param name="db.datasource.classname"
+ <param name="db.datasource.classname"
value="${derby.db.datasource.classname}"/>
<param name="db.port" value="${derby.db.port}"/>
<param name="db.host" value="${derby.db.host}"/>
@@ -201,7 +201,7 @@
<!--
<antcall target="create-jdbcrealm-connection-pool">
- <param name="db.datasource.classname"
+ <param name="db.datasource.classname"
value="${oracle.db.datasource.classname}"/>
<param name="db.port" value="${oracle.db.port}"/>
<param name="db.host" value="${oracle.db.host}"/>
@@ -218,7 +218,7 @@
<arg value="PortNumber=${oracle.db.port}:serverName=${oracle.db.host}:SID=${oracle.db.SID}"/>
<arg line="${oracle.db.poolname}"/>
</exec>
-
+
<antcall target="create-jdbcrealm-resource">
<param name="db.poolname" value="${oracle.db.poolname}"/>
<param name="db.jndiname" value="${oracle.db.jndiname}"/>
@@ -245,7 +245,7 @@
</target>
<target name="un-modify-domain-xml-oracle" depends="init-common">
- <antcall target="delete-auth-jdbcrealm"/>
+ <antcall target="delete-auth-jdbcrealm"/>
<antcall target="delete-jdbcrealm-resource">
<param name="db.jndiname" value="${oracle.db.jndiname}"/>
</antcall>
@@ -293,100 +293,100 @@
<target name="create-auth-jdbcrealm" depends="init-common">
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_CLEAR"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE:digest-algorithm=NONE"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_CLEAR"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE:digest-algorithm=NONE"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_CLEAR_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_BASE64:digest-algorithm=NONE:encoding=BASE64"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_CLEAR_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_BASE64:digest-algorithm=NONE:encoding=BASE64"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_CLEAR_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_HEX:digest-algorithm=NONE:encoding=HEX"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_CLEAR_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_HEX:digest-algorithm=NONE:encoding=HEX"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD2_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD2_BASE64:digest-algorithm=MD2:encoding=BASE64"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD2_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD2_BASE64:digest-algorithm=MD2:encoding=BASE64"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD5_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD5_BASE64:digest-algorithm=MD5:encoding=BASE64"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD5_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD5_BASE64:digest-algorithm=MD5:encoding=BASE64"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA_BASE64:digest-algorithm=SHA:encoding=BASE64"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA_BASE64:digest-algorithm=SHA:encoding=BASE64"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA256_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA256_BASE64:digest-algorithm=SHA-256:encoding=BASE64"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA256_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA256_BASE64:digest-algorithm=SHA-256:encoding=BASE64"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA384_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA384_BASE64:digest-algorithm=SHA-384"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA384_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA384_BASE64:digest-algorithm=SHA-384"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA512_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA512_BASE64:digest-algorithm=SHA-512"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA512_BASE64"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA512_BASE64:digest-algorithm=SHA-512"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD2_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD2_HEX:digest-algorithm=MD2"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD2_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD2_HEX:digest-algorithm=MD2"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD5_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD5_HEX:digest-algorithm=MD5"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD5_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD5_HEX:digest-algorithm=MD5"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA_HEX:digest-algorithm=SHA"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA_HEX:digest-algorithm=SHA"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA256_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA256_HEX:digest-algorithm=SHA-256"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA256_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA256_HEX:digest-algorithm=SHA-256"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA384_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA384_HEX:digest-algorithm=SHA-384"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA384_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA384_HEX:digest-algorithm=SHA-384"/>
</antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA512_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA512_HEX:digest-algorithm=SHA-512"/>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA512_HEX"/>
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
+ <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA512_HEX:digest-algorithm=SHA-512"/>
</antcall>
</target>
@@ -857,7 +857,7 @@
<antcall target="restart-server-instance-common"/>
</target>
- <!-- variables needed by custom-build
+ <!-- variables needed by custom-build
1. jdbc.realm.name
2. jdbc.realm.user
3. appname
@@ -865,22 +865,22 @@
<target name="custom-build">
<echo message="web.xml is defined as ${web.xml}"/>
- <copy file="web.xml.template" tofile="${web.xml}" overwrite="true" failonerror="false"/>
- <replace file="${web.xml}" token="REALM_NAME_HERE" value="${jdbc.realm.name}"/>
- <copy file="sun-web.xml.template" tofile="${sun-web.xml}" overwrite="true" failonerror="false"/>
- <replace file="${sun-web.xml}" token="USER_ID_HERE" value="${jdbc.realm.user}"/>
+ <copy file="web.xml.template" tofile="${web.xml}" overwrite="true" failonerror="false"/>
+ <replace file="${web.xml}" token="REALM_NAME_HERE" value="${jdbc.realm.name}"/>
+ <copy file="sun-web.xml.template" tofile="${sun-web.xml}" overwrite="true" failonerror="false"/>
+ <replace file="${sun-web.xml}" token="USER_ID_HERE" value="${jdbc.realm.user}"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="true"/>
<param name="appname" value="${appname}"/>
</antcall>
- <delete file="${web.xml}"/>
- <delete file="${sun-web.xml}"/>
+ <delete file="${web.xml}"/>
+ <delete file="${sun-web.xml}"/>
</target>
- <!-- variables needed by custom-build
+ <!-- variables needed by custom-build
1. jdbc.realm.pass
2. jdbc.realm.user
3. appname
@@ -891,7 +891,7 @@
<java classname="HttpBasicAuthTest" fork="true">
<classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
</classpath>
<arg value="-url"/>
<arg value="http://${http.host}:${http.port}/${appname}/TestServlet"/>
@@ -914,7 +914,7 @@
<java classname="HttpBasicAuthTest" fork="true">
<classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
</classpath>
<arg value="-url"/>
<arg value="http://${http.host}:${http.port}/${appname}/TestServlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java
index 770ef79..13c43dc 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/client/HttpBasicAuthTest.java
@@ -22,7 +22,7 @@
public class HttpBasicAuthTest implements Runnable {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private boolean result = true;
@@ -66,7 +66,7 @@
Thread tarray[] = new Thread[threadCount];
- for(int i=0; i<threadCount; i++)
+ for(int i=0; i<threadCount; i++)
tarray[i] = new Thread(this, "Http-request-thread-" + i);
for(int i=0; i<threadCount; i++)
@@ -91,11 +91,11 @@
stdDev = Math.pow(stdDev, 0.5);
- System.out.println("Total requests: " + (suxesCount+failureCount) +
- ", success count: " + suxesCount +
+ System.out.println("Total requests: " + (suxesCount+failureCount) +
+ ", success count: " + suxesCount +
", failure count: " + failureCount);
- System.out.println("Min/Max/Avg/StdDev: (milliseconds) " +
- minTime + "/" +
+ System.out.println("Min/Max/Avg/StdDev: (milliseconds) " +
+ minTime + "/" +
maxTime + "/" + avgTime + "/" + stdDev);
stat.addDescription("JDBCRealm test for URL " + url);
@@ -106,7 +106,7 @@
} else {
stat.addStatus(testId, stat.FAIL);
}
- } else { // negative test
+ } else { // negative test
if( result ) {
stat.addStatus(testId, stat.FAIL);
} else {
@@ -143,7 +143,7 @@
synchronized(this) {
failureCount++;
}
-
+
// test failed(well failed if its a postive test, this
// is expected if its a negative test)
@@ -156,7 +156,7 @@
protected void run0() throws Exception {
- System.out.println(Thread.currentThread().getName() +
+ System.out.println(Thread.currentThread().getName() +
" - running ...");
URL u = new URL(url);
URLConnection uconn = u.openConnection();
@@ -220,7 +220,7 @@
System.exit(1);
}
- HttpBasicAuthTest test =
+ HttpBasicAuthTest test =
new HttpBasicAuthTest(url, user, pass, tc, lc, positiveTest);
test.doTest();
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema-oracle.sql b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema-oracle.sql
index 2c3a42d..a2fd41f 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema-oracle.sql
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema-oracle.sql
@@ -1,84 +1,84 @@
CREATE TABLE USER_TABLE (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD2_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD5_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA256_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA384_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA512_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD2_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD5_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA256_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA384_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA512_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE GROUP_TABLE (
- USERNAME VARCHAR (255) NOT NULL,
+ USERNAME VARCHAR (255) NOT NULL,
GROUPNAME VARCHAR (255)
);
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema.sql b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema.sql
index 2c3a42d..a2fd41f 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema.sql
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/create-auth-schema.sql
@@ -1,84 +1,84 @@
CREATE TABLE USER_TABLE (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD2_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD5_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA256_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA384_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA512_BASE64 (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD2_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_MD5_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA256_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA384_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE USER_TABLE_SHA512_HEX (
- USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
- PASSWORD VARCHAR (255)
+ USERNAME VARCHAR (255) PRIMARY KEY NOT NULL,
+ PASSWORD VARCHAR (255)
);
CREATE TABLE GROUP_TABLE (
- USERNAME VARCHAR (255) NOT NULL,
+ USERNAME VARCHAR (255) NOT NULL,
GROUPNAME VARCHAR (255)
);
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java
index f9b8098..78c16b5 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/util/PopulateDB.java
@@ -24,41 +24,41 @@
public class PopulateDB {
// username/passwords
- private static final String[][] users= { {"xyz", "xyz"},
+ private static final String[][] users= { {"xyz", "xyz"},
{"abc", "abc"},
{"qwert", "qwert"},
- {"testy", "testy"} };
+ {"testy", "testy"} };
- private static final String[][] users_BASE64=
- { {"qwertBASE64", "qwertBASE64"} };
- private static final String[][] users_HEX=
- { {"qwertHEX", "qwertHEX"} };
+ private static final String[][] users_BASE64=
+ { {"qwertBASE64", "qwertBASE64"} };
+ private static final String[][] users_HEX=
+ { {"qwertHEX", "qwertHEX"} };
- private static final String[][] users_MD2_BASE64=
- { {"qwertMD2BASE64", "qwertMD2BASE64"} };
- private static final String[][] users_MD5_BASE64=
- { {"qwertMD5BASE64", "qwertMD5BASE64"} };
- private static final String[][] users_SHA_BASE64=
- { {"qwertSHABASE64", "qwertSHABASE64"} };
- private static final String[][] users_SHA256_BASE64=
- { {"qwertSHA256BASE64", "qwertSHA256BASE64"} };
- private static final String[][] users_SHA384_BASE64=
- { {"qwertSHA384BASE64", "qwertSHA384BASE64"} };
- private static final String[][] users_SHA512_BASE64=
- { {"qwertSHA512BASE64", "qwertSHA512BASE64"} };
+ private static final String[][] users_MD2_BASE64=
+ { {"qwertMD2BASE64", "qwertMD2BASE64"} };
+ private static final String[][] users_MD5_BASE64=
+ { {"qwertMD5BASE64", "qwertMD5BASE64"} };
+ private static final String[][] users_SHA_BASE64=
+ { {"qwertSHABASE64", "qwertSHABASE64"} };
+ private static final String[][] users_SHA256_BASE64=
+ { {"qwertSHA256BASE64", "qwertSHA256BASE64"} };
+ private static final String[][] users_SHA384_BASE64=
+ { {"qwertSHA384BASE64", "qwertSHA384BASE64"} };
+ private static final String[][] users_SHA512_BASE64=
+ { {"qwertSHA512BASE64", "qwertSHA512BASE64"} };
- private static final String[][] users_MD2_HEX=
- { {"qwertMD2HEX", "qwertMD2HEX"} };
- private static final String[][] users_MD5_HEX=
- { {"qwertMD5HEX", "qwertMD5HEX"} };
- private static final String[][] users_SHA_HEX=
- { {"qwertSHAHEX", "qwertSHAHEX"} };
- private static final String[][] users_SHA256_HEX=
- { {"qwertSHA256HEX", "qwertSHA256HEX"} };
- private static final String[][] users_SHA384_HEX=
- { {"qwertSHA384HEX", "qwertSHA384HEX"} };
- private static final String[][] users_SHA512_HEX=
- { {"qwertSHA512HEX", "qwertSHA512HEX"} };
+ private static final String[][] users_MD2_HEX=
+ { {"qwertMD2HEX", "qwertMD2HEX"} };
+ private static final String[][] users_MD5_HEX=
+ { {"qwertMD5HEX", "qwertMD5HEX"} };
+ private static final String[][] users_SHA_HEX=
+ { {"qwertSHAHEX", "qwertSHAHEX"} };
+ private static final String[][] users_SHA256_HEX=
+ { {"qwertSHA256HEX", "qwertSHA256HEX"} };
+ private static final String[][] users_SHA384_HEX=
+ { {"qwertSHA384HEX", "qwertSHA384HEX"} };
+ private static final String[][] users_SHA512_HEX=
+ { {"qwertSHA512HEX", "qwertSHA512HEX"} };
// username/groupname
private static final String[][] groups= { {"xyz", "staff"},
@@ -83,7 +83,7 @@
// {"qwertSHA384HEX", "staff"},
// {"qwertSHA512HEX", "staff"},
- {"testy", "staff"} };
+ {"testy", "staff"} };
private static final String URL_OPTION = "-url";
private static final String VERBOSE_OPTION = "-verbose";
@@ -93,40 +93,40 @@
private static boolean verbose = false;
- private static String INSERT_USER_STMT_CLEAR =
+ private static String INSERT_USER_STMT_CLEAR =
"insert into USER_TABLE values (?, ?)";
- private static String INSERT_USER_STMT_BASE64 =
+ private static String INSERT_USER_STMT_BASE64 =
"insert into USER_TABLE_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_HEX =
+ private static String INSERT_USER_STMT_HEX =
"insert into USER_TABLE_HEX values (?, ?)";
- private static String INSERT_USER_STMT_MD2_BASE64 =
+ private static String INSERT_USER_STMT_MD2_BASE64 =
"insert into USER_TABLE_MD2_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_MD5_BASE64 =
+ private static String INSERT_USER_STMT_MD5_BASE64 =
"insert into USER_TABLE_MD5_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_SHA_BASE64 =
+ private static String INSERT_USER_STMT_SHA_BASE64 =
"insert into USER_TABLE_SHA_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_SHA256_BASE64 =
+ private static String INSERT_USER_STMT_SHA256_BASE64 =
"insert into USER_TABLE_SHA256_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_SHA384_BASE64 =
+ private static String INSERT_USER_STMT_SHA384_BASE64 =
"insert into USER_TABLE_SHA384_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_SHA512_BASE64 =
+ private static String INSERT_USER_STMT_SHA512_BASE64 =
"insert into USER_TABLE_SHA512_BASE64 values (?, ?)";
- private static String INSERT_USER_STMT_MD2_HEX =
+ private static String INSERT_USER_STMT_MD2_HEX =
"insert into USER_TABLE_MD2_HEX values (?, ?)";
- private static String INSERT_USER_STMT_MD5_HEX =
+ private static String INSERT_USER_STMT_MD5_HEX =
"insert into USER_TABLE_MD5_HEX values (?, ?)";
- private static String INSERT_USER_STMT_SHA_HEX =
+ private static String INSERT_USER_STMT_SHA_HEX =
"insert into USER_TABLE_SHA_HEX values (?, ?)";
- private static String INSERT_USER_STMT_SHA256_HEX =
+ private static String INSERT_USER_STMT_SHA256_HEX =
"insert into USER_TABLE_SHA256_HEX values (?, ?)";
- private static String INSERT_USER_STMT_SHA384_HEX =
+ private static String INSERT_USER_STMT_SHA384_HEX =
"insert into USER_TABLE_SHA384_HEX values (?, ?)";
- private static String INSERT_USER_STMT_SHA512_HEX =
+ private static String INSERT_USER_STMT_SHA512_HEX =
"insert into USER_TABLE_SHA512_HEX values (?, ?)";
- private static String INSERT_GROUP_STMT =
+ private static String INSERT_GROUP_STMT =
"insert into GROUP_TABLE values (?, ?)";
private static void verbose(String msg) {
diff --git a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/web/TestServlet.java b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/web/TestServlet.java
index 6b714be..8435d94 100644
--- a/appserver/tests/appserv-tests/devtests/security/jdbcrealm/web/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jdbcrealm/web/TestServlet.java
@@ -28,32 +28,32 @@
public class TestServlet extends HttpServlet {
- // Security role references.
- private static final String emp_secrole_ref = "staff";
- private static final String admin_secrole_ref = "ADMIN";
- private static final String mgr_secrole_ref = "Manager";
+ // Security role references.
+ private static final String emp_secrole_ref = "staff";
+ private static final String admin_secrole_ref = "ADMIN";
+ private static final String mgr_secrole_ref = "Manager";
String user="qwert";
- Properties props=null;
+ Properties props=null;
- public void doGet(HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException
- {
+ public void doGet(HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException
+ {
PrintWriter out= response.getWriter();
out.println("<br>Basic Authentication tests from Servlet: Test1,Test2,Test3 ");
out.println("<br>Authorization test from Servlet: Test4,Test5-> HttpServletRequest.isUserInRole() authorization from Servlet.");
-
+
test1(request, response, out);
test2(request, response, out);
test3(request, response, out);
test4(request, response, out);
test5(request, response, out);
- }
+ }
//Tests begin
- public void test1(HttpServletRequest request, HttpServletResponse response, PrintWriter out)
- {
+ public void test1(HttpServletRequest request, HttpServletResponse response, PrintWriter out)
+ {
//Check the auth type - request.getAuthType()
out.println("<br><br>Test1. Postive check for the correct authentication type");
String authtype=request.getAuthType();
@@ -98,7 +98,7 @@
out.println("<br>HttpServletRequest.isUserInRole() test Failed!");
}
out.println("<br>Info:request.isUserInRole(\""+emp_secrole_ref+"\") is= "+isInProperRole);
- }
+ }
//Test5 - Negative test for checking the user's proper role
public void test5(HttpServletRequest request, HttpServletResponse response, PrintWriter out){
@@ -110,6 +110,6 @@
out.println("<br>HttpServletRequest.isUserInRole() test Failed!");
}
out.println("<br>Info:request.isUserInRole(\""+mgr_secrole_ref+"\") is= "+isNotInOtherRole);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties
index a1ec018..8409f65 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/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="security-jmac-httpservlet"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java
index 325c250..002e18e 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/HttpServletTestAuthModule.java
@@ -72,7 +72,7 @@
HttpServletResponse response =
(HttpServletResponse)messageInfo.getResponseMessage();
String authorization = request.getHeader("authorization");
- if (authorization != null &&
+ if (authorization != null &&
authorization.toLowerCase().startsWith("basic ")) {
authorization = authorization.substring(6).trim();
BASE64Decoder decoder = new BASE64Decoder();
@@ -86,7 +86,7 @@
}
if (username == null || password == null) {
- response.setHeader("WWW-Authenticate", "Basic realm=\"default\"");
+ response.setHeader("WWW-Authenticate", "Basic realm=\"default\"");
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
System.out.println("login prompt for username/password");
return AuthStatus.SEND_CONTINUE;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/MyHttpServletResponseWrapper.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/MyHttpServletResponseWrapper.java
index dee5dab..246cb98 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/MyHttpServletResponseWrapper.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/src/MyHttpServletResponseWrapper.java
@@ -53,7 +53,7 @@
}
// our jsp writer only use write char[] off len
- public void write(char[] cbuf, int off, int len) {
+ public void write(char[] cbuf, int off, int len) {
count += len - numOfCR(cbuf, off, len);
super.write(cbuf, off, len);
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.properties
index c3bd72a..227a858 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/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="security-jmac-httpservletchallenge"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.xml
index e15a1a9..be39aad 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/build.xml
@@ -111,7 +111,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-libraries">
<param name="as.props" value="${as.props}"/>
- <param name="libraries" value="${env.S1AS_HOME}/lib/test-${appname}-provider.jar"/>
+ <param name="libraries" value="${env.S1AS_HOME}/lib/test-${appname}-provider.jar"/>
<param name="contextroot" value="${appname}"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java
index 6f2bd1c..43aaf4c 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletChallenge/src/HttpServletChallengeTestAuthModule.java
@@ -63,11 +63,11 @@
String username = null;
String password = null;
try {
-
+
HttpServletRequest request =
(HttpServletRequest)messageInfo.getRequestMessage();
String authorization = request.getHeader("authorization");
- if (authorization != null &&
+ if (authorization != null &&
authorization.toLowerCase().startsWith("basic ")) {
authorization = authorization.substring(6).trim();
BASE64Decoder decoder = new BASE64Decoder();
@@ -83,7 +83,7 @@
HttpServletResponse response =
(HttpServletResponse)messageInfo.getResponseMessage();
if (username == null || password == null) {
- response.setHeader("WWW-Authenticate", "Basic realm=\"default\"");
+ response.setHeader("WWW-Authenticate", "Basic realm=\"default\"");
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
System.out.println("login prompt for username/password");
return AuthStatus.SEND_CONTINUE;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/build.properties
index 1c8cf30..f149f9d 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServletForm/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="security-jmac-httpservletform"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties
index 1acbb53..8cb4c0a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/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="security-jmac-https"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml
index 50775c6..e3e9a06 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/build.xml
@@ -58,7 +58,7 @@
<param name="as.props" value="${as.props} --layer HttpServlet"/>
<param name="operand.props" value="httpsTestAuthModule"/>
</antcall>
- <antcall target="remove-store-common"/>
+ <antcall target="remove-store-common"/>
<antcall target="restart"/>
<!-- may not be able to delete this file in PC environment -->
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.properties
index 9f9636b..f1b46bd 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/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="security-jmac-soap"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml
index d6c4dac..a75dac6 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/build.xml
@@ -120,7 +120,7 @@
</target>
<target name="compile-client">
- <mkdir dir="${build.classes.dir}/client"/>
+ <mkdir dir="${build.classes.dir}/client"/>
<antcall target="wsimport">
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/JmacSoapEjbService/HelloEjb?WSDL"/>
@@ -142,7 +142,7 @@
<target name="build-server" depends="compile-server">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -156,16 +156,16 @@
<fileset dir="${build.classes.dir}/servletws"/>
</jar>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <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/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
<target name="build-client" depends="compile-client">
@@ -174,11 +174,11 @@
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<copy file="${client-handler.xml}" todir="${build.classes.dir}/client/com/sun/s1asdev/security/jmac/soap/client" failonerror="true"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/*.class, com/sun/**/*.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java
index beb0a07..2b0c506 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java
@@ -26,11 +26,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public void init() {
}
@@ -56,14 +56,14 @@
}
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {
}
-
+
public void close(MessageContext context) {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.properties
index b914506..628328b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/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="security-jmac-soapdefault"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml
index 194dfb0..40cf3fc 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/build.xml
@@ -71,7 +71,7 @@
<param name="operand.props" value="SOAPDefaultTestClientAuthModule"/>
</antcall>
- <antcall target="enable-wss-message-security-provider">
+ <antcall target="enable-wss-message-security-provider">
<param name="wss.server.provider.name" value="SOAPDefaultTestServerAuthModule"/>
<param name="wss.client.provider.name" value="SOAPDefaultTestClientAuthModule"/>
</antcall>
@@ -117,7 +117,7 @@
<param name="operand.props" value="SOAPDefaultTestClientAuthModule"/>
</antcall>
- <antcall target="disable-wss-message-security-provider"/>
+ <antcall target="disable-wss-message-security-provider"/>
<!-- may not be able to delete this file in PC environment -->
<delete file="${env.S1AS_HOME}/lib/test-${appname}-provider.jar" failonerror="false"/>
@@ -135,7 +135,7 @@
</target>
<target name="compile-client">
- <mkdir dir="${build.classes.dir}/client"/>
+ <mkdir dir="${build.classes.dir}/client"/>
<antcall target="wsimport">
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/JmacSoapDefaultEjbService/HelloEjb?WSDL"/>
@@ -157,7 +157,7 @@
<target name="build-server" depends="compile-server">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -170,16 +170,16 @@
<fileset dir="${build.classes.dir}/servletws"/>
</jar>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <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/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
<target name="build-client" depends="compile-client">
@@ -187,11 +187,11 @@
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/*.class"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.properties b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.properties
index c8f074f..f8a506d 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/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="security-jmac-soapembedded"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml
index bf311a4..8161ef4 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/build.xml
@@ -99,7 +99,7 @@
</target>
<target name="compile-webclient">
- <mkdir dir="${build.classes.dir}/webclient"/>
+ <mkdir dir="${build.classes.dir}/webclient"/>
<antcall target="wsimport">
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/webclient http://${http.host}:${http.port}/JmacSoapEmbeddedEjbService/HelloEjb?WSDL"/>
@@ -121,7 +121,7 @@
<target name="build-server" depends="compile-server">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -135,16 +135,16 @@
<fileset dir="${build.classes.dir}/servletws"/>
</jar>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <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/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
<target name="build-webclient" depends="compile-webclient">
@@ -153,9 +153,9 @@
<antcall target="package-war-common">
<param name="web.xml" value="${web2.xml}"/>
<param name="sun-web.xml" value="${sun-web2.xml}"/>
- <param name="war.classes"
+ <param name="war.classes"
value="${build.classes.dir}/webclient"/>
- <param name="war.file"
+ <param name="war.file"
value="${assemble.dir}/${appname}-client-web.war"/>
</antcall>
</target>
@@ -206,7 +206,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="undeploy-war-common">
- <param name="appname"
+ <param name="appname"
value="${appname}-client"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.properties b/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.properties
index eeca480..3ff63f5 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/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="jsp2sful"/>
<property name="appname" value="${module}" />
@@ -25,6 +25,6 @@
<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="appname" value="statefulLoginBean"/>
+<property name="appname" value="statefulLoginBean"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.xml b/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.xml
index 99470ca..f0151af 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&commonSecurity;
&testProperties;
-
+
<target name="all" depends="build, setup, deploy, run, undeploy, unsetup"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
@@ -48,7 +48,7 @@
<target name="build" depends="compile">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes" />
+ <param name="hasWebclient" value="yes" />
</antcall>
<antcall target="ejb-jar-common" />
@@ -161,28 +161,28 @@
<target name="setup">
<antcall target="create-user-common">
- <param name="user" value="shingwai"/>
- <param name="password" value="shingwai"/>
- <param name="groups" value="employee"/>
+ <param name="user" value="shingwai"/>
+ <param name="password" value="shingwai"/>
+ <param name="groups" value="employee"/>
</antcall>
<antcall target="create-user-common">
- <param name="user" value="swchan"/>
- <param name="password" value="swchan"/>
- <param name="groups" value="staff"/>
+ <param name="user" value="swchan"/>
+ <param name="password" value="swchan"/>
+ <param name="groups" value="staff"/>
</antcall>
<antcall target="create-user-common">
- <param name="user" value="webuser"/>
- <param name="password" value="webuser"/>
- <param name="groups" value="employee"/>
+ <param name="user" value="webuser"/>
+ <param name="password" value="webuser"/>
+ <param name="groups" value="employee"/>
</antcall>
<antcall target="create-user-common">
- <param name="user" value="noauthuser"/>
- <param name="password" value="noauthuser"/>
- <param name="groups" value="employee"/>
+ <param name="user" value="noauthuser"/>
+ <param name="password" value="noauthuser"/>
+ <param name="groups" value="employee"/>
</antcall>
<!-- <antcall target="reconfig-common"/>-->
</target>
-
+
<target name="unsetup">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/application.xml
index 22b95b0..2572e0f 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/application.xml
@@ -25,8 +25,8 @@
</module>
<module>
<web>
- <web-uri>jsp2sful-web.war</web-uri>
- <context-root>jsp2sful</context-root>
+ <web-uri>jsp2sful-web.war</web-uri>
+ <context-root>jsp2sful</context-root>
</web>
</module>
</application>
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/sun-ejb-jar.xml
index 71a14ff..0ae1129 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/sun-ejb-jar.xml
@@ -19,30 +19,30 @@
-->
<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>jsp2sful</ejb-name>
- <jndi-name>jsp2sful</jndi-name>
+ <enterprise-beans>
+ <unique-id>0</unique-id>
+ <ejb>
+ <ejb-name>jsp2sful</ejb-name>
+ <jndi-name>jsp2sful</jndi-name>
- <ior-security-config>
- <transport-config>
- <integrity>supported</integrity>
- <confidentiality>supported</confidentiality>
- <establish-trust-in-target>supported</establish-trust-in-target>
- <establish-trust-in-client>supported</establish-trust-in-client>
- </transport-config>
- <as-context>
- <auth-method>username_password</auth-method>
- <realm>default</realm>
- <required>false</required>
- </as-context>
- <sas-context>
- <caller-propagation>supported</caller-propagation>
- </sas-context>
- </ior-security-config>
- <gen-classes/>
- </ejb>
- </enterprise-beans>
+ <ior-security-config>
+ <transport-config>
+ <integrity>supported</integrity>
+ <confidentiality>supported</confidentiality>
+ <establish-trust-in-target>supported</establish-trust-in-target>
+ <establish-trust-in-client>supported</establish-trust-in-client>
+ </transport-config>
+ <as-context>
+ <auth-method>username_password</auth-method>
+ <realm>default</realm>
+ <required>false</required>
+ </as-context>
+ <sas-context>
+ <caller-propagation>supported</caller-propagation>
+ </sas-context>
+ </ior-security-config>
+ <gen-classes/>
+ </ejb>
+ </enterprise-beans>
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/web.xml
index 30e2101..711eb3f 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/descriptor/web.xml
@@ -49,7 +49,7 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<login-config>
<auth-method>FORM</auth-method>
<realm-name>default</realm-name>
@@ -58,11 +58,11 @@
<form-error-page>/error.html</form-error-page>
</form-login-config>
</login-config>
-
+
<security-role>
<role-name>employee</role-name>
</security-role>
-
+
<ejb-ref>
<ejb-ref-name>jsp2sful</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
index b2b3e0a..4e29424 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
@@ -29,11 +29,11 @@
*/
public class ProfileInfoBean implements SessionBean {
-
+
private String name;
-
+
private SessionContext sc = null;
-
+
/** Creates a new instance of ProfieInfo */
public void ejbCreate(String name) {
this.name = name;
@@ -46,24 +46,24 @@
public String getSecretInfo() {
return "Keep It Secret!";
}
-
+
public void ejbActivate() {
System.out.println("In ShoppingCart ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In ShoppingCart ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In ShoppingCart ejbRemove");
}
-
-
+
+
public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
index f47ad2a..3d3417d 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
@@ -22,8 +22,8 @@
* @author swchan2
*/
public interface ProfileInfoHome extends EJBHome{
-
- public ProfileInfoRemote create(String name)
+
+ public ProfileInfoRemote create(String name)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldap/build.properties b/appserver/tests/appserv-tests/devtests/security/ldap/build.properties
index 3379765..8f70a1c 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ldap/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="security"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.properties b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.properties
index 91df096..42fa45d 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="appname" value="simple-webapp"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.xml b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.xml
index f107b6a..5af9d6f 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/build.xml
@@ -35,7 +35,7 @@
&commonSecurity;
&testProperties;
&testProperties2;
-
+
<property file="../config.properties"/>
<!--
@@ -50,27 +50,27 @@
</target>
<target name="all-reg" depends="init-common,env-check">
- <antcall target="setup"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup"/>
+ <antcall target="setup"/>
+ <antcall target="build"/>
+ <antcall target="deploy"/>
+ <antcall target="run"/>
+ <antcall target="undeploy"/>
+ <antcall target="unsetup"/>
</target>
<target name="all-ssl" depends="init-common,env-check">
- <antcall target="setup-ssl"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup-ssl"/>
+ <antcall target="setup-ssl"/>
+ <antcall target="build"/>
+ <antcall target="deploy"/>
+ <antcall target="run"/>
+ <antcall target="undeploy"/>
+ <antcall target="unsetup-ssl"/>
</target>
<target name="display-header">
<echo message="-->Running ${ant.project.name} tests from ${basedir} ..."/>
</target>
-
+
<target name="setup" depends="init-common">
<!-- create auth realms -->
<antcall target="create-auth-ldaprealm"/>
@@ -106,7 +106,7 @@
<target name="run" depends="init-common">
<java classname="HttpBasicAuthTest" fork="true">
<classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
</classpath>
<arg value="-url"/>
<arg value="http://${http.host}:${http.port}/${appname}/TestServlet"/>
@@ -133,26 +133,26 @@
<target name="create-ldap-usrgrps" depends="init-common">
- <copy file="${create.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
- <replace file="temp.ldif" token="UNIQUE_SUB_CONTEXT" value="${unique-ldap-sub-context-id}"/>
- <echo message="Creating ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?dc=${unique-ldap-sub-context-id},${directory.server.basedn}"/>
- <antcall target="execute-ldap-ldif">
- <param name="ldif.file.path" value="temp.ldif"/>
- </antcall>
- <echo message="deleting temp file..."/>
- <delete file="temp.ldif"/>
+ <copy file="${create.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
+ <replace file="temp.ldif" token="UNIQUE_SUB_CONTEXT" value="${unique-ldap-sub-context-id}"/>
+ <echo message="Creating ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?dc=${unique-ldap-sub-context-id},${directory.server.basedn}"/>
+ <antcall target="execute-ldap-ldif">
+ <param name="ldif.file.path" value="temp.ldif"/>
+ </antcall>
+ <echo message="deleting temp file..."/>
+ <delete file="temp.ldif"/>
</target>
<target name="delete-ldap-usrgrps" depends="init-common">
- <copy file="${delete.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
- <replace file="temp.ldif" token="UNIQUE_SUB_CONTEXT" value="${unique-ldap-sub-context-id}"/>
+ <copy file="${delete.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
+ <replace file="temp.ldif" token="UNIQUE_SUB_CONTEXT" value="${unique-ldap-sub-context-id}"/>
<echo message="Deleting ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?dc=${unique-ldap-sub-context-id},${directory.server.basedn}"/>
- <antcall target="execute-ldap-ldif">
- <param name="ldif.file.path" value="temp.ldif"/>
- </antcall>
- <echo message="deleting temp file..."/>
- <delete file="temp.ldif"/>
+ <antcall target="execute-ldap-ldif">
+ <param name="ldif.file.path" value="temp.ldif"/>
+ </antcall>
+ <echo message="deleting temp file..."/>
+ <delete file="temp.ldif"/>
</target>
<target name="restart">
@@ -161,35 +161,35 @@
<target name="execute-ldap-ldif" depends="init-common">
- <java classname="LDAPModify" fork="true" failonerror="false">
- <arg line="-h ${directory.server.host}"/>
- <arg line="-p ${directory.server.port}"/>
- <arg line="-D "${directory.manager.dn}""/>
- <arg line="-w ${directory.manager.passwd}"/>
- <arg line="-f ${ldif.file.path}"/>
- <classpath>
- <pathelement path="${env.APS_HOME}/lib/ldapjdk.jar"/>
- </classpath>
- </java>
+ <java classname="LDAPModify" fork="true" failonerror="false">
+ <arg line="-h ${directory.server.host}"/>
+ <arg line="-p ${directory.server.port}"/>
+ <arg line="-D "${directory.manager.dn}""/>
+ <arg line="-w ${directory.manager.passwd}"/>
+ <arg line="-f ${ldif.file.path}"/>
+ <classpath>
+ <pathelement path="${env.APS_HOME}/lib/ldapjdk.jar"/>
+ </classpath>
+ </java>
</target>
<target name="create-auth-ldaprealm" depends="init-common">
- <!-- workaround for handling the special character : in the admin command -->
- <echo message="directory=${directory.server.url}" file="temp.txt"/>
- <replace file="temp.txt" token=":" value="\\:"/>
- <loadproperties srcFile="temp.txt"/>
- <delete file="temp.txt"/>
- <echo message="base-dn=${directory.server.basedn}" file="temp.txt"/>
- <replace file="temp.txt" token="dc=" value="dc\\="/>
- <loadproperties srcFile="temp.txt"/>
- <delete file="temp.txt"/>
+ <!-- workaround for handling the special character : in the admin command -->
+ <echo message="directory=${directory.server.url}" file="temp.txt"/>
+ <replace file="temp.txt" token=":" value="\\:"/>
+ <loadproperties srcFile="temp.txt"/>
+ <delete file="temp.txt"/>
+ <echo message="base-dn=${directory.server.basedn}" file="temp.txt"/>
+ <replace file="temp.txt" token="dc=" value="dc\\="/>
+ <loadproperties srcFile="temp.txt"/>
+ <delete file="temp.txt"/>
<echo message="url=${directory}"/>
<echo message="base-dn=${base-dn}"/>
-
- <antcall target="create-auth-realm">
- <param name="realmname" value="${ldap.realm.name}"/>
- <param name="realmclass" value="${ldap.realm.class}"/>
- <param name="realmproperties" value="--property directory=${directory}:base-dn=dc\=${unique-ldap-sub-context-id},${base-dn}:jaas-context=ldapRealm:com.sun.jndi.ldap.connect.pool=true:com.sun.jndi.ldap.connect.pool.maxsize=2"/>
+
+ <antcall target="create-auth-realm">
+ <param name="realmname" value="${ldap.realm.name}"/>
+ <param name="realmclass" value="${ldap.realm.class}"/>
+ <param name="realmproperties" value="--property directory=${directory}:base-dn=dc\=${unique-ldap-sub-context-id},${base-dn}:jaas-context=ldapRealm:com.sun.jndi.ldap.connect.pool=true:com.sun.jndi.ldap.connect.pool.maxsize=2"/>
</antcall>
</target>
@@ -254,21 +254,21 @@
</target>
<target name="create-auth-ldaprealm-ssl" depends="init-common">
- <echo message="directory=${directory.server.url.ssl}" file="temp.txt"/>
- <replace file="temp.txt" token=":" value="\\:"/>
- <loadproperties srcFile="temp.txt"/>
- <delete file="temp.txt"/>
- <echo message="base-dn=${directory.server.basedn}" file="temp.txt"/>
- <replace file="temp.txt" token="dc=" value="dc\\="/>
- <loadproperties srcFile="temp.txt"/>
- <delete file="temp.txt"/>
+ <echo message="directory=${directory.server.url.ssl}" file="temp.txt"/>
+ <replace file="temp.txt" token=":" value="\\:"/>
+ <loadproperties srcFile="temp.txt"/>
+ <delete file="temp.txt"/>
+ <echo message="base-dn=${directory.server.basedn}" file="temp.txt"/>
+ <replace file="temp.txt" token="dc=" value="dc\\="/>
+ <loadproperties srcFile="temp.txt"/>
+ <delete file="temp.txt"/>
<echo message="url=${directory}"/>
<echo message="base-dn=${base-dn}"/>
-
- <antcall target="create-auth-realm">
- <param name="realmname" value="${ldap.realm.name}"/>
- <param name="realmclass" value="${ldap.realm.class}"/>
- <param name="realmproperties" value="--property directory=${directory}:base-dn=dc\=${unique-ldap-sub-context-id},${base-dn}:jaas-context=ldapRealm:com.sun.jndi.ldap.connect.pool=true:com.sun.jndi.ldap.connect.pool.maxsize=2"/>
+
+ <antcall target="create-auth-realm">
+ <param name="realmname" value="${ldap.realm.name}"/>
+ <param name="realmclass" value="${ldap.realm.class}"/>
+ <param name="realmproperties" value="--property directory=${directory}:base-dn=dc\=${unique-ldap-sub-context-id},${base-dn}:jaas-context=ldapRealm:com.sun.jndi.ldap.connect.pool=true:com.sun.jndi.ldap.connect.pool.maxsize=2"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/client/HttpBasicAuthTest.java b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/client/HttpBasicAuthTest.java
index 9d59dbb..919369f 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/client/HttpBasicAuthTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/client/HttpBasicAuthTest.java
@@ -59,7 +59,7 @@
Thread tarray[] = new Thread[threadCount];
- for(int i=0; i<threadCount; i++)
+ for(int i=0; i<threadCount; i++)
tarray[i] = new Thread(this, "Http-request-thread-" + i);
for(int i=0; i<threadCount; i++)
@@ -83,11 +83,11 @@
stdDev = Math.pow(stdDev, 0.5);
- System.out.println("Total requests: " + (suxesCount+failureCount) +
- ", success count: " + suxesCount +
+ System.out.println("Total requests: " + (suxesCount+failureCount) +
+ ", success count: " + suxesCount +
", failure count: " + failureCount);
- System.out.println("Min/Max/Avg/StdDev: (milliseconds) " +
- minTime + "/" +
+ System.out.println("Min/Max/Avg/StdDev: (milliseconds) " +
+ minTime + "/" +
maxTime + "/" + avgTime + "/" + stdDev);
String testId = "Sec::LDAP BasicAuth";
diff --git a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/descriptor/web.xml
index 67ca849..0125036 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/descriptor/web.xml
@@ -21,12 +21,12 @@
<web-app>
-
+
<servlet>
<servlet-name>TestJSP</servlet-name>
<jsp-file>/TestJSP.jsp</jsp-file>
</servlet>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>com.sun.security.devtests.ldap.simple.TestServlet</servlet-class>
@@ -40,7 +40,7 @@
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>
30
diff --git a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/web/TestServlet.java b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/web/TestServlet.java
index fe94c66..c94dd19 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/web/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldap/simpleweb/web/TestServlet.java
@@ -26,35 +26,35 @@
import java.util.Properties;
-public class TestServlet extends HttpServlet
+public class TestServlet extends HttpServlet
{
- // Security role references.
- private static final String emp_secrole_ref = "Employee";
- private static final String admin_secrole_ref = "ADMIN";
- private static final String mgr_secrole_ref = "Manager";
+ // Security role references.
+ private static final String emp_secrole_ref = "Employee";
+ private static final String admin_secrole_ref = "ADMIN";
+ private static final String mgr_secrole_ref = "Manager";
String user="munta";
Properties props=null;
- public void doGet(HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException
- {
+ public void doGet(HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException
+ {
PrintWriter out= response.getWriter();
out.println("<br>Basic Authentication tests from Servlet: Test1,Test2,Test3 ");
out.println("<br>Authorization test from Servlet: Test4,Test5-> HttpServletRequest.isUserInRole() authorization from Servlet.");
-
+
test1(request, response, out);
test2(request, response, out);
test3(request, response, out);
test4(request, response, out);
test5(request, response, out);
- }
+ }
//Tests begin
- public void test1(HttpServletRequest request, HttpServletResponse response, PrintWriter out)
- {
+ public void test1(HttpServletRequest request, HttpServletResponse response, PrintWriter out)
+ {
//Check the auth type - request.getAuthType()
out.println("<br><br>Test1. Postive check for the correct authentication type");
String authtype=request.getAuthType();
@@ -99,7 +99,7 @@
out.println("<br>HttpServletRequest.isUserInRole() test Failed!");
}
out.println("<br>Info:request.isUserInRole(\""+emp_secrole_ref+"\") is= "+isInProperRole);
- }
+ }
//Test5 - Negative test for checking the user's proper role
public void test5(HttpServletRequest request, HttpServletResponse response, PrintWriter out){
@@ -111,6 +111,6 @@
out.println("<br>HttpServletRequest.isUserInRole() test Failed!");
}
out.println("<br>Info:request.isUserInRole(\""+mgr_secrole_ref+"\") is= "+isNotInOtherRole);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.properties b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.properties
index 1b5be45..454afe1 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/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="security"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.xml b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.xml
index 72ce8dd..a7ce607 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&commonRun;
&testProperties;
-
+
<target name="all">
<antcall target="build"/>
<antcall target="create-ldap-usrgrps" />
@@ -143,37 +143,37 @@
<target name="create-ldap-usrgrps" depends="init-common">
- <copy file="${create.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
- <echo message="Creating ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?${directory.server.basedn}"/>
- <antcall target="execute-ldap-ldif">
- <param name="ldif.file.path" value="temp.ldif"/>
- </antcall>
- <echo message="deleting temp file..."/>
- <delete file="temp.ldif"/>
+ <copy file="${create.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
+ <echo message="Creating ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?${directory.server.basedn}"/>
+ <antcall target="execute-ldap-ldif">
+ <param name="ldif.file.path" value="temp.ldif"/>
+ </antcall>
+ <echo message="deleting temp file..."/>
+ <delete file="temp.ldif"/>
</target>
<target name="delete-ldap-usrgrps" depends="init-common">
- <copy file="${delete.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
- <echo message="Deleting ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?${directory.server.basedn}"/>
- <antcall target="execute-ldap-ldif">
- <param name="ldif.file.path" value="temp.ldif"/>
- </antcall>
- <echo message="deleting temp file..."/>
- <delete file="temp.ldif"/>
+ <copy file="${delete.ldif.file}" tofile="temp.ldif" overwrite="true" failonerror="false"/>
+ <echo message="Deleting ldap test users and groups at ldap://${directory.server.host}:${directory.server.port}/?${directory.server.basedn}"/>
+ <antcall target="execute-ldap-ldif">
+ <param name="ldif.file.path" value="temp.ldif"/>
+ </antcall>
+ <echo message="deleting temp file..."/>
+ <delete file="temp.ldif"/>
</target>
<target name="execute-ldap-ldif" depends="init-common">
- <java classname="LDAPModify" fork="true" failonerror="false">
- <arg line="-h ${directory.server.host}"/>
- <arg line="-p ${directory.server.port}"/>
- <arg line="-D "${directory.manager.dn}""/>
- <arg line="-w ${directory.manager.passwd}"/>
- <arg line="-f ${ldif.file.path}"/>
- <classpath>
- <pathelement path="${env.APS_HOME}/lib/ldapjdk.jar"/>
- </classpath>
- </java>
+ <java classname="LDAPModify" fork="true" failonerror="false">
+ <arg line="-h ${directory.server.host}"/>
+ <arg line="-p ${directory.server.port}"/>
+ <arg line="-D "${directory.manager.dn}""/>
+ <arg line="-w ${directory.manager.passwd}"/>
+ <arg line="-f ${ldif.file.path}"/>
+ <classpath>
+ <pathelement path="${env.APS_HOME}/lib/ldapjdk.jar"/>
+ </classpath>
+ </java>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/client/RpaClient.java
index 7e6002e..726dcd2 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/client/RpaClient.java
@@ -31,31 +31,31 @@
RpaClient client = new RpaClient(args);
client.doTest();
}
-
+
public RpaClient(String[] args) {
//super(args);
}
-
+
public String doTest() {
-
- RpaRemote hr=null;
+
+ RpaRemote hr=null;
String res=null;
Context ic = null;
LoginContext lc=null;
RpaHome home=null;
String testId = "Sec:: LDAP realm";
- try{
+ try{
stat.addDescription("Security:: LDAP realm");
- ic = new InitialContext();
- // create EJB using factory from container
+ ic = new InitialContext();
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("rpaLoginBean");
-
- System.err.println("Looked up home!!");
-
- home = (RpaHome)PortableRemoteObject.narrow(
- objref, RpaHome.class);
- System.err.println("Narrowed home!!");
-
+
+ System.err.println("Looked up home!!");
+
+ home = (RpaHome)PortableRemoteObject.narrow(
+ objref, RpaHome.class);
+ System.err.println("Narrowed home!!");
+
hr = home.create("LizHurley");
System.out.println("Got the EJB!!");
@@ -81,11 +81,11 @@
stat.addStatus(testId, stat.FAIL);
System.out.println("LDAP Realm:RpaLoginBean Test Failed");
System.exit(-1);
- } finally {
+ } finally {
stat.printSummary();
}
return res;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
index d6462de..4f1ec90 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
@@ -35,26 +35,26 @@
*/
public class RpaBean implements SessionBean {
-
+
private String shopper = "anonymous";
private String principal = "j2ee/shingwai";
private int totalPrice = 0;
-
+
private int totalItems = 0;
-
+
private List<String> items;
-
+
private List<Integer> itemPrice;
-
+
private SessionContext sc = null;
-
+
/** Creates a new instance of ShoppingEJB */
public void ejbCreate(String shopperName) {
shopper = shopperName;
items = new ArrayList<String>();
itemPrice = new ArrayList<Integer>();
}
-
+
public void addItem(String item, int price) throws EJBException,
RemoteException{
checkCallerPrincipal();
@@ -66,47 +66,47 @@
+ item +" for price ="+ price +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
}
-
- public void deleteItem(String item) throws EJBException,
+
+ public void deleteItem(String item) throws EJBException,
RemoteException{
checkCallerPrincipal();
int index = items.indexOf(item);
items.remove(item);
Integer price = itemPrice.get(index);
- System.out.println("Shopping Cart: Removing item "+ item +" @price "+
+ System.out.println("Shopping Cart: Removing item "+ item +" @price "+
price.intValue());
totalPrice -= price.shortValue();
- itemPrice.remove(index);
+ itemPrice.remove(index);
System.out.println(" Shopping Cart: Shopper "+ shopper +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
}
-
+
public double getTotalCost() throws EJBException{
checkCallerPrincipal();
return totalPrice;
}
-
+
public String[] getItems() throws EJBException{
checkCallerPrincipal();
String[] itemNames = items.toArray(new String[0]);
return itemNames;
}
-
+
public void ejbActivate() {
System.out.println("In Rpa ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In Rpa ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In Rpa ejbRemove");
}
-
-
+
+
public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
index 3da5d67..a66065b 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
@@ -27,8 +27,8 @@
* @author Harpreet Singh
*/
public interface RpaHome extends EJBHome{
-
- public RpaRemote create(java.lang.String shopperName)
+
+ public RpaRemote create(java.lang.String shopperName)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
index fb8a773..43a3991 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
@@ -23,17 +23,17 @@
package shopping;
import jakarta.ejb.EJBObject;
/**
- * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
+ * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
* @author hsingh
*/
public interface RpaRemote extends EJBObject {
-
+
public void addItem(java.lang.String item, int price) throws java.rmi.RemoteException;
-
+
public void deleteItem(java.lang.String item) throws java.rmi.RemoteException;
-
+
public double getTotalCost() throws java.rmi.RemoteException;
-
+
public java.lang.String[] getItems() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/build.properties b/appserver/tests/appserv-tests/devtests/security/mdb/build.properties
index f22642f..f961129 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/build.properties
@@ -15,21 +15,21 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="security-mdb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/build.xml b/appserver/tests/appserv-tests/devtests/security/mdb/build.xml
index 97bee71..699e47e 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/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"/>
@@ -75,14 +75,14 @@
<param name="appclient.application.args" value="1"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
- <echo>
+ <echo>
ant create-resources Create all destinations and connection factories
ant delete-resources Delete all destinations and connection factories
</echo>
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
index bd90c33..deaf9e5 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
@@ -42,7 +42,7 @@
}
- @Resource(name="FooCF", mappedName="jms/security_mdb_QCF")
+ @Resource(name="FooCF", mappedName="jms/security_mdb_QCF")
private static QueueConnectionFactory queueConFactory;
@Resource(name="MsgBeanQueue", mappedName="jms/security_mdb_InQueue")
@@ -50,7 +50,7 @@
// @Resource(name="ClientQueue", mappedName="foo")
// private static jakarta.jms.Queue clientQueue;
-@Resource(name="ClientQueue", mappedName="jms/security_mdb_OutQueue")
+@Resource(name="ClientQueue", mappedName="jms/security_mdb_OutQueue")
private static jakarta.jms.Queue clientQueue;
@@ -62,7 +62,7 @@
private int numMessages = 2;
public Client(String[] args) {
-
+
if( args.length == 1 ) {
numMessages = new Integer(args[0]).intValue();
}
@@ -82,14 +82,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);
@@ -107,18 +107,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;
@@ -132,7 +132,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/security/mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/Hello1.java
index 876f0ab..c04d6bc 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/Hello1.java
@@ -19,5 +19,5 @@
public interface Hello1 {
public void hello(String s);
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
index 58ae398..edc23c4 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
@@ -41,7 +41,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/security/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
index 7740e37..6c02772 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
@@ -22,7 +22,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 {
@RolesAllowed("javaee")
diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
index 67eb919..5b82501 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
@@ -47,8 +47,8 @@
@EJB private Hello1 hello1;
@EJB private Hello2 hello2;
- @Resource(name="jms/MyQueueConnectionFactory",
- mappedName="jms/security_mdb_QCF")
+ @Resource(name="jms/MyQueueConnectionFactory",
+ mappedName="jms/security_mdb_QCF")
QueueConnectionFactory qcFactory;
@Resource(mappedName="jms/security_mdb_OutQueue") Queue clientQueue;
@@ -58,7 +58,7 @@
QueueConnection connection = null;
try {
-
+
System.out.println("Calling hello1 stateless bean");
hello1.hello("local ejb3.0 stateless");
@@ -76,14 +76,14 @@
QueueSession session = connection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
QueueSender sender = session.createSender(clientQueue);
- connection.start();
-
+ connection.start();
+
TextMessage tmessage = session.createTextMessage();
tmessage.setText("mdb() invoked");
System.out.println("Sending message");
sender.send(tmessage);
System.out.println("message sent");
- connection.close();
+ connection.close();
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.properties b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.properties
index c5f46a4..2c62f6f 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/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="security-multirolemapping"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.xml b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.xml
index debf6cf..5e64d9e 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/build.xml
@@ -25,18 +25,18 @@
]>
<project name="security-multirolemapping" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
&commonSecurity;
-
+
<target name="all" depends="clean, setup, build, deploy, run, undeploy, unsetup"/>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="setup" depends="init-common">
<!-- see readme for list of how all the users are used -->
<antcall target="create-user-common">
@@ -149,10 +149,10 @@
<param name="password" value="javaee"/>
<param name="groups" value="abc"/>
</antcall>
-
+
<!-- <antcall target="reconfig-common"/>-->
</target>
-
+
<target name="unsetup" depends="init-common">
<antcall target="delete-user-common">
<param name="user" value="r1p1"/>
@@ -221,7 +221,7 @@
<param name="user" value="r7p2"/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb1"/>
@@ -247,11 +247,11 @@
</antcall>
-->
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
-
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/nonweb1"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}1-ejb.jar"/>
@@ -269,20 +269,20 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
<param name="sun-web.xml" value="descriptor/sun-web.xml"/>
</antcall>
-
+
<!--
<antcall target="package-appclientjar-common">
<param name="appclientjar.files" value="${build.classes.dir}/nonweb"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/client/*.class,com/sun/**/ejb/Hello.class"/>
</antcall>
-->
-
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
@@ -292,9 +292,9 @@
<include name="META-INF/sun-application.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </jar>
-
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ </jar>
+
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
<jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
@@ -303,9 +303,9 @@
<fileset dir="${build.classes.dir}">
<include name="META-INF/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -324,7 +324,7 @@
<arg line="${http.host} ${http.port}"/>
</exec>
-->
-
+
<antcall target="runweb">
<param name="servlet" value="role1"/>
<param name="webuser" value="r1p1"/>
@@ -505,7 +505,7 @@
<param name="testcaseid" value="user-auth-r7p2"/>
</antcall>
</target>
-
+
<target name="runweb" depends="init-common">
<taskdef name="webtest" classname="${webtest.classname}"
classpath="${webtest.classpath}" />
@@ -535,7 +535,7 @@
testCaseDescription="Testing role mapping"
testStrategy="Testing role mapping"/>
</target>
-
+
<target name="runweb-403" depends="init-common">
<taskdef name="webtest" classname="${webtest.classname}"
classpath="${webtest.classpath}" />
@@ -569,7 +569,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-application.xml
index d63bb93..73121a9 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-application.xml
@@ -19,7 +19,7 @@
-->
<sun-application>
-
+
<!-- See readme for an explanation of all the
security role mappings in this file and
the ejb and web module files. -->
@@ -31,7 +31,7 @@
<role-name>role1</role-name>
<principal-name>r1p2</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role2</role-name>
<principal-name>r2p1</principal-name>
@@ -44,7 +44,7 @@
<role-name>role2</role-name>
<group-name>r2g2</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role3</role-name>
<principal-name>r3p1</principal-name>
@@ -53,5 +53,5 @@
<role-name>role3</role-name>
<group-name>r3g1</group-name>
</security-role-mapping>
-
+
</sun-application>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar1.xml b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar1.xml
index 84dbee8..c86be3a 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar1.xml
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar1.xml
@@ -24,12 +24,12 @@
<ejb-name>MessageBean1</ejb-name>
</ejb>
</enterprise-beans>
-
+
<security-role-mapping>
<role-name>role1</role-name>
<principal-name>r1p1</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role2</role-name>
<principal-name>r2p2</principal-name>
@@ -38,9 +38,9 @@
<role-name>role2</role-name>
<group-name>r2g3</group-name>
</security-role-mapping>
-
+
<!-- no mapping for role 3 -->
-
+
<security-role-mapping>
<role-name>role4</role-name>
<principal-name>r4p1</principal-name>
@@ -49,7 +49,7 @@
<role-name>role4</role-name>
<group-name>r4g1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role5</role-name>
<principal-name>r5p1</principal-name>
@@ -58,7 +58,7 @@
<role-name>role5</role-name>
<group-name>r5g1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role6</role-name>
<principal-name>r6p1</principal-name>
@@ -67,7 +67,7 @@
<role-name>role6</role-name>
<principal-name>r6p2</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role7</role-name>
<principal-name>r7p1</principal-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar2.xml b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar2.xml
index 69dc32a..35bf880 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar2.xml
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-ejb-jar2.xml
@@ -24,7 +24,7 @@
<ejb-name>MessageBean2</ejb-name>
</ejb>
</enterprise-beans>
-
+
<security-role-mapping>
<role-name>role1</role-name>
<principal-name>r1p1</principal-name>
@@ -33,7 +33,7 @@
<role-name>role1</role-name>
<principal-name>r1p2</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role2</role-name>
<group-name>r2g1</group-name>
@@ -42,9 +42,9 @@
<role-name>role2</role-name>
<group-name>r2g2</group-name>
</security-role-mapping>
-
+
<!-- no mapping for role 3 -->
-
+
<security-role-mapping>
<role-name>role4</role-name>
<principal-name>r4p1</principal-name>
@@ -53,7 +53,7 @@
<role-name>role4</role-name>
<group-name>r4g1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role5</role-name>
<principal-name>r5p1</principal-name>
@@ -66,7 +66,7 @@
<role-name>role5</role-name>
<group-name>r5g1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role6</role-name>
<principal-name>r6p1</principal-name>
@@ -75,7 +75,7 @@
<role-name>role6</role-name>
<group-name>r6g1</group-name>
</security-role-mapping>
-
+
<!-- no mapping for role 7 -->
</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-web.xml
index 629ac28..06dc56f 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/sun-web.xml
@@ -29,7 +29,7 @@
<description>Maintain a one-to-one correspondence between static content and the generated servlet class' java code</description>
</property>
</jsp-config>
-
+
<security-role-mapping>
<role-name>role1</role-name>
<principal-name>r1p1</principal-name>
@@ -42,7 +42,7 @@
<role-name>role1</role-name>
<principal-name>r1p3</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role2</role-name>
<principal-name>r2p2</principal-name>
@@ -51,9 +51,9 @@
<role-name>role2</role-name>
<group-name>r2g1</group-name>
</security-role-mapping>
-
+
<!-- no mapping for role 3 -->
-
+
<security-role-mapping>
<role-name>role4</role-name>
<principal-name>r4p1</principal-name>
@@ -62,12 +62,12 @@
<role-name>role4</role-name>
<group-name>r4g1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role5</role-name>
<principal-name>r5p1</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role6</role-name>
<principal-name>r6p1</principal-name>
@@ -76,7 +76,7 @@
<role-name>role6</role-name>
<group-name>r6g1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>role7</role-name>
<principal-name>r7p1</principal-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/web.xml
index 4a72ee2..34ed73d 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/descriptor/web.xml
@@ -22,18 +22,18 @@
<servlet-name>WebTest</servlet-name>
<servlet-class>com.sun.s1asdev.security.multiRoleMapping.web.WebTest</servlet-class>
</servlet>
-
+
<servlet-mapping>
<servlet-name>WebTest</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
<session-config>
-
+
<session-timeout>
30
</session-timeout>
</session-config>
-
+
<security-constraint>
<display-name>constraint-role1</display-name>
<web-resource-collection>
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
index b4c56d6..10a6dc7 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
@@ -23,10 +23,10 @@
@Stateless
@Local({MessageLocal1.class})
public class MessageBean1 implements MessageLocal1 {
-
+
//@RolesAllowed("ejbrole")
public String getMessage() {
return "Hello from ejb";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
index 1d6ceff..e72aca2 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
@@ -24,5 +24,5 @@
@Local
public interface MessageLocal1 {
String getMessage();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
index a4352a8..960a330 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
@@ -23,10 +23,10 @@
@Stateless
@Local({MessageLocal2.class})
public class MessageBean2 implements MessageLocal2 {
-
+
//@RolesAllowed("ejbrole")
public String getMessage() {
return "Hello from ejb";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
index 0202395..cf888b8 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
@@ -24,5 +24,5 @@
@Local
public interface MessageLocal2 {
String getMessage();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/web/WebTest.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/web/WebTest.java
index 0a9a535..6141eec 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/web/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/web/WebTest.java
@@ -23,7 +23,7 @@
import jakarta.servlet.http.*;
public class WebTest extends HttpServlet {
-
+
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
@@ -44,5 +44,5 @@
}
out.close();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.properties b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.properties
index e638c4d..3d57c0e 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/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="security"/>
<property name="app.type" value="application"/>
@@ -26,4 +26,4 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appname" value="negativeRPALoginBean"/>
+<property name="appname" value="negativeRPALoginBean"/> \u0020
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.xml b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.xml
index 398b889..7b5bcf2 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&testProperties;
&commonSecurity;
-
+
<target name="all" depends="build, deploy,run, undeploy"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
@@ -50,7 +50,7 @@
</target>
<target name="build" depends="compile">
-<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
+<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
-->
<antcall target="build-ear-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
index a5d6796..4c8f7bf 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
@@ -39,31 +39,31 @@
NegativeRPAClient client = new NegativeRPAClient(args);
client.doTest();
}
-
+
public NegativeRPAClient(String[] args) {
//super(args);
}
-
+
public String doTest() {
-
- NegativeRPARemote hr=null;
+
+ NegativeRPARemote hr=null;
String res=null;
Context ic = null;
LoginContext lc=null;
NegativeRPAHome home=null;
String testId = "Sec::NegativeTest-Realm per app";
- try{
+ try{
stat.addDescription("Security::NegativeTest - Realm per app");
- ic = new InitialContext();
- // create EJB using factory from container
+ ic = new InitialContext();
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("negativeRPALoginBean");
-
- System.err.println("Looked up home!!");
-
+
+ System.err.println("Looked up home!!");
+
home = (NegativeRPAHome)PortableRemoteObject.narrow(
- objref, NegativeRPAHome.class);
- System.err.println("Narrowed home!!");
-
+ objref, NegativeRPAHome.class);
+ System.err.println("Narrowed home!!");
+
hr = home.create("LizHurley");
System.out.println("Got the EJB!!");
System.out.println ("Calling authorized method - addItem");
@@ -75,13 +75,13 @@
//ex.printStackTrace();
if(ex instanceof java.rmi.AccessException){
System.out.println(" Got java.rmi.AccessException !! ");
- System.out.println("NegativeRPA:StatefulLoginBean Test Passed: Exception expected");
+ System.out.println("NegativeRPA:StatefulLoginBean Test Passed: Exception expected");
res="PASS";
stat.addStatus(testId, stat.PASS);
} else {
System.out.println("NegativeRPA:StatefulLoginBean Test Failed");
- res = "FAIL";
+ res = "FAIL";
stat.addStatus(testId, stat.FAIL);
}
} finally {
@@ -89,10 +89,10 @@
}
return res;
-
+
}
-
+
public final static String helloStr = "Hello NegativeRPA!!!";
}
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
index 804ca35..d70fdef 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
@@ -35,66 +35,66 @@
*/
public class NegativeRPABean implements SessionBean {
-
+
private String shopper = "anonymous";
private String principal = "j2ee";
private int totalPrice = 0;
-
+
private int totalItems = 0;
-
+
private Vector items;
-
+
private Vector itemPrice;
-
+
private SessionContext sc = null;
-
+
/** Creates a new instance of ShoppingEJB */
public void ejbCreate(String shopperName) {
shopper = shopperName;
items = new Vector();
itemPrice = new Vector();
}
-
+
public void addItem(java.lang.String item, int price) throws EJBException,
RemoteException{
// this method should be uncallable.
throw new EJBException("Method should be uncallable ");
}
-
- public void deleteItem(java.lang.String item) throws EJBException,
+
+ public void deleteItem(java.lang.String item) throws EJBException,
RemoteException{
// this method should be uncallable.
throw new EJBException("Method should be uncallable ");
}
-
+
public double getTotalCost() throws EJBException{
// this method should be uncallable.
throw new EJBException("Method should be uncallable ");
}
-
+
public String[] getItems() throws EJBException{
// this method should be uncallable.
throw new EJBException("Method should be uncallable ");
}
-
+
public void ejbActivate() {
System.out.println("In ShoppingCart ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In ShoppingCart ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In ShoppingCart ejbRemove");
}
-
-
+
+
public void setSessionContext(SessionContext sessionContext) {
sc = sessionContext;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
index 303f89b..8a4a372 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
@@ -28,8 +28,8 @@
* @version
*/
public interface NegativeRPAHome extends EJBHome{
-
- public NegativeRPARemote create(java.lang.String shopperName)
+
+ public NegativeRPARemote create(java.lang.String shopperName)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
index 7afd1d7..7bdbc80 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
@@ -23,18 +23,18 @@
package shopping;
import jakarta.ejb.EJBObject;
/**
- * Negative RealmPerAPP Stateful Session Bean.
+ * Negative RealmPerAPP Stateful Session Bean.
* Tries to log into a non existent realm
* All methods should be uncallableN
* @author Harpreet Singh
*/
public interface NegativeRPARemote extends EJBObject {
-
+
public void addItem(java.lang.String item, int price) throws java.rmi.RemoteException;
-
+
public void deleteItem(java.lang.String item) throws java.rmi.RemoteException;
-
+
public double getTotalCost() throws java.rmi.RemoteException;
-
+
public java.lang.String[] getItems() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/pamrealm/build.properties b/appserver/tests/appserv-tests/devtests/security/pamrealm/build.properties
index 19a9b1d..79b94ed 100644
--- a/appserver/tests/appserv-tests/devtests/security/pamrealm/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/pamrealm/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="sec"/>
<property name="app.type" value="web"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/pamrealm/build.xml b/appserver/tests/appserv-tests/devtests/security/pamrealm/build.xml
index 8e26e7e..02013f5 100644
--- a/appserver/tests/appserv-tests/devtests/security/pamrealm/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/pamrealm/build.xml
@@ -50,7 +50,7 @@
level="verbose"/>
<mkdir dir="${src}"/>
<javac srcdir="${src}"
- destdir="${build.classes.dir}"
+ destdir="${build.classes.dir}"
debug="on"
failonerror="true">
<classpath refid="pamclient.class.path"/>
@@ -98,7 +98,7 @@
<arg value="${password}"/>
</java>
-
+
</target>
<target name="undeploy" depends="init-common">
@@ -117,7 +117,7 @@
<target name="usage">
<antcall target="undeploy-war-common"/>
-
+
</target>
<target name="restart">
diff --git a/appserver/tests/appserv-tests/devtests/security/pamrealm/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/pamrealm/descriptor/web.xml
index 38780bf..71cd2b2 100644
--- a/appserver/tests/appserv-tests/devtests/security/pamrealm/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/pamrealm/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/build.properties b/appserver/tests/appserv-tests/devtests/security/plogin/build.properties
index 2d280c9..a14e949 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/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="security"/>
<property name="sub-module" value="${module}-plogin"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/build.xml b/appserver/tests/appserv-tests/devtests/security/plogin/build.xml
index e9dd4a7..153bdf6 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/build.xml
@@ -32,7 +32,7 @@
&run;
<target name="all">
- <ant dir="standalone" target="all"/>
+ <ant dir="standalone" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.properties b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.properties
index d4da528..7cc6f3c 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/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="security"/>
<property name="sub-module" value="${module}-plogin-standalone"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.xml b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.xml
index f1c2f92..d13fa4e 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/build.xml
@@ -35,12 +35,12 @@
&commonSecurity;
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all standalone programmatic login tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes all standalone programmatic login tests)
+ </echo>
</target>
-
+
<target name="all" depends="build, setup, deploy,run, undeploy, unsetup">
</target>
@@ -141,7 +141,7 @@
<target name="run-standalone-client-per-thread" depends="init-common">
<echo message="Running standalone client per-thread ..."/>
-
+
<java classname="PLoginTest"
classpath="${admin.domain.dir}/../lib/appserv-rt.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar" fork="true">
<jvmarg value="-Djava.security.auth.login.config=${admin.domain.dir}/../lib/appclient/appclientlogin.conf"/>
@@ -157,7 +157,7 @@
<target name="run-standalone-client-per-process" depends="init-common">
<echo message="Running standalone client per-process ..."/>
-
+
<java classname="PLoginTest"
classpath="${admin.domain.dir}/../lib/appserv-rt.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar" fork="true">
<jvmarg value="-Djava.security.auth.login.config=${admin.domain.dir}/../lib/appclient/appclientlogin.conf"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/client/PLoginTest.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/client/PLoginTest.java
index 8f4b792..0fd769d 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/client/PLoginTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/client/PLoginTest.java
@@ -39,7 +39,7 @@
protected MySession1Remote my1r = null;
- public MyThreadBase(String username, String password,
+ public MyThreadBase(String username, String password,
String ejbLookupName, String threadName) {
super(threadName);
@@ -88,7 +88,7 @@
MySession1RemoteHome my1rh = (MySession1RemoteHome)
PortableRemoteObject.narrow(o, MySession1RemoteHome.class);
- my1r = my1rh.create();
+ my1r = my1rh.create();
String retval = doBusiness();
System.out.println(Thread.currentThread().getName() + " - " + retval);
@@ -97,11 +97,11 @@
doLogout();
try {
- // Give time for other thread to
+ // Give time for other thread to
Thread.sleep(random.nextInt(100));
} catch(Exception e) {
}
- }
+ }
}
public abstract String doBusiness() throws Exception ;
@@ -114,7 +114,7 @@
ProgrammaticLogin login = null;
- public LoginBusinessCallerBase(String username, String password,
+ public LoginBusinessCallerBase(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -131,7 +131,7 @@
abstract class NoLoginBusinessCallerBase extends MyThreadBase {
- public NoLoginBusinessCallerBase(String username, String password,
+ public NoLoginBusinessCallerBase(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -147,7 +147,7 @@
class LoginBusinessCaller extends LoginBusinessCallerBase {
- public LoginBusinessCaller(String username, String password,
+ public LoginBusinessCaller(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -159,7 +159,7 @@
class LoginBusinessCaller2 extends LoginBusinessCallerBase {
- public LoginBusinessCaller2(String username, String password,
+ public LoginBusinessCaller2(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -171,7 +171,7 @@
class LoginBusinessCaller3 extends LoginBusinessCallerBase {
- public LoginBusinessCaller3(String username, String password,
+ public LoginBusinessCaller3(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -183,7 +183,7 @@
class NoLoginBusinessCaller extends NoLoginBusinessCallerBase {
- public NoLoginBusinessCaller(String username, String password,
+ public NoLoginBusinessCaller(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -195,7 +195,7 @@
class NoLoginBusinessCaller2 extends NoLoginBusinessCallerBase {
- public NoLoginBusinessCaller2(String username, String password,
+ public NoLoginBusinessCaller2(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -207,7 +207,7 @@
class NoLoginBusinessCaller3 extends NoLoginBusinessCallerBase {
- public NoLoginBusinessCaller3(String username, String password,
+ public NoLoginBusinessCaller3(String username, String password,
String ejbLookupName, String threadName) {
super(username, password, ejbLookupName, threadName);
}
@@ -218,8 +218,8 @@
}
public class PLoginTest {
-
- private static SimpleReporterAdapter stat =
+
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) throws Exception {
@@ -230,32 +230,32 @@
if( b )
perThreadTest(numThreads);
- else
+ else
perProcessTest(numThreads);
}
private static void perThreadTest(int numThreads) throws Exception {
-
+
Set<MyThreadBase> threadSet = new HashSet<MyThreadBase>();
for(int i=0; i<numThreads; i++) {
- LoginBusinessCaller t1 =
- new LoginBusinessCaller("testy", "testy", "ejb/MySession1Bean",
+ LoginBusinessCaller t1 =
+ new LoginBusinessCaller("testy", "testy", "ejb/MySession1Bean",
"THREAD-"+"1-"+i);
LoginBusinessCaller2 t2 =
- new LoginBusinessCaller2("testy2", "testy2", "ejb/MySession1Bean",
+ new LoginBusinessCaller2("testy2", "testy2", "ejb/MySession1Bean",
"THREAD-"+"2-"+i);
- LoginBusinessCaller3 t3 =
- new LoginBusinessCaller3("testy3", "testy3", "ejb/MySession1Bean",
+ LoginBusinessCaller3 t3 =
+ new LoginBusinessCaller3("testy3", "testy3", "ejb/MySession1Bean",
"THREAD-"+"3-"+i);
threadSet.add(t1);
threadSet.add(t2);
threadSet.add(t3);
- t2.start();
- t1.start();
+ t2.start();
+ t1.start();
t3.start();
}
@@ -285,7 +285,7 @@
}
private static void perProcessTest(int numThreads) throws Exception {
-
+
Set<MyThreadBase> threadSet = new HashSet<MyThreadBase>();
ProgrammaticLogin login = new ProgrammaticLogin();
@@ -293,22 +293,22 @@
for(int i=0; i<numThreads; i++) {
- NoLoginBusinessCaller t1 =
- new NoLoginBusinessCaller("testy", "testy", "ejb/MySession1Bean",
+ NoLoginBusinessCaller t1 =
+ new NoLoginBusinessCaller("testy", "testy", "ejb/MySession1Bean",
"THREAD-"+"1-"+i);
NoLoginBusinessCaller2 t2 =
- new NoLoginBusinessCaller2("testy2", "testy2", "ejb/MySession1Bean",
+ new NoLoginBusinessCaller2("testy2", "testy2", "ejb/MySession1Bean",
"THREAD-"+"2-"+i);
- NoLoginBusinessCaller3 t3 =
- new NoLoginBusinessCaller3("testy3", "testy3", "ejb/MySession1Bean",
+ NoLoginBusinessCaller3 t3 =
+ new NoLoginBusinessCaller3("testy3", "testy3", "ejb/MySession1Bean",
"THREAD-"+"3-"+i);
threadSet.add(t1);
threadSet.add(t2);
threadSet.add(t3);
- t2.start();
- t1.start();
+ t2.start();
+ t1.start();
t3.start();
}
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/ejb-jar.xml
index 9d6f9a1..26cebf8 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/ejb-jar.xml
@@ -34,41 +34,41 @@
<security-role>
- <role-name>staff</role-name>
+ <role-name>staff</role-name>
</security-role>
<security-role>
- <role-name>staff2</role-name>
+ <role-name>staff2</role-name>
</security-role>
<security-role>
- <role-name>staff3</role-name>
+ <role-name>staff3</role-name>
</security-role>
<method-permission>
- <description>method authorized to only staff role</description>
+ <description>method authorized to only staff role</description>
<role-name>staff</role-name>
<method>
- <ejb-name>MySession1Bean</ejb-name>
- <method-name>businessMethod</method-name>
- </method>
+ <ejb-name>MySession1Bean</ejb-name>
+ <method-name>businessMethod</method-name>
+ </method>
</method-permission>
<method-permission>
- <description>method authorized to only staff2 role</description>
+ <description>method authorized to only staff2 role</description>
<role-name>staff2</role-name>
<method>
- <ejb-name>MySession1Bean</ejb-name>
- <method-name>businessMethod2</method-name>
- </method>
+ <ejb-name>MySession1Bean</ejb-name>
+ <method-name>businessMethod2</method-name>
+ </method>
</method-permission>
<method-permission>
- <description>method authorized to only staff3 role</description>
+ <description>method authorized to only staff3 role</description>
<role-name>staff3</role-name>
<method>
- <ejb-name>MySession1Bean</ejb-name>
- <method-name>businessMethod3</method-name>
- </method>
+ <ejb-name>MySession1Bean</ejb-name>
+ <method-name>businessMethod3</method-name>
+ </method>
</method-permission>
<container-transaction>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/sun-application.xml
index 3c7306b..61a639a 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/sun-application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/descriptor/sun-application.xml
@@ -32,7 +32,7 @@
<role-name>staff3</role-name>
<principal-name>chief</principal-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>staff</role-name>
<principal-name>testy</principal-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
index 556cacd..889caef 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
@@ -21,36 +21,36 @@
*/
public class MySession1Bean implements SessionBean, MySession1RemoteBusiness {
private SessionContext context;
-
+
/**
* @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
*/
public void setSessionContext(SessionContext aContext) {
context = aContext;
}
-
+
/**
* @see jakarta.ejb.SessionBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
+
/**
* @see jakarta.ejb.SessionBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
+
/**
* @see jakarta.ejb.SessionBean#ejbRemove()
*/
public void ejbRemove() {
-
+
}
// </editor-fold>
-
+
/**
* See section 7.10.3 of the EJB 2.0 specification
* See section 7.11.3 of the EJB 2.1 specification
@@ -61,9 +61,9 @@
// spanning all methods can be performed here such as home interfaces
// and data sources.
}
-
-
-
+
+
+
public String businessMethod(String name) {
return "hello " + name;
}
@@ -75,7 +75,7 @@
public String businessMethod3(String name) {
return "howdy "+name;
}
-
-
-
+
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
index 798d406..0e91e5b 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
@@ -21,6 +21,6 @@
* This is the remote interface for MySession1 enterprise bean.
*/
public interface MySession1Remote extends EJBObject, MySession1RemoteBusiness {
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
index 7ebc8f0..7c3303f 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
@@ -23,8 +23,8 @@
* This is the home interface for MySession1 enterprise bean.
*/
public interface MySession1RemoteHome extends EJBHome {
-
+
MySession1Remote create() throws CreateException, RemoteException;
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.properties b/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.properties
index a1835d4..f0f891a 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/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="security"/>
<property name="app.type" value="application"/>
@@ -26,4 +26,4 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appname" value="rpaLoginBean"/>
+<property name="appname" value="rpaLoginBean"/> \u0020
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.xml b/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.xml
index 66d615a..2868318 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&testProperties;
&commonSecurity;
-
+
<target name="all" depends="build, setup, deploy,run, undeploy, unsetup"/>
<target name="setup" depends="init-common">
@@ -81,7 +81,7 @@
</target>
<target name="build" depends="compile">
-<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
+<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
-->
<antcall target="build-ear-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
index 43d0772..252dbd4 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
@@ -38,31 +38,31 @@
RpaClient client = new RpaClient(args);
client.doTest();
}
-
+
public RpaClient(String[] args) {
//super(args);
}
-
+
public String doTest() {
-
- RpaRemote hr=null;
+
+ RpaRemote hr=null;
String res=null;
Context ic = null;
LoginContext lc=null;
RpaHome home=null;
String testId = "Sec::Realm per app";
- try{
+ try{
stat.addDescription("Security::Realm per app");
- ic = new InitialContext();
- // create EJB using factory from container
+ ic = new InitialContext();
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("rpaLoginBean");
-
- System.err.println("Looked up home!!");
-
- home = (RpaHome)PortableRemoteObject.narrow(
- objref, RpaHome.class);
- System.err.println("Narrowed home!!");
-
+
+ System.err.println("Looked up home!!");
+
+ home = (RpaHome)PortableRemoteObject.narrow(
+ objref, RpaHome.class);
+ System.err.println("Narrowed home!!");
+
hr = home.create("LizHurley");
System.out.println("Got the EJB!!");
@@ -88,11 +88,11 @@
stat.addStatus(testId, stat.FAIL);
System.out.println("RealmPerApp:RpaLoginBean Test Failed");
System.exit(-1);
- } finally {
+ } finally {
stat.printSummary();
}
return res;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
index c73946d..263a9bc 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
@@ -36,26 +36,26 @@
*/
public class RpaBean implements SessionBean {
-
+
private String shopper = "anonymous";
private String principal = "harpreet";
private int totalPrice = 0;
-
+
private int totalItems = 0;
-
+
private Vector items;
-
+
private Vector itemPrice;
-
+
private SessionContext sc = null;
-
+
/** Creates a new instance of ShoppingEJB */
public void ejbCreate(String shopperName) {
shopper = shopperName;
items = new Vector();
itemPrice = new Vector();
}
-
+
public void addItem(java.lang.String item, int price) throws EJBException,
RemoteException{
checkCallerPrincipal();
@@ -67,26 +67,26 @@
+ item +" for price ="+ price +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
}
-
- public void deleteItem(java.lang.String item) throws EJBException,
+
+ public void deleteItem(java.lang.String item) throws EJBException,
RemoteException{
checkCallerPrincipal();
int index = items.indexOf(item);
items.remove(item);
Integer price = (Integer) itemPrice.get(index);
- System.out.println("Shopping Cart: Removing item "+ item +" @price "+
+ System.out.println("Shopping Cart: Removing item "+ item +" @price "+
price.intValue());
totalPrice -= price.shortValue();
- itemPrice.remove(index);
+ itemPrice.remove(index);
System.out.println(" Shopping Cart: Shopper "+ shopper +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
}
-
+
public double getTotalCost() throws EJBException{
checkCallerPrincipal();
return totalPrice;
}
-
+
public String[] getItems() throws EJBException{
checkCallerPrincipal();
@@ -98,26 +98,26 @@
}
return itemNames;
}
-
+
public void ejbActivate() {
System.out.println("In Rpa ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In Rpa ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In Rpa ejbRemove");
}
-
-
+
+
public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
-
+
private void checkCallerPrincipal() throws EJBException {
System.out.println("Caller Princial = " + sc.getCallerPrincipal() +
" comparing against " + principal);
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
index d4262d0..c993090 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
@@ -28,8 +28,8 @@
* @author Harpreet Singh
*/
public interface RpaHome extends EJBHome{
-
- public RpaRemote create(java.lang.String shopperName)
+
+ public RpaRemote create(java.lang.String shopperName)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
index fb8a773..43a3991 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
@@ -23,17 +23,17 @@
package shopping;
import jakarta.ejb.EJBObject;
/**
- * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
+ * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
* @author hsingh
*/
public interface RpaRemote extends EJBObject {
-
+
public void addItem(java.lang.String item, int price) throws java.rmi.RemoteException;
-
+
public void deleteItem(java.lang.String item) throws java.rmi.RemoteException;
-
+
public double getTotalCost() throws java.rmi.RemoteException;
-
+
public java.lang.String[] getItems() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/report.xml b/appserver/tests/appserv-tests/devtests/security/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/security/report.xml
+++ b/appserver/tests/appserv-tests/devtests/security/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/security/resultCount.sh b/appserver/tests/appserv-tests/devtests/security/resultCount.sh
index fad2d3c..a550c51 100755
--- a/appserver/tests/appserv-tests/devtests/security/resultCount.sh
+++ b/appserver/tests/appserv-tests/devtests/security/resultCount.sh
@@ -24,11 +24,11 @@
FAILED=0
for i in $FILES
do
- echo "input file=$i"
- P=`grep "\"pass\"" $i | wc -l`
- F=`grep "\"fail\"" $i | wc -l`
- PASSED=`expr $PASSED + $P`
- FAILED=`expr $FAILED + $F`
+ echo "input file=$i"
+ P=`grep "\"pass\"" $i | wc -l`
+ F=`grep "\"fail\"" $i | wc -l`
+ PASSED=`expr $PASSED + $P`
+ FAILED=`expr $FAILED + $F`
done
TOTAL_RUN=`expr $PASSED + $FAILED `
DNR=`expr $TOTAL - $TOTAL_RUN `
diff --git a/appserver/tests/appserv-tests/devtests/security/run_test.sh b/appserver/tests/appserv-tests/devtests/security/run_test.sh
index ec1d398..e09ffbd 100755
--- a/appserver/tests/appserv-tests/devtests/security/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/security/run_test.sh
@@ -17,10 +17,10 @@
test_run(){
- #cp -f ${APS_HOME}/devtests/security/ldap/opends/X500Signer.jar ${OPENDS_HOME}/lib
+ #cp -f ${APS_HOME}/devtests/security/ldap/opends/X500Signer.jar ${OPENDS_HOME}/lib
- # Configure and start OpenDS using the default ports
- ${OPENDS_HOME}/setup \
+ # Configure and start OpenDS using the default ports
+ ${OPENDS_HOME}/setup \
-i \
-v \
-n \
@@ -34,37 +34,37 @@
-W changeit \
-N s1as
- ${S1AS_HOME}/bin/asadmin start-database
- ${S1AS_HOME}/bin/asadmin start-domain
- cd ${APS_HOME}/devtests/security
+ ${S1AS_HOME}/bin/asadmin start-database
+ ${S1AS_HOME}/bin/asadmin start-domain
+ cd ${APS_HOME}/devtests/security
- ant ${TARGET} | tee ${TEST_RUN_LOG}
+ ant ${TARGET} | tee ${TEST_RUN_LOG}
- ${S1AS_HOME}/bin/asadmin stop-domain
- ${S1AS_HOME}/bin/asadmin stop-database
- ${OPENDS_HOME}/bin/stop-ds \
+ ${S1AS_HOME}/bin/asadmin stop-domain
+ ${S1AS_HOME}/bin/asadmin stop-database
+ ${OPENDS_HOME}/bin/stop-ds \
-p 4444 \
-D "cn=Directory Manager" \
-w dmanager \
-P ${OPENDS_HOME}/config/admin-truststore \
-U ${OPENDS_HOME}/config/admin-keystore.pin
- #egrep 'FAILED= *0' ${TEST_RUN_LOG}
- #egrep 'DID NOT RUN= *0' ${TEST_RUN_LOG}
- cd -
+ #egrep 'FAILED= *0' ${TEST_RUN_LOG}
+ #egrep 'DID NOT RUN= *0' ${TEST_RUN_LOG}
+ cd -
}
get_test_target(){
- case $1 in
- security_all )
- TARGET=all
- export TARGET;;
- esac
+ case $1 in
+ security_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
merge_result_files(){
- cat ${APS_HOME}/test_resultsValid.xml ${APS_HOME}/security-gtest-results.xml > ${APS_HOME}/temp.xml
- mv ${APS_HOME}/temp.xml ${APS_HOME}/test_resultsValid.xml
+ cat ${APS_HOME}/test_resultsValid.xml ${APS_HOME}/security-gtest-results.xml > ${APS_HOME}/temp.xml
+ mv ${APS_HOME}/temp.xml ${APS_HOME}/test_resultsValid.xml
}
run_test_id(){
@@ -73,19 +73,19 @@
unzip -o opendj-4.1.10.zip
export OPENDS_HOME=${PWD}/opendj
- unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
- cd `dirname ${0}`
- test_init
- get_test_target ${1}
- test_run
- merge_result_files
- check_successful_run
+ unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
+ cd `dirname ${0}`
+ test_init
+ get_test_target ${1}
+ test_run
+ merge_result_files
+ check_successful_run
generate_junit_report ${1}
change_junit_report_class_names
}
list_test_ids(){
- echo security_all
+ echo security_all
}
OPT=${1}
@@ -93,9 +93,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/security/sameEjbName/build.properties b/appserver/tests/appserv-tests/devtests/security/sameEjbName/build.properties
index 9ccfc32..27ab2ff 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/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="security-sameEjbName"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/build.xml b/appserver/tests/appserv-tests/devtests/security/sameEjbName/build.xml
index da64673..3165e1f 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/build.xml
@@ -65,7 +65,7 @@
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}"/>
@@ -82,23 +82,23 @@
<antcall target="package-appclientjar-common">
<param name="appclientjar.files" value="${build.classes.dir}"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/client/*.class,com/sun/**/ejb/Hello.class,com/sun/**/ejb2/Hello.class"/>
</antcall>
- <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"/>
<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/sun-application.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ </jar>
</target>
<target name="deploy" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
index a0c2e43..2dc2540 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
@@ -33,29 +33,29 @@
try {
description = testSuite + " ejb1: rolesAllowed1";
hello1.rolesAllowed1("Sun");
- stat.addStatus(description, stat.PASS);
+ stat.addStatus(description, stat.PASS);
try {
description = testSuite + " ejb1: rolesAllowed2";
hello1.rolesAllowed2("Sun");
- stat.addStatus(description, stat.FAIL);
+ stat.addStatus(description, stat.FAIL);
} catch(Exception e) {
System.out.println("Expected failure: " + e);
- stat.addStatus(description, stat.PASS);
+ stat.addStatus(description, stat.PASS);
}
try {
description = testSuite + " ejb2: rolesAllowed1";
hello2.rolesAllowed1("Java");
- stat.addStatus(description, stat.FAIL);
+ stat.addStatus(description, stat.FAIL);
} catch(Exception e) {
System.out.println("Expected failure: " + e);
- stat.addStatus(description, stat.PASS);
+ stat.addStatus(description, stat.PASS);
}
description = testSuite + " ejb2: rolesAllowed2";
hello2.rolesAllowed2("Java");
- stat.addStatus(description, stat.PASS);
+ stat.addStatus(description, stat.PASS);
} catch(Exception ex) {
ex.printStackTrace();
stat.addStatus(description, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/Hello.java
index 1ebae36..b3c9b68 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/Hello.java
@@ -18,6 +18,6 @@
public interface Hello {
public String rolesAllowed1(String who);
-
+
public String rolesAllowed2(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
index a47e4fc..3d0347f 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
@@ -27,7 +27,7 @@
public String rolesAllowed1(String who) {
return "Hello rolesAllowed1, " + who;
}
-
+
@RolesAllowed(value={"ejbuser"})
public String rolesAllowed2(String who) {
return "Hello rolesAllowed2, " + who;
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/Hello.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/Hello.java
index 20284fe..34c80fa 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/Hello.java
@@ -18,6 +18,6 @@
public interface Hello {
public String rolesAllowed1(String who);
-
+
public String rolesAllowed2(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
index 5a5c42e..294935f 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
@@ -27,7 +27,7 @@
public String rolesAllowed1(String who) {
return "Hello2 rolesAllowed1, " + who;
}
-
+
@RolesAllowed(value={"javaee"})
public String rolesAllowed2(String who) {
return "Hello2 rolesAllowed2, " + who;
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/build.properties b/appserver/tests/appserv-tests/devtests/security/sful/build.properties
index d8d1034..c8f9581 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/sful/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="security"/>
<property name="app.type" value="application"/>
@@ -26,4 +26,4 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appname" value="statefulLoginBean"/>
+<property name="appname" value="statefulLoginBean"/> \u0020
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/build.xml b/appserver/tests/appserv-tests/devtests/security/sful/build.xml
index 299db65..a7dd9b0 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/sful/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&testProperties;
&commonSecurity;
-
+
<target name="all" depends="build, create-user, deploy, run, undeploy, delete-user"/>
<target name="clean" depends="init-common">
@@ -51,7 +51,7 @@
</target>
<target name="build" depends="compile">
-<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
+<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
-->
<antcall target="build-ear-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java b/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
index 8ab18d4..905e9fc 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
@@ -38,31 +38,31 @@
ShoppingCartClient client = new ShoppingCartClient(args);
client.doTest();
}
-
+
public ShoppingCartClient(String[] args) {
//super(args);
}
-
+
public String doTest() {
-
- ShoppingCartRemote hr=null;
+
+ ShoppingCartRemote hr=null;
String res=null;
Context ic = null;
LoginContext lc=null;
ShoppingCartHome home=null;
String testId = "Sec::Stateful Login Bean";
- try {
+ try {
stat.addDescription("Security::Statefule Login Bean");
- ic = new InitialContext();
- // create EJB using factory from container
+ ic = new InitialContext();
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("statefulLoginBean");
-
- System.err.println("Looked up home!!");
-
- home = (ShoppingCartHome)PortableRemoteObject.narrow(
- objref, ShoppingCartHome.class);
- System.err.println("Narrowed home!!");
-
+
+ System.err.println("Looked up home!!");
+
+ home = (ShoppingCartHome)PortableRemoteObject.narrow(
+ objref, ShoppingCartHome.class);
+ System.err.println("Narrowed home!!");
+
hr = home.create("LizHurley");
System.out.println("Got the EJB!!");
@@ -102,15 +102,15 @@
stat.addStatus(testId, stat.FAIL);
System.out.println("Shopping Cart:StatefulLoginBean Test Failed");
System.exit(-1);
- } finally {
+ } finally {
stat.printSummary();
}
System.out.println("ShoppingCart:StatefulLoginBean Test Passed");
return res;
-
+
}
-
+
public final static String helloStr = "Hello ShoppingCart!!!";
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
index 215d324..c7b9b97 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
@@ -35,26 +35,26 @@
*/
public class ShoppingCartBean implements SessionBean {
-
+
private String shopper = "anonymous";
private String principal = "harpreet";
private int totalPrice = 0;
-
+
private int totalItems = 0;
-
+
private Vector items;
-
+
private Vector itemPrice;
private SessionContext sc = null;
-
+
/** Creates a new instance of ShoppingEJB */
public void ejbCreate(String shopperName) {
shopper = shopperName;
items = new Vector();
itemPrice = new Vector();
}
-
+
public void addItem(java.lang.String item, int price) throws EJBException,
RemoteException{
items.add(item);
@@ -64,30 +64,30 @@
System.out.println(" Shopping Cart: Shopper "+ shopper +" has bought "
+ item +" for price ="+ price +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
-
+
System.out.println("Caller Principal = "+sc.getCallerPrincipal());
}
-
- public void deleteItem(java.lang.String item) throws EJBException,
+
+ public void deleteItem(java.lang.String item) throws EJBException,
RemoteException{
int index = items.indexOf(item);
items.remove(item);
Integer price = (Integer) itemPrice.get(index);
- System.out.println("Shopping Cart: Removing item "+ item +" @price "+
+ System.out.println("Shopping Cart: Removing item "+ item +" @price "+
price.intValue());
totalPrice -= price.shortValue();
- itemPrice.remove(index);
+ itemPrice.remove(index);
System.out.println(" Shopping Cart: Shopper "+ shopper +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
System.out.println("Caller Principal = "+sc.getCallerPrincipal());
}
-
+
public double getTotalCost() throws EJBException{
System.out.println("Caller Princial = "+sc.getCallerPrincipal());
return totalPrice;
}
-
+
public String[] getItems() throws EJBException{
System.out.println("Caller Principal = "+sc.getCallerPrincipal());
@@ -100,27 +100,27 @@
return itemNames;
}
- public void saveAsQuote() {
+ public void saveAsQuote() {
System.out.println("Caller Principal = "+sc.getCallerPrincipal());
}
-
+
public void ejbActivate() {
System.out.println("In ShoppingCart ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In ShoppingCart ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In ShoppingCart ejbRemove");
}
-
-
+
+
public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
index 9d44c82..afbe49e 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
@@ -28,8 +28,8 @@
* @author hsingh
*/
public interface ShoppingCartHome extends EJBHome{
-
- public ShoppingCartRemote create(java.lang.String shopperName)
+
+ public ShoppingCartRemote create(java.lang.String shopperName)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
index bb324d1..d7d5e37 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
@@ -23,18 +23,18 @@
package shopping;
import jakarta.ejb.EJBObject;
/**
- * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
+ * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
* @author hsingh
*/
public interface ShoppingCartRemote extends EJBObject {
-
+
public void addItem(java.lang.String item, int price) throws java.rmi.RemoteException;
-
+
public void deleteItem(java.lang.String item) throws java.rmi.RemoteException;
-
+
public double getTotalCost() throws java.rmi.RemoteException;
-
+
public java.lang.String[] getItems() throws java.rmi.RemoteException;
public void saveAsQuote() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/build.properties b/appserver/tests/appserv-tests/devtests/security/simple-perf/build.properties
index afbee49..f535a99 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/build.properties
@@ -15,28 +15,28 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="sec-ssl"/>
-<property name="appname" value="${module}-converter"/>
+<property name="appname" value="${module}-converter"/> \u0020
-<property name="assemble"
- value="${build.classes.dir}/archive"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
+<property name="assemble"\u0020
+ value="${build.classes.dir}/archive"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
+<property name="appclient.jar"\u0020
+ value="${assemble.dir}/${appname}-client.jar"/> \u0020
-<property name="test.client"
- value="com.sun.s1peqe.security.ssl.converter.client.ConverterClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.security.ssl.converter.client.ConverterClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
<property name="app.type" value="application"/>
@@ -45,8 +45,8 @@
<!-- ============================================================ -->
<!--
<property name="jndi.name" value="SSLconverter"/>
-<property name="provider.url" value="iiop://localhost:${orb.port}"/>
-<property name="ctxfactory" value="com.sun.enterprise.naming.SerialInitContextFactory"/>
-<property name="ctxfactory" value="com.sun.jndi.cosnaming.CNCtxFactory"/>
+<property name="provider.url" value="iiop://localhost:${orb.port}"/>\u0020
+<property name="ctxfactory" value="com.sun.enterprise.naming.SerialInitContextFactory"/>\u0020
+<property name="ctxfactory" value="com.sun.jndi.cosnaming.CNCtxFactory"/>\u0020
-->
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/build.xml b/appserver/tests/appserv-tests/devtests/security/simple-perf/build.xml
index e36aaff..6711051 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,15 +49,15 @@
<target name="build" depends="compile">
<antcall target="build-ear-common"/>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <antcall target="runclient-local"/>
- <antcall target="run-standalone-client"/>
+ <antcall target="runclient-local"/>
+ <antcall target="run-standalone-client"/>
</target>
<target name="runclient-local" depends="init-common">
@@ -65,8 +65,8 @@
<env key="VMARGS" value=" -Djavax.net.ssl.keyStore=${admin.domain.dir}/${admin.domain}/config/keystore.jks -Djavax.net.ssl.trustStore=${admin.domain.dir}/${admin.domain}/config/cacerts.jks" />
<arg value="-client" />
<arg value="${assemble.dir}/${appname}AppClient.jar"/>
- <!-- dummy user added as appclient throwing login window -->
- <arg value="-textauth"/>
+ <!-- dummy user added as appclient throwing login window -->
+ <arg value="-textauth"/>
<arg value="-user"/>
<arg value="temp"/>
<arg value="-password"/>
@@ -75,7 +75,7 @@
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<!-- =============================================== -->
<!-- Target to run the standalone client without ACC -->
@@ -93,7 +93,7 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<jvmarg value="-Djavax.net.ssl.keyStore=${admin.domain.dir}/${admin.domain}/config/keystore.jks"/>
<jvmarg value="-Djavax.net.ssl.trustStore=${admin.domain.dir}/${admin.domain}/config/cacerts.jks"/>
- <jvmarg value="-Dcom.sun.CORBA.connection.ORBSocketFactoryClass=com.sun.enterprise.iiop.IIOPSSLSocketFactory"/>
+ <jvmarg value="-Dcom.sun.CORBA.connection.ORBSocketFactoryClass=com.sun.enterprise.iiop.IIOPSSLSocketFactory"/>
<arg value="${provider.url}"/>
<arg value="${ctxfactory}"/>
<arg value="${jndi.name}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/client/ConverterClient.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/client/ConverterClient.java
index 20864e9..e7d4cc0 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/client/ConverterClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/client/ConverterClient.java
@@ -27,7 +27,7 @@
/**
* A simple java client. This uses the services provided by the <code>ConverterBean</code> and
- * converts 100 US dollars to Yen and 100 Yen to Euro.
+ * converts 100 US dollars to Yen and 100 Yen to Euro.
* <p>In this regard, it does the following in order
* <ul>
* <li>Locates the home interface of the enterprise bean
@@ -37,21 +37,21 @@
* <br>
* <b>Locating the home interface:</b>
* <blockquote><pre>
- * Context initial = new InitialContext();
- * Context myEnv = (Context)initial.lookup("java:comp/env");
- * Object objref = myEnv.lookup("ejb/SimpleConverter");
+ * Context initial = new InitialContext();
+ * Context myEnv = (Context)initial.lookup("java:comp/env");
+ * Object objref = myEnv.lookup("ejb/SimpleConverter");
* ConverterHome home = (ConverterHome)PortableRemoteObject.narrow(objref, ConverterHome.class);
* </pre></blockquote>
* <br>
* <b>Creating the remote interface:</b>
* <blockquote><pre>
- * Converter currencyConverter = home.create();
+ * Converter currencyConverter = home.create();
* </pre></blockquote>
* <br>
* <b>Invoking business methods:</b>
* <blockquote><pre>
* BigDecimal param = new BigDecimal ("100.00");
- * amount = currencyConverter.dollarToYen(param);
+ * amount = currencyConverter.dollarToYen(param);
* amount = currencyConverter.yenToEuro(param);
* </pre></blockquote>
* <br>
@@ -66,7 +66,7 @@
public class ConverterClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
ConverterClient() {
@@ -80,35 +80,35 @@
*
*/
public static void main(String[] args) {
- ConverterClient client = new ConverterClient();
- client.run(args);
+ ConverterClient client = new ConverterClient();
+ client.run(args);
}
private void run(String[] args) {
String url = null;
- String testId = null;
+ String testId = null;
String jndiName = null;
Context context = null;
String ctxFactory = null;
- java.lang.Object obj = null;
+ java.lang.Object obj = null;
try {
stat.addDescription("Security::SSL One way ssl.");
if (args.length == 3) {
url = args[0];
ctxFactory = args[1];
- jndiName = args[2];
+ jndiName = args[2];
}
if ( (url == null) || (ctxFactory == null) ) {
- testId = "Sec::Simple Perf Converter Sample AppClient";
+ testId = "Sec::Simple Perf Converter Sample AppClient";
// Initialize the Context with default properties
context = new InitialContext();
System.out.println("Simple Perf Test \n Default Context Initialized...");
// Create Home object
obj = context.lookup("java:comp/env/ejb/SSLSimpleConverter");
} else {
- testId = "Sec::Perf Standalone-Client";
+ testId = "Sec::Perf Standalone-Client";
Properties env = new Properties();
env.put("java.naming.provider.url", url);
env.put("java.naming.factory.initial", ctxFactory);
@@ -126,20 +126,20 @@
ConverterRemoteHome.class);
ConverterRemote currencyConverter = home.create();
-
+
System.out.println("\n\n\n===========Beginning Simple Test=====\n\n");
-
+
BigDecimal param = new BigDecimal ("100.00");
- int times = 1;
+ int times = 1;
try{
- times = Integer.parseInt(mytimes);
+ times = Integer.parseInt(mytimes);
} catch(java.lang.NumberFormatException ne){
System.out.println("Times in descriptor declared incorrectly");
}
- BigDecimal amount = new BigDecimal(1);
+ BigDecimal amount = new BigDecimal(1);
BigDecimal amount2 = new BigDecimal(1);
long starttime = System.currentTimeMillis();
-
+
for(int i = 0; i<times; i++){
amount = currencyConverter.dollarToYen(param);
amount2 = currencyConverter.yenToEuro(param);
@@ -155,7 +155,7 @@
System.err.println("Caught an unexpected exception!");
ex.printStackTrace();
} finally {
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application-client.xml
index c07685e..ee3efa5 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application-client.xml
@@ -24,7 +24,7 @@
<env-entry-name>times</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>5000</env-entry-value>
- </env-entry>
+ </env-entry>
<ejb-ref>
<ejb-ref-name>ejb/SSLSimpleConverter</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application.xml
index 26b2189..6614993 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/descriptor/application.xml
@@ -23,7 +23,7 @@
<small-icon></small-icon>
<large-icon></large-icon>
</icon>
- <display-name>SSLConverterApp</display-name>
+ <display-name>SSLConverterApp</display-name>
<module>
<java>sec-ssl-converter-client.jar</java>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
index 02783e4..27e5297 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
@@ -33,7 +33,7 @@
BigDecimal yenRate = new BigDecimal("121.6000");
BigDecimal euroRate = new BigDecimal("0.0077");
SessionContext mysc = null;
-
+
public String myCallerPrincipal(){
return mysc.getCallerPrincipal().toString();
}
@@ -41,7 +41,7 @@
* Returns the yen value for a given dollar amount.
* @param dollars dollar amount to be converted to yen.
*/
- public BigDecimal dollarToYen(BigDecimal dollars) {
+ public BigDecimal dollarToYen(BigDecimal dollars) {
BigDecimal result = dollars.multiply(yenRate);
return result.setScale(2,BigDecimal.ROUND_UP);
}
@@ -75,7 +75,7 @@
* Loads the state of the bean from secondary storage. Required by EJB spec.
*/
public void ejbActivate() {}
-
+
/**
* Keeps the state of the bean to secondary storage. Required by EJB spec.
*/
diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
index 30be995..a86fcd6 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
@@ -44,7 +44,7 @@
* @param yen yen amount to be converted to euro.
*/
public BigDecimal yenToEuro(BigDecimal yen) throws RemoteException;
-
+
public String myCallerPrincipal() throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.properties b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.properties
index 961d93a..6101087 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/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="security-multimapping"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.xml b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.xml
index 60eb22b..3595e5c 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/build.xml
@@ -25,18 +25,18 @@
]>
<project name="security-multimapping" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
&commonSecurity;
-
+
<target name="all" depends="clean, setup, build, deploy, run, undeploy, unsetup"/>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="create-user-common">
<param name="user" value="webuser"/>
@@ -50,7 +50,7 @@
</antcall>
<!-- <antcall target="reconfig-common"/>-->
</target>
-
+
<target name="unsetup" depends="init-common">
<antcall target="delete-user-common">
<param name="user" value="webuser"/>
@@ -59,7 +59,7 @@
<param name="user" value="bobby"/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -81,11 +81,11 @@
</antcall>
-->
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
-
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/nonweb"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
@@ -97,20 +97,20 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
<param name="sun-web.xml" value="descriptor/sun-web.xml"/>
</antcall>
-
+
<!--
<antcall target="package-appclientjar-common">
<param name="appclientjar.files" value="${build.classes.dir}/nonweb"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/client/*.class,com/sun/**/ejb/Hello.class"/>
</antcall>
-->
-
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
@@ -120,9 +120,9 @@
<include name="META-INF/sun-application.xml"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib" includes="reporter.jar"/>
- </jar>
-
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ </jar>
+
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
<jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
@@ -131,13 +131,13 @@
<fileset dir="${build.classes.dir}">
<include name="META-INF/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<!--
<exec executable="${APPCLIENT}">
@@ -168,7 +168,7 @@
<param name="testcaseid" value="user-auth-ejbrole"/>
</antcall>
</target>
-
+
<target name="runweb" depends="init-common">
<taskdef name="webtest" classname="${webtest.classname}"
classpath="${webtest.classpath}" />
@@ -198,11 +198,11 @@
testCaseDescription="Testing role mapping"
testStrategy="Testing role mapping"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-ejb-jar.xml
index 40e3dec..3155593 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-ejb-jar.xml
@@ -24,7 +24,7 @@
<ejb-name>MessageBean</ejb-name>
</ejb>
</enterprise-beans>
-
+
<security-role-mapping>
<role-name>ejbrole</role-name>
<principal-name>bobby</principal-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-web.xml
index 83ac31b..563eaf2 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/descriptor/sun-web.xml
@@ -29,10 +29,10 @@
<description>Maintain a one-to-one correspondence between static content and the generated servlet class' java code</description>
</property>
</jsp-config>
-
+
<security-role-mapping>
<role-name>webrole</role-name>
<group-name>webusers</group-name>
</security-role-mapping>
-
+
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
index 2cb9766..7b33d6a 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
@@ -23,10 +23,10 @@
@Stateless
@Local({MessageLocal.class})
public class MessageBean implements MessageLocal {
-
+
@RolesAllowed("ejbrole")
public String getMessage() {
return "Hello from ejb";
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
index b8546a1..e78073d 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
@@ -24,5 +24,5 @@
@Local
public interface MessageLocal {
String getMessage();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
index f3b2065..dac3487 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
@@ -28,7 +28,7 @@
@EJB
private MessageLocal messageBean;
-
+
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
@@ -44,5 +44,5 @@
out.println("</html>");
out.close();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/WebTest.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/WebTest.java
index 9ec3965..f8ffd63 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/WebTest.java
@@ -23,7 +23,7 @@
import jakarta.servlet.http.*;
public class WebTest extends HttpServlet {
-
+
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
@@ -39,5 +39,5 @@
out.println("</html>");
out.close();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.properties b/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.properties
index a1835d4..f0f891a 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/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="security"/>
<property name="app.type" value="application"/>
@@ -26,4 +26,4 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appname" value="rpaLoginBean"/>
+<property name="appname" value="rpaLoginBean"/> \u0020
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.xml b/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.xml
index 71f07b4..69391ff 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/build.xml
@@ -31,7 +31,7 @@
&commonBuild;
&commonRun;
&testProperties;
-
+
<target name="all" depends="build, setup, deploy, run, undeploy, unsetup"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
@@ -48,7 +48,7 @@
</target>
<target name="build" depends="compile">
-<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
+<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
-->
<antcall target="build-ear-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
index 42bc50d..73e807e 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
@@ -38,31 +38,31 @@
RpaClient client = new RpaClient(args);
client.doTest();
}
-
+
public RpaClient(String[] args) {
//super(args);
}
-
+
public String doTest() {
-
- RpaRemote hr=null;
+
+ RpaRemote hr=null;
String res=null;
Context ic = null;
LoginContext lc=null;
RpaHome home=null;
String testId = "Sec::Solaris Realm";
- try{
+ try{
stat.addDescription("Security::Solaris Realm");
- ic = new InitialContext();
- // create EJB using factory from container
+ ic = new InitialContext();
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("rpaLoginBean");
-
- System.err.println("Looked up home!!");
-
- home = (RpaHome)PortableRemoteObject.narrow(
- objref, RpaHome.class);
- System.err.println("Narrowed home!!");
-
+
+ System.err.println("Looked up home!!");
+
+ home = (RpaHome)PortableRemoteObject.narrow(
+ objref, RpaHome.class);
+ System.err.println("Narrowed home!!");
+
hr = home.create("LizHurley");
System.out.println("Got the EJB!!");
@@ -88,11 +88,11 @@
stat.addStatus(testId, stat.FAIL);
System.out.println("SolarisRealm:RpaLoginBean Test Failed");
System.exit(-1);
- } finally {
+ } finally {
stat.printSummary();
}
return res;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
index 405f369..68c1872 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
@@ -36,25 +36,25 @@
*/
public class RpaBean implements SessionBean {
-
+
private String shopper = "anonymous";
private int totalPrice = 0;
-
+
private int totalItems = 0;
-
+
private Vector items;
-
+
private Vector itemPrice;
-
+
private SessionContext sc = null;
-
+
/** Creates a new instance of ShoppingEJB */
public void ejbCreate(String shopperName) {
shopper = shopperName;
items = new Vector();
itemPrice = new Vector();
}
-
+
public void addItem(java.lang.String item, int price) throws EJBException,
RemoteException{
items.add(item);
@@ -64,30 +64,30 @@
System.out.println(" Shopping Cart: Shopper "+ shopper +" has bought "
+ item +" for price ="+ price +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
-
+
System.out.println("Caller Princial = "+sc.getCallerPrincipal());
}
-
- public void deleteItem(java.lang.String item) throws EJBException,
+
+ public void deleteItem(java.lang.String item) throws EJBException,
RemoteException{
int index = items.indexOf(item);
items.remove(item);
Integer price = (Integer) itemPrice.get(index);
- System.out.println("Shopping Cart: Removing item "+ item +" @price "+
+ System.out.println("Shopping Cart: Removing item "+ item +" @price "+
price.intValue());
totalPrice -= price.shortValue();
- itemPrice.remove(index);
+ itemPrice.remove(index);
System.out.println(" Shopping Cart: Shopper "+ shopper +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
System.out.println("Caller Princial = "+sc.getCallerPrincipal());
}
-
+
public double getTotalCost() throws EJBException{
System.out.println("Caller Princial = "+sc.getCallerPrincipal());
return totalPrice;
}
-
+
public String[] getItems() throws EJBException{
System.out.println("Caller Princial = "+sc.getCallerPrincipal());
@@ -99,24 +99,24 @@
}
return itemNames;
}
-
+
public void ejbActivate() {
System.out.println("In Rpa ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In Rpa ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In Rpa ejbRemove");
}
-
-
+
+
public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
index d4262d0..c993090 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
@@ -28,8 +28,8 @@
* @author Harpreet Singh
*/
public interface RpaHome extends EJBHome{
-
- public RpaRemote create(java.lang.String shopperName)
+
+ public RpaRemote create(java.lang.String shopperName)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
index fb8a773..43a3991 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
@@ -23,17 +23,17 @@
package shopping;
import jakarta.ejb.EJBObject;
/**
- * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
+ * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
* @author hsingh
*/
public interface RpaRemote extends EJBObject {
-
+
public void addItem(java.lang.String item, int price) throws java.rmi.RemoteException;
-
+
public void deleteItem(java.lang.String item) throws java.rmi.RemoteException;
-
+
public double getTotalCost() throws java.rmi.RemoteException;
-
+
public java.lang.String[] getItems() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml
index e8a72ce..4c846ce 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-bundled-ham-basic-login-config-form</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-bundled-ham-basic-login-config-form</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-bundled-ham-basic-login-config-form</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index ae6acec..b23a8e3 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -32,20 +32,20 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@Override
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
- // Get the (caller) name and password from the request
+ // Get the (caller) name and password from the request
// NOTE: This is for the smallest possible example only. In practice
// putting the password in a request query parameter is highly
// insecure
String name = request.getParameter("name");
String password = request.getParameter("password");
-
+
if (name != null && password != null) {
// Delegate the {credentials in -> identity data out} function to
@@ -55,8 +55,8 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
response.addHeader("Authentication Mechanism", "TestAuthenticationMechanism");
return httpMessageContext.notifyContainerAboutLogin(
@@ -64,9 +64,9 @@
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml
index 2dee08d..2889bfa 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/web.xml
@@ -39,7 +39,7 @@
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<login-config>
<auth-method>FORM</auth-method>
<realm-name>file</realm-name>
@@ -47,6 +47,6 @@
<form-login-page>/loginform.jsp</form-login-page>
<form-error-page>/loginerror.jsp</form-error-page>
</form-login-config>
- </login-config>
+ </login-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml
index 530e789..56c7869 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-caller-principal</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-caller-principal</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-caller-principal</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java
index ba3a9f3..fdc7739 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java
@@ -42,7 +42,7 @@
public class CallerSubjectServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index f677d3a..c03b8cf 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -35,20 +35,20 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@Override
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
- // Get the (caller) name and password from the request
+ // Get the (caller) name and password from the request
// NOTE: This is for the smallest possible example only. In practice
// putting the password in a request query parameter is highly
// insecure
String name = request.getParameter("name");
String password = request.getParameter("password");
-
+
if (name != null && password != null) {
// Delegate the {credentials in -> identity data out} function to
@@ -64,9 +64,9 @@
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml
index 09fffb4..6ca3544 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml
@@ -18,27 +18,27 @@
-->
<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1"
>
- <!-- Security constraints and roles. -->
+ <!-- Security constraints and roles. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>User pages</web-resource-name>
+ <url-pattern>/protectedServlet</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>foo</role-name>
+ </auth-constraint>
+ </security-constraint>
- <security-role>
- <role-name>foo</role-name>
- </security-role>
+ <security-role>
+ <role-name>foo</role-name>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java
index 2ff7f05..a272733 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/test/java/org/glassfish/soteria/test/AppCallerPrincipalIT.java
@@ -45,7 +45,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml
index aa7633f..800d2c9 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml
@@ -17,20 +17,20 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-custom-identity-store-handler</artifactId>
- <packaging>war</packaging>
+ <artifactId>app-custom-identity-store-handler</artifactId>
+ <packaging>war</packaging>
- <build>
+ <build>
<finalName>app-custom-identity-store-handler</finalName>
- </build>
+ </build>
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
index 4868ae2..2e5e64a 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
@@ -31,14 +31,14 @@
* Starts up the embedded Unboundid LDAP server on port 33389 and loads a test directory
* into it containing the same caller- and roles names as the Database and Embedded idenity
* stores are using.
- *
+ *
* @author Arjan Tijms
*
*/
@Startup
@Singleton
public class LdapSetup {
-
+
private InMemoryDirectoryServer directoryServer;
@PostConstruct
@@ -49,8 +49,8 @@
new InMemoryListenerConfig("myListener", null, 33389, null, null, null));
directoryServer = new InMemoryDirectoryServer(config);
-
- directoryServer.importFromLDIF(true,
+
+ directoryServer.importFromLDIF(true,
new LDIFReader(this.getClass().getResourceAsStream("/test.ldif")));
directoryServer.startListening();
@@ -58,10 +58,10 @@
throw new IllegalStateException(e);
}
}
-
+
@PreDestroy
public void destroy() {
directoryServer.shutDown(true);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 665e70f..89d5726 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -33,7 +33,7 @@
@ApplicationScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -56,17 +56,17 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
- }
-
+ }
+
return httpMessageContext.responseUnauthorized();
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml
index cdaf949..6cefa70 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -24,32 +24,32 @@
<role-name>foo</role-name>
<group-name>foo</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>bar</role-name>
<group-name>bar</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>kaz</role-name>
<group-name>kaz</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>baz</role-name>
<group-name>baz</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>group1</role-name>
<group-name>group1</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>group2</role-name>
<group-name>group2</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>group3</role-name>
<group-name>group3</group-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java
index 9c987dc..4982544 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/test/java/org/glassfish/soteria/test/AppCustomIdentityStoreHandlerIT.java
@@ -52,16 +52,16 @@
@Test
public void testAuthenticated() {
assertAuthenticated(
- "web", "reza",
+ "web", "reza",
readFromServer("/servlet?name=reza&password=secret1"),
- // Only groups from the
+ // Only groups from the
"baz");
}
@Test
public void testBlacklisted() {
assertNotAuthenticated(
- "web", "rudy",
+ "web", "rudy",
readFromServer("/servlet?name=rudy&password=pw"),
"foo", "bar");
}
@@ -75,7 +75,7 @@
@Test
public void testNotAuthenticatedWrongName() {
assertNotAuthenticated(
- "web", "reza",
+ "web", "reza",
readFromServer("/servlet?name=romo&password=secret1"),
"foo", "bar", "baz");
}
@@ -83,7 +83,7 @@
@Test
public void testNotAuthenticatedWrongPassword() {
assertNotAuthenticated(
- "web", "reza",
+ "web", "reza",
readFromServer("/servlet?name=reza&password=wrongpassword"),
"foo", "bar", "baz");
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml
index 6fd41c2..f7ca00a 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-custom-rememberme</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-custom-rememberme</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-custom-rememberme</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java
index 6cfab57..ddbdde0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -28,7 +28,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@DeclareRoles({ "foo", "bar", "kaz" })
@@ -44,7 +44,7 @@
request.logout(); // slightly ill-defined, but only for current request
request.getSession().invalidate();
}
-
+
response.getWriter().write("This is a servlet \n");
String webName = null;
@@ -57,9 +57,9 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String mechanismCalled = (String) request.getAttribute("authentication-mechanism-called");
-
+
response.getWriter().write("\nauthentication mechanism called: " + (mechanismCalled != null? mechanismCalled : false) + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 83f30a4..18ad0b5 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -49,7 +49,7 @@
@Inject
private RememberMeConfigBean rememberMeConfigBean;
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -57,7 +57,7 @@
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
request.setAttribute("authentication-mechanism-called", "true");
-
+
if (request.getParameter("name") != null && request.getParameter("password") != null) {
// Get the (caller) name and password from the request
@@ -74,27 +74,27 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
public Boolean isRememberMe(HttpMessageContext httpMessageContext) {
return httpMessageContext.getRequest().getParameter("rememberme") != null;
}
-
+
// Workaround for possible CDI bug; at least in Weld 2.3.2 default methods don't seem to be intercepted
@Override
public void cleanSubject(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) {
- HttpAuthenticationMechanism.super.cleanSubject(request, response, httpMessageContext);
+ HttpAuthenticationMechanism.super.cleanSubject(request, response, httpMessageContext);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml
index 6937244..11d0ee6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -24,12 +24,12 @@
<role-name>foo</role-name>
<group-name>foo</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>bar</role-name>
<group-name>bar</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>kaz</role-name>
<group-name>kaz</group-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java
index a38747e..b7973e4 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/test/java/org/glassfish/soteria/test/AppCustomRememberMeIT.java
@@ -46,7 +46,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -72,124 +72,124 @@
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza&password=secret1"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=romo&password=secret1"));
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=reza&password=wrongpassword"));
}
-
+
@Test
public void testAuthenticatedRememberMe() {
-
+
// 1. Initially request page when we're not authenticated
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
-
-
+
+
// 2. Authenticate without remember me
-
+
String response = readFromServer("/servlet?name=reza&password=secret1");
-
+
assertDefaultAuthenticated(
response);
-
+
// For the initial authentication, the mechanism should be called
-
+
assertTrue(
- "Authentication mechanism should have been called, but wasn't",
+ "Authentication mechanism should have been called, but wasn't",
response.contains("authentication mechanism called: true"));
-
-
+
+
// 3. Request same page again within same http session, without remember me
// specified should NOT be authenticated
-
+
response = readFromServer("/servlet");
-
+
assertDefaultNotAuthenticated(
response);
-
-
+
+
// 4. Authenticate with remember me
-
+
response = readFromServer("/servlet?name=reza&password=secret1&rememberme=true");
-
+
assertDefaultAuthenticated(
response);
-
+
// For the initial authentication, the mechanism should be called again
-
+
assertTrue(
- "Authentication mechanism should have been called, but wasn't",
+ "Authentication mechanism should have been called, but wasn't",
response.contains("authentication mechanism called: true"));
-
-
+
+
// 5. Request same page again within same http session, with remember me
// specified should be authenticated
-
+
response = readFromServer("/servlet");
-
+
assertDefaultAuthenticated(
response);
-
+
// For the subsequent authentication, the mechanism should not be called again
// (the remember me interceptor takes care of this)
-
+
assertTrue(
- "Authentication mechanism should not have been called, but was",
+ "Authentication mechanism should not have been called, but was",
response.contains("authentication mechanism called: false"));
-
-
+
+
// 6. "Expire" the session by removing all cookies except the
// remember me cookie
-
+
for (Cookie cookie : getWebClient().getCookieManager().getCookies()) {
if (!"GLASSFISHCOOKIE".equals(cookie.getName())) {
getWebClient().getCookieManager().removeCookie(cookie);
}
}
-
+
// Request same page again
-
+
response = readFromServer("/servlet");
-
+
// Should still be authenticated
-
+
assertDefaultAuthenticated(
response);
-
+
// For the subsequent authentication, the mechanism should not be called again
// (the remember me interceptor takes care of this)
-
+
assertTrue(
- "Authentication mechanism should not have been called, but was",
+ "Authentication mechanism should not have been called, but was",
response.contains("authentication mechanism called: false"));
-
+
// 7. Logout. Should not be authenticated anymore
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet?logout=true"));
-
-
+
+
// 8. Request same page again, should still not be authenticated
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml
index ed47cd3..6fe9bce 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-custom-session</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-custom-session</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-custom-session</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java
index 6cfab57..ddbdde0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -28,7 +28,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@DeclareRoles({ "foo", "bar", "kaz" })
@@ -44,7 +44,7 @@
request.logout(); // slightly ill-defined, but only for current request
request.getSession().invalidate();
}
-
+
response.getWriter().write("This is a servlet \n");
String webName = null;
@@ -57,9 +57,9 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String mechanismCalled = (String) request.getAttribute("authentication-mechanism-called");
-
+
response.getWriter().write("\nauthentication mechanism called: " + (mechanismCalled != null? mechanismCalled : false) + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 8df1021..227ae4a 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -36,7 +36,7 @@
@RequestScoped
@AutoApplySession
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -44,7 +44,7 @@
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
request.setAttribute("authentication-mechanism-called", "true");
-
+
if (request.getParameter("name") != null && request.getParameter("password") != null) {
// Get the (caller) name and password from the request
@@ -61,17 +61,17 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml
index 6937244..11d0ee6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -24,12 +24,12 @@
<role-name>foo</role-name>
<group-name>foo</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>bar</role-name>
<group-name>bar</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>kaz</role-name>
<group-name>kaz</group-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java
index 568de30..67c26bc 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/test/java/org/glassfish/soteria/test/AppCustomSessionIT.java
@@ -47,7 +47,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -58,75 +58,75 @@
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza&password=secret1"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=romo&password=secret1"));
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=reza&password=wrongpassword"));
}
-
+
@Test
public void testAuthenticatedSession() {
-
+
// 1. Initially request page when we're not authenticated
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
-
-
+
+
// 2. Authenticate
-
+
String response = readFromServer("/servlet?name=reza&password=secret1");
-
+
assertDefaultAuthenticated(
response);
-
+
// For the initial authentication, the mechanism should be called
-
+
assertTrue(
- "Authentication mechanism should have been called, but wasn't",
+ "Authentication mechanism should have been called, but wasn't",
response.contains("authentication mechanism called: true"));
-
-
+
+
// 3. Request same page again within same http session, should still
// be authenticated
-
+
response = readFromServer("/servlet");
-
+
assertDefaultAuthenticated(
response);
-
+
// For the subsequent authentication, the mechanism should NOT be called
// (the session interceptor takes care of authentication now)
-
+
assertTrue(
- "Authentication mechanism should have been called, but wasn't",
+ "Authentication mechanism should have been called, but wasn't",
response.contains("authentication mechanism called: false"));
-
-
+
+
// 4. Logout. Should not be authenticated anymore
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet?logout=true"));
-
-
+
+
// 5. Request same page again, should still not be authenticated
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml
index 69c9c9e..e2d49c8 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-custom</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-custom</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-custom</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
index 982b8e9..106324b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
@@ -31,7 +31,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@WebServlet("/protectedServlet")
@@ -39,7 +39,7 @@
public class ProtectedServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
@@ -58,21 +58,21 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String contextName = null;
if (securityContext.getCallerPrincipal() != null) {
contextName = securityContext.getCallerPrincipal().getName();
}
-
+
response.getWriter().write("context username: " + contextName + "\n");
-
+
response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n");
response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n");
response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n");
-
+
response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/servlets"));
-
-
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java
index a28190d..51a17e9 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -32,7 +32,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@DeclareRoles({ "foo", "bar", "kaz" })
@@ -40,7 +40,7 @@
public class Servlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
@@ -59,20 +59,20 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String contextName = null;
if (securityContext.getCallerPrincipal() != null) {
contextName = securityContext.getCallerPrincipal().getName();
}
-
+
response.getWriter().write("context username: " + contextName + "\n");
-
+
response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n");
response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n");
response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n");
-
+
response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n");
-
+
response.getWriter().write("All declared roles of user " + ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles() + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index f5a8df4..92f0f31 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -33,20 +33,20 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@Override
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
- // Get the (caller) name and password from the request
+ // Get the (caller) name and password from the request
// NOTE: This is for the smallest possible example only. In practice
// putting the password in a request query parameter is highly
// insecure
String name = request.getParameter("name");
String password = request.getParameter("password");
-
+
if (name != null && password != null) {
// Delegate the {credentials in -> identity data out} function to
@@ -56,17 +56,17 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml
index 09fffb4..6ca3544 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml
@@ -18,27 +18,27 @@
-->
<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1"
>
- <!-- Security constraints and roles. -->
+ <!-- Security constraints and roles. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>User pages</web-resource-name>
+ <url-pattern>/protectedServlet</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>foo</role-name>
+ </auth-constraint>
+ </security-constraint>
- <security-role>
- <role-name>foo</role-name>
- </security-role>
+ <security-role>
+ <role-name>foo</role-name>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java
index f48f1b8..2a89b80 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/test/java/org/glassfish/soteria/test/AppCustomIT.java
@@ -45,7 +45,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -56,19 +56,19 @@
assertDefaultAuthenticated(
responseFromServer("/servlet?name=reza&password=secret1"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticatedUnprotected(
responseFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
assertDefaultNotAuthenticated(
responseFromServer("/servlet?name=romo&password=secret1"));
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
assertDefaultNotAuthenticated(
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml
index 1aa401b..fcf12cc 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-db</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-db</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-db</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
@@ -44,5 +44,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
index fd49e29..0083211 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
@@ -21,24 +21,24 @@
import javax.security.enterprise.identitystore.DatabaseIdentityStoreDefinition;
@DatabaseIdentityStoreDefinition(
- dataSourceLookup="${'jdbc/__default'}",
+ dataSourceLookup="${'jdbc/__default'}",
callerQuery="#{'select password from caller where name = ?'}",
groupsQuery="select group_name from caller_groups where caller_name = ?",
hashAlgorithm = PlaintextPasswordHash.class,
hashAlgorithmParameters = {
- "foo=bar",
- "kax=zak",
+ "foo=bar",
+ "kax=zak",
"foox=${'iop'}",
"${applicationConfig.dyna}"
-
+
} // just for test / example
)
@ApplicationScoped
@Named
public class ApplicationConfig {
-
+
public String[] getDyna() {
return new String[] {"dyn=1","dyna=2","dynam=3"};
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
index d5b7153..2810269 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
@@ -31,41 +31,41 @@
@Singleton
@Startup
public class DatabaseSetup {
-
- @Resource(lookup="java:comp/DefaultDataSource")
+
+ @Resource(lookup="java:comp/DefaultDataSource")
private DataSource dataSource;
@PostConstruct
public void init() {
-
+
executeUpdate(dataSource, "CREATE TABLE caller(name VARCHAR(64) PRIMARY KEY, password VARCHAR(64))");
executeUpdate(dataSource, "CREATE TABLE caller_groups(caller_name VARCHAR(64), group_name VARCHAR(64))");
-
+
executeUpdate(dataSource, "INSERT INTO caller VALUES('reza', 'secret1')");
executeUpdate(dataSource, "INSERT INTO caller VALUES('alex', 'secret2')");
executeUpdate(dataSource, "INSERT INTO caller VALUES('arjan', 'secret2')");
executeUpdate(dataSource, "INSERT INTO caller VALUES('werner', 'secret2')");
-
+
executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('reza', 'foo')");
executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('reza', 'bar')");
-
+
executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('alex', 'foo')");
executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('alex', 'bar')");
-
+
executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('arjan', 'foo')");
executeUpdate(dataSource, "INSERT INTO caller_groups VALUES('werner', 'foo')");
}
-
+
@PreDestroy
public void destroy() {
- try {
- executeUpdate(dataSource, "DROP TABLE caller");
- executeUpdate(dataSource, "DROP TABLE caller_groups");
- } catch (Exception e) {
- // silently ignore, concerns in-memory database
- }
+ try {
+ executeUpdate(dataSource, "DROP TABLE caller");
+ executeUpdate(dataSource, "DROP TABLE caller_groups");
+ } catch (Exception e) {
+ // silently ignore, concerns in-memory database
+ }
}
-
+
private void executeUpdate(DataSource dataSource, String query) {
try (Connection connection = dataSource.getConnection()) {
try (PreparedStatement statement = connection.prepareStatement(query)) {
@@ -75,5 +75,5 @@
throw new IllegalStateException(e);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java
index f5abde0..e23a1f8 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -28,7 +28,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@DeclareRoles({ "foo", "bar", "kaz" })
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index b7cb67e..45b2208 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -34,7 +34,7 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -57,17 +57,17 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml
index 6937244..11d0ee6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -24,12 +24,12 @@
<role-name>foo</role-name>
<group-name>foo</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>bar</role-name>
<group-name>bar</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>kaz</role-name>
<group-name>kaz</group-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java
index 6f0b657..9bf6a22 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/test/java/org/glassfish/soteria/test/AppDBIT.java
@@ -48,7 +48,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
@@ -60,19 +60,19 @@
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza&password=secret1"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=romo&password=secret1"));
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
assertDefaultNotAuthenticated(
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml
index d18ea83..37c70c1 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml
@@ -17,25 +17,25 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-double-ham</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-double-ham</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-double-ham</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
@@ -44,5 +44,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
index 7993f72..a4bdcdd 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
@@ -33,7 +33,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@@ -45,7 +45,7 @@
public class ProtectedServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
@@ -64,21 +64,21 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String contextName = null;
if (securityContext.getCallerPrincipal() != null) {
contextName = securityContext.getCallerPrincipal().getName();
}
-
+
response.getWriter().write("context username: " + contextName + "\n");
-
+
response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n");
response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n");
response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n");
-
+
response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/servlets"));
-
-
+
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java
index 1dab9f3..d36ea39 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -32,7 +32,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@BasicAuthenticationMechanismDefinition(
@@ -43,7 +43,7 @@
public class Servlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
@@ -62,20 +62,20 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String contextName = null;
if (securityContext.getCallerPrincipal() != null) {
contextName = securityContext.getCallerPrincipal().getName();
}
-
+
response.getWriter().write("context username: " + contextName + "\n");
-
+
response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n");
response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n");
response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n");
-
+
response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n");
-
+
response.getWriter().write("All declared roles of user " + ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles() + "\n");
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index defda82..a1220a8 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -32,20 +32,20 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@Override
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
- // Get the (caller) name and password from the request
+ // Get the (caller) name and password from the request
// NOTE: This is for the smallest possible example only. In practice
// putting the password in a request query parameter is highly
// insecure
String name = request.getParameter("name");
String password = request.getParameter("password");
-
+
if (name != null && password != null) {
// Delegate the {credentials in -> identity data out} function to
@@ -55,17 +55,17 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml
index 09fffb4..6ca3544 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml
@@ -18,27 +18,27 @@
-->
<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1"
>
- <!-- Security constraints and roles. -->
+ <!-- Security constraints and roles. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>User pages</web-resource-name>
+ <url-pattern>/protectedServlet</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>foo</role-name>
+ </auth-constraint>
+ </security-constraint>
- <security-role>
- <role-name>foo</role-name>
- </security-role>
+ <security-role>
+ <role-name>foo</role-name>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java
index 701d407..1b5eb6e 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/test/java/org/glassfish/soteria/test/AppDoubleHAMIT.java
@@ -45,7 +45,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -62,7 +62,7 @@
assertNotAuthenticatedError(
responseFromServer("/servlet"));
}
-
+
@Test
public void testCustomHam() {
assertNotAuthenticatedError(
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml
index 6bdd5f8..6c8f624 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml
@@ -17,24 +17,24 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-ham-ordering</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-ham-ordering</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-ham-ordering</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
+ </properties>
<dependencies>
<dependency>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java
index 2e93493..f9e5be7 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -35,7 +35,7 @@
/**
* Test Servlet that prints out the name of the authenticated caller and whether
* this caller is in any of the roles {foo, bar, kaz}
- *
+ *
*
*/
@DeclareRoles({ "foo", "bar", "kaz" })
@@ -43,7 +43,7 @@
public class Servlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
@@ -78,21 +78,21 @@
response.getWriter().write("web user has role \"foo\": " + request.isUserInRole("foo") + "\n");
response.getWriter().write("web user has role \"bar\": " + request.isUserInRole("bar") + "\n");
response.getWriter().write("web user has role \"kaz\": " + request.isUserInRole("kaz") + "\n");
-
+
String contextName = null;
if (securityContext.getCallerPrincipal() != null) {
contextName = securityContext.getCallerPrincipal().getName();
}
-
+
response.getWriter().write("context username: " + contextName + "\n");
-
+
response.getWriter().write("context user has role \"foo\": " + securityContext.isCallerInRole("foo") + "\n");
response.getWriter().write("context user has role \"bar\": " + securityContext.isCallerInRole("bar") + "\n");
response.getWriter().write("context user has role \"kaz\": " + securityContext.isCallerInRole("kaz") + "\n");
-
+
response.getWriter().write("has access " + securityContext.hasAccessToWebResource("/protectedServlet") + "\n");
-
+
response.getWriter().write("All declared roles of user " + ((SecurityContextImpl)securityContext).getAllDeclaredCallerRoles() + "\n");
String invListStr = (String)request.getAttribute("methodInvList");
response.getWriter().write("OrderingList: " + invListStr);
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index f250d9e..bd4c138 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -37,7 +37,7 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -60,15 +60,15 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
@@ -107,5 +107,5 @@
request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(",")));
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml
index 09fffb4..6ca3544 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml
@@ -18,27 +18,27 @@
-->
<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1"
>
- <!-- Security constraints and roles. -->
+ <!-- Security constraints and roles. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>User pages</web-resource-name>
+ <url-pattern>/protectedServlet</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>foo</role-name>
+ </auth-constraint>
+ </security-constraint>
- <security-role>
- <role-name>foo</role-name>
- </security-role>
+ <security-role>
+ <role-name>foo</role-name>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java
index 566f6c8..caac72d 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/test/java/org/glassfish/soteria/test/AppHAMOrderingIT.java
@@ -45,7 +45,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml
index 457da15..7ab4ab0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml
@@ -19,24 +19,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>app-mem-basic</artifactId>
<packaging>war</packaging>
-
+
<build>
<finalName>app-mem-basic</finalName>
</build>
-
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java
index b3ace58..4762328 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/java/test/Servlet.java
@@ -38,7 +38,7 @@
realmName="test realm"
)
-@EmbeddedIdentityStoreDefinition({
+@EmbeddedIdentityStoreDefinition({
@Credentials(callerName = "reza", password = "secret1", groups = { "foo", "bar" }),
@Credentials(callerName = "alex", password = "secret2", groups = { "foo", "kaz" }),
@Credentials(callerName = "arjan", password = "secret3", groups = { "foo" }) }
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java
index 6b07971..102a2c1 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java
@@ -47,75 +47,75 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
- public static Archive<?> createDeployment() {
+ public static Archive<?> createDeployment() {
return mavenWar();
}
@Test
public void testAuthenticated() {
-
- DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
- credentialsProvider.addCredentials("reza", "secret1");
-
- getWebClient().setCredentialsProvider(credentialsProvider);
-
+
+ DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
+ credentialsProvider.addCredentials("reza", "secret1");
+
+ getWebClient().setCredentialsProvider(credentialsProvider);
+
assertDefaultAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticated() {
-
+
WebResponse response = responseFromServer("/servlet");
-
+
assertEquals(401, response.getStatusCode());
-
+
assertTrue(
- "Response did not contain the \"WWW-Authenticate\" header, but should have",
+ "Response did not contain the \"WWW-Authenticate\" header, but should have",
response.getResponseHeaderValue("WWW-Authenticate") != null);
-
+
assertDefaultNotAuthenticated(
response.getContentAsString());
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
-
- DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
- credentialsProvider.addCredentials("romo", "secret1");
-
- getWebClient().setCredentialsProvider(credentialsProvider);
-
- WebResponse response = responseFromServer("/servlet");
-
- assertEquals(401, response.getStatusCode());
-
- assertTrue(
- "Response did not contain the \"WWW-Authenticate\" header, but should have",
- response.getResponseHeaderValue("WWW-Authenticate") != null);
-
- assertDefaultNotAuthenticated(
- response.getContentAsString());
+
+ DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
+ credentialsProvider.addCredentials("romo", "secret1");
+
+ getWebClient().setCredentialsProvider(credentialsProvider);
+
+ WebResponse response = responseFromServer("/servlet");
+
+ assertEquals(401, response.getStatusCode());
+
+ assertTrue(
+ "Response did not contain the \"WWW-Authenticate\" header, but should have",
+ response.getResponseHeaderValue("WWW-Authenticate") != null);
+
+ assertDefaultNotAuthenticated(
+ response.getContentAsString());
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
-
- DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
- credentialsProvider.addCredentials("reza", "wrongpassword");
-
- getWebClient().setCredentialsProvider(credentialsProvider);
-
+
+ DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
+ credentialsProvider.addCredentials("reza", "wrongpassword");
+
+ getWebClient().setCredentialsProvider(credentialsProvider);
+
WebResponse response = responseFromServer("/servlet");
-
+
assertEquals(401, response.getStatusCode());
-
+
assertTrue(
- "Response did not contain the \"WWW-Authenticate\" header, but should have",
+ "Response did not contain the \"WWW-Authenticate\" header, but should have",
response.getResponseHeaderValue("WWW-Authenticate") != null);
-
+
assertDefaultNotAuthenticated(
response.getContentAsString());
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml
index eedae34..32f0c3a 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml
@@ -17,25 +17,25 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-mem-form</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-mem-form</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-mem-form</finalName>
- </build>
+ </build>
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java
index 8693957..f7da2df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginErrorServlet.java
@@ -26,7 +26,7 @@
/**
* Servlet that is invoked when the caller did not authenticate correctly
- *
+ *
*
*/
@WebServlet({"/login-error-servlet"})
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java
index 6c6cce6..c703d92 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/LoginServlet.java
@@ -40,7 +40,7 @@
"<form method=\"POST\" action=\"j_security_check\">" +
"<p><strong>Username </strong>" +
"<input type=\"text\" name=\"j_username\">" +
-
+
"<p><strong>Password </strong>" +
"<input type=\"password\" name=\"j_password\">" +
"<p>" +
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java
index 5c900b8..88ea4f0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -53,31 +53,31 @@
if (request.getUserPrincipal() != null) {
webName = request.getUserPrincipal().getName();
}
-
+
response.getWriter().write(
"<html><body> This is a servlet <br><br>\n" +
-
+
"web username: " + webName + "<br><br>\n" +
-
+
"web user has role \"foo\": " + request.isUserInRole("foo") + "<br>\n" +
"web user has role \"bar\": " + request.isUserInRole("bar") + "<br>\n" +
- "web user has role \"kaz\": " + request.isUserInRole("kaz") + "<br><br>\n" +
+ "web user has role \"kaz\": " + request.isUserInRole("kaz") + "<br><br>\n" +
-
+
"<form method=\"POST\">" +
"<input type=\"hidden\" name=\"logout\" value=\"true\" >" +
"<input type=\"submit\" value=\"Logout\">" +
"</form>" +
"</body></html>");
}
-
+
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
if ("true".equals(request.getParameter("logout"))) {
request.logout();
request.getSession().invalidate();
}
-
+
doGet(request, response);
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java
index 3641671..1ac3a80 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/test/java/org/glassfish/soteria/test/AppMemFormIT.java
@@ -35,7 +35,7 @@
@RunWith(Arquillian.class)
public class AppMemFormIT extends ArquillianBase {
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -43,212 +43,212 @@
@Test
public void testAuthenticated() throws IOException {
-
-
+
+
// 1. Initially request protected page when we're not authenticated
-
+
HtmlPage loginPage = pageFromServer("/servlet");
-
-
+
+
// 2. Server should forward to login page
-
+
assertTrue(
"The login page should have been displayed, but was not",
loginPage.getWebResponse().getContentAsString().contains("Login to continue")
);
-
-
+
+
// 3. Submit the form on the login page with the correct credentials
-
+
HtmlForm form = loginPage.getForms().get(0);
-
+
form.getInputByName("j_username")
.setValueAttribute("reza");
-
+
form.getInputByName("j_password")
.setValueAttribute("secret1");
-
+
HtmlPage page = form.getInputByValue("Submit")
.click();
-
+
// Has to be authenticted now
assertDefaultAuthenticated(
page.getWebResponse()
.getContentAsString());
-
-
+
+
// 4. Request page again. FORM is stateful (http session bound) so
// still has to be authenticated.
-
+
page = pageFromServer("/servlet");
-
+
System.out.println("+++++++++++STEP 4 +++++++++++++ (before assertDefaultAuthenticated) \n\n\n\n" + page.getWebResponse()
.getContentAsString());
-
+
assertDefaultAuthenticated(
page.getWebResponse()
.getContentAsString());
-
-
+
+
// 5. Logout
-
+
System.out.println("*** STEP 5 ***** (before get logout) " + page.asXml());
-
+
page = page.getForms()
.get(0)
.getInputByValue("Logout")
.click();
-
- // Has to be logged out now (page will still be rendered, but with
+
+ // Has to be logged out now (page will still be rendered, but with
// web username null and no roles.
-
+
assertDefaultNotAuthenticated(
page.getWebResponse()
.getContentAsString());
-
-
-
+
+
+
// 6. Request page again. Should still be logged out
// (and will display login to continue again now)
-
+
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
-
+
}
-
+
@Test
public void testNotAuthenticatedWrongName() throws IOException {
-
+
// 1. Initially request protected page when we're not authenticated
-
+
HtmlPage loginPage = pageFromServer("/servlet");
-
-
+
+
// 2. Server should forward to login page
-
+
assertTrue(
"The login page should have been displayed, but was not",
loginPage.getWebResponse().getContentAsString().contains("Login to continue")
);
-
-
+
+
// 3. Submit the form on the login page with the correct credentials
-
+
HtmlForm form = loginPage.getForms().get(0);
-
+
form.getInputByName("j_username")
.setValueAttribute("romo");
-
+
form.getInputByName("j_password")
.setValueAttribute("secret1");
-
+
HtmlPage page = form.getInputByValue("Submit")
.click();
-
+
assertTrue(
"The error page should have been displayed, but was not",
page.getWebResponse().getContentAsString().contains("Login failed!")
);
-
+
// Should not be authenticted now
assertDefaultNotAuthenticated(
page.getWebResponse()
.getContentAsString());
-
+
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() throws IOException {
-
+
// 1. Initially request protected page when we're not authenticated
-
+
HtmlPage loginPage = pageFromServer("/servlet");
-
-
+
+
// 2. Server should forward to login page
-
+
assertTrue(
"The login page should have been displayed, but was not",
loginPage.getWebResponse().getContentAsString().contains("Login to continue")
);
-
-
+
+
// 3. Submit the form on the login page with the *wrong* credentials
-
+
HtmlForm form = loginPage.getForms().get(0);
-
+
form.getInputByName("j_username")
.setValueAttribute("reza");
-
+
form.getInputByName("j_password")
.setValueAttribute("wrongpassword");
-
+
HtmlPage page = form.getInputByValue("Submit")
.click();
-
+
assertTrue(
"The error page should have been displayed, but was not",
page.getWebResponse().getContentAsString().contains("Login failed!")
);
-
+
// Should not be authenticted now
assertDefaultNotAuthenticated(
page.getWebResponse()
.getContentAsString());
-
+
}
-
+
@Test
public void testNotAuthenticatedInitiallyWrongNameThenCorrect() throws IOException {
-
+
// 1. Initially request protected page when we're not authenticated
-
+
HtmlPage loginPage = pageFromServer("/servlet");
-
-
+
+
// 2. Server should forward to login page
-
+
assertTrue(
"The login page should have been displayed, but was not",
loginPage.getWebResponse().getContentAsString().contains("Login to continue")
);
-
-
+
+
// 3. Submit the form on the login page with the correct credentials
-
+
HtmlForm form = loginPage.getForms().get(0);
-
+
form.getInputByName("j_username")
.setValueAttribute("romo");
-
+
form.getInputByName("j_password")
.setValueAttribute("secret1");
-
+
HtmlPage errorPage = form.getInputByValue("Submit")
.click();
-
+
// Should not be authenticted now
assertDefaultNotAuthenticated(
errorPage.getWebResponse()
.getContentAsString());
-
-
+
+
// 4. Request login page directly, and now submit with the correct credentials
// (note that the initial target URL of /servlet should still be remembered)
-
+
loginPage = pageFromServer("/login-servlet");
-
+
form = loginPage.getForms().get(0);
-
+
form.getInputByName("j_username")
.setValueAttribute("reza");
-
+
form.getInputByName("j_password")
.setValueAttribute("secret1");
-
+
HtmlPage page = form.getInputByValue("Submit")
.click();
-
+
// Has to be authenticted now
assertDefaultAuthenticated(
page.getWebResponse()
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml
index d52c37f..1ec0432 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml
@@ -17,25 +17,25 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-multiple-store-backup</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-multiple-store-backup</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-multiple-store-backup</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
@@ -44,5 +44,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 2dc61df..ce6f324 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -34,7 +34,7 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -57,17 +57,17 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
}
-
+
return httpMessageContext.responseUnauthorized();
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml
index 6937244..11d0ee6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -24,12 +24,12 @@
<role-name>foo</role-name>
<group-name>foo</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>bar</role-name>
<group-name>bar</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>kaz</role-name>
<group-name>kaz</group-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java
index d9c48d7..46b0ecf 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/test/java/org/glassfish/soteria/test/AppMultipleStoreBackupIT.java
@@ -41,7 +41,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -52,38 +52,38 @@
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza&password=secret1"));
}
-
+
@Test
public void testAuthenticatedBackupPassword() {
// This will first try the initial store which will fail, then
- // tries the second store, which should succeeded. The user
+ // tries the second store, which should succeeded. The user
// is present in both stores but with different passwords.
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza&password=secret2"));
}
-
+
@Test
public void testAuthenticatedBackupUser() {
// This will first try the initial store which will fail, then
- // tries the second store, which should succeeded. The user
+ // tries the second store, which should succeeded. The user
// is only present in the second store.
Assert.assertAuthenticated(
"web", "alex",
readFromServer("/servlet?name=alex&password=verysecret"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=romo&password=secret1"));
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
assertDefaultNotAuthenticated(
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml
index 9dd5d78..cd2ea73 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-multiple-store</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-multiple-store</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-multiple-store</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java
index 4f71226..a434ae8 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java
@@ -68,10 +68,10 @@
return result;
}
-
+
@Override
public Set<ValidationType> validationTypes() {
return new HashSet<>(asList(VALIDATE));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index bd305a2..4cd0736 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -34,7 +34,7 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@@ -57,18 +57,18 @@
if (result.getStatus() == VALID) {
// Communicate the details of the authenticated user to the
- // container. In many cases the underlying handler will just store the details
- // and the container will actually handle the login after we return from
+ // container. In many cases the underlying handler will just store the details
+ // and the container will actually handle the login after we return from
// this method.
return httpMessageContext.notifyContainerAboutLogin(
result.getCallerPrincipal(), result.getCallerGroups());
}
-
+
return httpMessageContext.responseUnauthorized();
-
- }
+
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml
index 6937244..11d0ee6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -24,12 +24,12 @@
<role-name>foo</role-name>
<group-name>foo</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>bar</role-name>
<group-name>bar</group-name>
</security-role-mapping>
-
+
<security-role-mapping>
<role-name>kaz</role-name>
<group-name>kaz</group-name>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java
index 120633c..7cbba69 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/test/java/org/glassfish/soteria/test/AppMultipleStoreIT.java
@@ -41,7 +41,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -52,19 +52,19 @@
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza&password=secret1"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
assertDefaultNotAuthenticated(
readFromServer("/servlet?name=romo&password=secret1"));
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
assertDefaultNotAuthenticated(
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml
index 1e9d666..64defc5 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml
@@ -17,21 +17,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
- <artifactId>app-no-application-caller-principal</artifactId>
- <packaging>war</packaging>
-
- <build>
+ <artifactId>app-no-application-caller-principal</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-no-application-caller-principal</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index f845c16..40db01f 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -32,20 +32,20 @@
@RequestScoped
public class TestAuthenticationMechanism implements HttpAuthenticationMechanism {
-
+
@Inject
private IdentityStoreHandler identityStoreHandler;
@Override
public AuthenticationStatus validateRequest(HttpServletRequest request, HttpServletResponse response, HttpMessageContext httpMessageContext) throws AuthenticationException {
- // Get the (caller) name and password from the request
+ // Get the (caller) name and password from the request
// NOTE: This is for the smallest possible example only. In practice
// putting the password in a request query parameter is highly
// insecure
String name = request.getParameter("name");
String password = request.getParameter("password");
-
+
if (name != null && password != null) {
// Delegate the {credentials in -> identity data out} function to
@@ -59,9 +59,9 @@
} else {
return httpMessageContext.responseUnauthorized();
}
- }
+ }
return httpMessageContext.doNothing();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java
index 7a988bc..d8f65e8 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java
@@ -42,7 +42,7 @@
public class ValidateAvailablePrincipalServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
-
+
@Inject
private SecurityContext securityContext;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml
index a0d96d0..7b727da 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/web.xml
@@ -18,26 +18,26 @@
-->
<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
- <!-- Security constraints and roles. -->
+ <!-- Security constraints and roles. -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>User pages</web-resource-name>
+ <url-pattern>/protectedServlet</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>foo</role-name>
+ </auth-constraint>
+ </security-constraint>
- <security-role>
- <role-name>foo</role-name>
- </security-role>
+ <security-role>
+ <role-name>foo</role-name>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java
index d7ff081..af9cd34 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/test/java/org/glassfish/soteria/test/ValidateAvailablePrincipalIT.java
@@ -45,7 +45,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml
index 37b85c0..b01fa7b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml
@@ -20,24 +20,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>app-no-role-mapping</artifactId>
<packaging>war</packaging>
-
+
<build>
<finalName>app-no-role-mapping</finalName>
</build>
-
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java
index 296f301..67d381b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/java/test/Servlet.java
@@ -38,7 +38,7 @@
realmName="test realm"
)
-@EmbeddedIdentityStoreDefinition({
+@EmbeddedIdentityStoreDefinition({
@Credentials(callerName = "reza", password = "secret1", groups = { "foo", "bar" }),
@Credentials(callerName = "alex", password = "secret2", groups = { "foo", "kaz" }),
@Credentials(callerName = "arjan", password = "secret3", groups = { "foo" }) ,
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java
index a332c11..be6aba3 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/test/java/org/glassfish/soteria/test/AppMemBasicIT.java
@@ -47,75 +47,75 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
- public static Archive<?> createDeployment() {
+ public static Archive<?> createDeployment() {
return mavenWar();
}
@Test
public void testAuthenticated() {
-
- DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
- credentialsProvider.addCredentials("reza", "secret1");
-
- getWebClient().setCredentialsProvider(credentialsProvider);
-
+
+ DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
+ credentialsProvider.addCredentials("reza", "secret1");
+
+ getWebClient().setCredentialsProvider(credentialsProvider);
+
assertDefaultAuthenticated(
readFromServer("/servlet"));
}
-
+
@Test
public void testNotAuthenticated() {
-
+
WebResponse response = responseFromServer("/servlet");
-
+
assertEquals(401, response.getStatusCode());
-
+
assertTrue(
- "Response did not contain the \"WWW-Authenticate\" header, but should have",
+ "Response did not contain the \"WWW-Authenticate\" header, but should have",
response.getResponseHeaderValue("WWW-Authenticate") != null);
-
+
assertDefaultNotAuthenticated(
response.getContentAsString());
}
-
+
@Test
public void testNotAuthenticatedWrongName() {
-
- DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
- credentialsProvider.addCredentials("romo", "secret1");
-
- getWebClient().setCredentialsProvider(credentialsProvider);
-
- WebResponse response = responseFromServer("/servlet");
-
- assertEquals(401, response.getStatusCode());
-
- assertTrue(
- "Response did not contain the \"WWW-Authenticate\" header, but should have",
- response.getResponseHeaderValue("WWW-Authenticate") != null);
-
- assertDefaultNotAuthenticated(
- response.getContentAsString());
+
+ DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
+ credentialsProvider.addCredentials("romo", "secret1");
+
+ getWebClient().setCredentialsProvider(credentialsProvider);
+
+ WebResponse response = responseFromServer("/servlet");
+
+ assertEquals(401, response.getStatusCode());
+
+ assertTrue(
+ "Response did not contain the \"WWW-Authenticate\" header, but should have",
+ response.getResponseHeaderValue("WWW-Authenticate") != null);
+
+ assertDefaultNotAuthenticated(
+ response.getContentAsString());
}
-
+
@Test
public void testNotAuthenticatedWrongPassword() {
-
- DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
- credentialsProvider.addCredentials("reza", "wrongpassword");
-
- getWebClient().setCredentialsProvider(credentialsProvider);
-
+
+ DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
+ credentialsProvider.addCredentials("reza", "wrongpassword");
+
+ getWebClient().setCredentialsProvider(credentialsProvider);
+
WebResponse response = responseFromServer("/servlet");
-
+
assertEquals(401, response.getStatusCode());
-
+
assertTrue(
- "Response did not contain the \"WWW-Authenticate\" header, but should have",
+ "Response did not contain the \"WWW-Authenticate\" header, but should have",
response.getResponseHeaderValue("WWW-Authenticate") != null);
-
+
assertDefaultNotAuthenticated(
response.getContentAsString());
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml
index 1bd73ef..4ce6a1e 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml
@@ -17,26 +17,26 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
-
- <artifactId>app-securitycontext-auth-ejb</artifactId>
- <packaging>war</packaging>
-
- <build>
+
+ <artifactId>app-securitycontext-auth-ejb</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-securitycontext-auth-ejb</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
@@ -45,5 +45,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java
index 46cca2a..8c3dcd3 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java
@@ -43,19 +43,19 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
}
-
+
@Test
public void testAuthenticatedStatus() {
assertTrue(
readFromServer("/servlet?name=reza")
.contains("Authenticated with status: SUCCESS"));
}
-
+
/**
* The name "rezax" will cause the custom authentication provider
* to throw an auth exception, which should ultimately result in
@@ -67,7 +67,7 @@
readFromServer("/servlet?name=rezax")
.contains("Authenticated with status: SEND_FAILURE"));
}
-
+
/**
* The name "unknown" will cause the custom authentication provider
* to return SEND_FAILURE, which should ultimately result in
@@ -119,14 +119,14 @@
"/protectedServlet",
readFromServer("/servlet?name=reza"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
-
-
+
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml
index 11653c4..16c1fba 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml
@@ -17,26 +17,26 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
-
- <artifactId>app-securitycontext-auth</artifactId>
- <packaging>war</packaging>
-
- <build>
+
+ <artifactId>app-securitycontext-auth</artifactId>
+ <packaging>war</packaging>
+
+ <build>
<finalName>app-securitycontext-auth</finalName>
- </build>
-
+ </build>
+
<properties>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.soteria.test</groupId>
@@ -45,5 +45,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java
index 22abeca..cfddf88 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/test/java/org/glassfish/soteria/test/AppSecurityContextAuthIT.java
@@ -44,7 +44,7 @@
public static void printSummary(){
stat.printSummary();
}
-
+
@Deployment(testable = false)
public static Archive<?> createDeployment() {
return mavenWar();
@@ -55,14 +55,14 @@
assertDefaultAuthenticated(
readFromServer("/servlet?name=reza"));
}
-
+
@Test
public void testAuthenticatedStatus() {
assertTrue(
readFromServer("/servlet?name=reza")
.contains("Authenticated with status: SUCCESS"));
}
-
+
/**
* The name "rezax" will cause the custom authentication provider
* to throw an auth exception, which should ultimately result in
@@ -74,7 +74,7 @@
readFromServer("/servlet?name=rezax")
.contains("Authenticated with status: SEND_FAILURE"));
}
-
+
/**
* The name "unknown" will cause the custom authentication provider
* to return SEND_FAILURE, which should ultimately result in
@@ -118,14 +118,14 @@
"/protectedServlet",
readFromServer("/servlet?name=reza"));
}
-
+
@Test
public void testNotAuthenticated() {
assertDefaultNotAuthenticated(
readFromServer("/servlet"));
}
-
-
-
+
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/build.properties b/appserver/tests/appserv-tests/devtests/security/soteria/build.properties
index 4c5eca5..fabf1d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/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="security"/>
<property name="sub-module" value="${module}-soteria"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml
index 75916ed..a964d0e 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml
@@ -17,17 +17,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish.soteria.test</groupId>
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>common</artifactId>
-
+
<packaging>jar</packaging>
<dependencies>
@@ -38,13 +38,13 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
+ <artifactId>arquillian-junit-container</artifactId>
</dependency>
-
+
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.29</version>
+ <version>2.29</version>
</dependency>
</dependencies>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java
index 6c02bb6..ac7e181 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ArquillianBase.java
@@ -37,31 +37,31 @@
import com.gargoylesoftware.htmlunit.WebResponse;
public class ArquillianBase {
-
+
private static final Logger logger = Logger.getLogger(ArquillianBase.class.getName());
-
+
private WebClient webClient;
private String response;
- @ArquillianResource
+ @ArquillianResource
private URL base;
-
+
@Rule
public TestWatcher ruleExample = new TestWatcher() {
@Override
protected void failed(Throwable e, Description description) {
super.failed(e, description);
-
- logger.log(SEVERE,
- "\n\nTest failed: " +
+
+ logger.log(SEVERE,
+ "\n\nTest failed: " +
description.getClassName() + "." + description.getMethodName() +
-
+
"\nMessage: " + e.getMessage() +
-
+
"\nLast response: " +
-
+
"\n\n" + response + "\n\n");
-
+
}
};
@@ -69,7 +69,7 @@
public void setUp() {
response = null;
webClient = new WebClient() {
-
+
private static final long serialVersionUID = 1L;
@Override
@@ -89,21 +89,21 @@
webClient.getCookieManager().clearCookies();
webClient.close();
}
-
+
protected String readFromServer(String path) {
response = "";
WebResponse localResponse = responseFromServer(path);
if (localResponse != null) {
response = localResponse.getContentAsString();
}
-
- return response;
+
+ return response;
}
-
+
protected WebResponse responseFromServer(String path) {
-
+
WebResponse webResponse = null;
-
+
Page page = pageFromServer(path);
if (page != null) {
webResponse = page.getWebResponse();
@@ -111,37 +111,37 @@
response = webResponse.getContentAsString();
}
}
-
+
return webResponse;
}
-
+
protected <P extends Page> P pageFromServer(String path) {
-
- if (base.toString().endsWith("/") && path.startsWith("/")) {
- path = path.substring(1);
- }
-
+
+ if (base.toString().endsWith("/") && path.startsWith("/")) {
+ path = path.substring(1);
+ }
+
try {
response = "";
-
+
P page = webClient.getPage(base + path);
-
+
if (page != null) {
WebResponse localResponse = page.getWebResponse();
if (localResponse != null) {
response = localResponse.getContentAsString();
}
}
-
+
return page;
-
+
} catch (FailingHttpStatusCodeException | IOException e) {
throw new IllegalStateException(e);
}
}
-
+
protected WebClient getWebClient() {
- return webClient;
- }
-
+ return webClient;
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java
index 12e6eb4..0cdad6f 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/Assert.java
@@ -25,7 +25,7 @@
import com.gargoylesoftware.htmlunit.WebResponse;
public final class Assert {
-
+
public static void assertDefaultAuthenticated(String response) {
assertAuthenticated("web", "reza", response, "foo", "bar");
}
@@ -35,7 +35,7 @@
assertEquals(200, response.getStatusCode());
assertAuthenticated("web", "reza", response.getContentAsString(), "foo", "bar");
}
-
+
public static void assertDefaultNotAuthenticated(String response) {
assertNotAuthenticated("web", "reza", response, "foo", "bar");
}
@@ -77,30 +77,30 @@
assertBothContainerAndApplicationPrincipalsAreSame("reza", "foo", response
.getContentAsString());
}
-
+
public static void assertAuthenticated(String userType, String name, String response, String... roles) {
assertTrue(
- "Should be authenticated as user " + name + " but was not \n Response: \n" +
+ "Should be authenticated as user " + name + " but was not \n Response: \n" +
response + "\n search: " + userType + " username: " + name,
response.contains(userType + " username: " + name));
-
+
for (String role : roles) {
assertTrue(
- "Authenticated user should have role \"" + role + "\", but did not \n Response: \n" +
+ "Authenticated user should have role \"" + role + "\", but did not \n Response: \n" +
response,
response.contains(userType + " user has role \"" + role + "\": true"));
}
}
-
+
public static void assertNotAuthenticated(String userType, String name, String response, String... roles) {
assertFalse(
- "Should not be authenticated as user " + name + " but was \n Response: \n" +
+ "Should not be authenticated as user " + name + " but was \n Response: \n" +
response + "\n search: " + userType + " username: " + name,
response.contains(userType + " username: " + name));
-
+
for (String role : roles) {
assertFalse(
- "Authenticated user should not have role \"" + role + "\", but did \n Response: \n" +
+ "Authenticated user should not have role \"" + role + "\", but did \n Response: \n" +
response,
response.contains(userType + " user has role \"" + role + "\": true"));
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java
index 59029eb..01757f1 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/java/org/glassfish/soteria/test/ShrinkWrap.java
@@ -26,11 +26,11 @@
public class ShrinkWrap {
- public static WebArchive mavenWar() {
- return
+ public static WebArchive mavenWar() {
+ return
create(ZipImporter.class, getProperty("finalName") + ".war")
.importFrom(new File("target/" + getProperty("finalName") + ".war"))
.as(WebArchive.class);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml
index 31ca2b8..dad2bcd 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml
@@ -23,9 +23,9 @@
<feature>javaee-7.0</feature>
<feature>localConnector-1.0</feature>
</featureManager>
-
+
<httpEndpoint httpPort="9080" httpsPort="9443" id="defaultHttpEndpoint"/>
-
+
<applicationManager autoExpand="true"/>
</server>
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml
index 86f2fe7..532c7d9 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml
@@ -23,9 +23,9 @@
<artifactId>soteria</artifactId>
<version>6.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<name>Soteria ${project.version} Integration tests and examples</name>
-
+
<properties>
<glassfish.version>5.0</glassfish.version>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -48,10 +48,10 @@
<module>app-multiple-store-backup</module>
<module>app-no-role-mapping</module>
<module>app-bundled-ham-basic-login-config-form</module>
- <module>app-caller-principal</module>
+ <module>app-caller-principal</module>
<module>app-no-application-caller-principal</module>
</modules>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -68,20 +68,20 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.security.enterprise</groupId>
<artifactId>javax.security.enterprise-api</artifactId>
@@ -108,7 +108,7 @@
<systemPath>${APS_HOME}/lib/reporter.jar</systemPath>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -131,7 +131,7 @@
<GLASSFISH_HOME>${env.S1AS_HOME}/..</GLASSFISH_HOME>
</environmentVariables>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/build.properties b/appserver/tests/appserv-tests/devtests/security/standalone/build.properties
index 9f7bfb5..9f09695 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/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="security"/>
<property name="sub-module" value="${module}-standalone"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/build.xml b/appserver/tests/appserv-tests/devtests/security/standalone/build.xml
index dee7cfa..0ef09a6 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/build.xml
@@ -32,7 +32,7 @@
&run;
<target name="all">
- <ant dir="loginctxdriver" target="all"/>
+ <ant dir="loginctxdriver" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.properties b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.properties
index edb1319..7365f26 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/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="security"/>
<property name="sub-module" value="${module}-standalone-loginctxdriver"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.xml b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.xml
index dd0595e..8d79f77 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/build.xml
@@ -35,12 +35,12 @@
&commonSecurity;
<target name="usage">
- <echo>
- Usage:
- ant all (Executes standalone login context driver tests)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes standalone login context driver tests)
+ </echo>
</target>
-
+
<target name="all" depends="build, setup, deploy,run, undeploy, unsetup">
</target>
@@ -101,7 +101,7 @@
<target name="run-standalone-client" depends="init-common">
<echo message="Running standalone client ..."/>
-
+
<java classname="LoginContextDriverTest"
classpath="${admin.domain.dir}/../lib/appserv-rt.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar" fork="true">
<jvmarg value="-Djava.security.auth.login.config=${admin.domain.dir}/../lib/appclient/appclientlogin.conf"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
index 7381bdf..14f7d45 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
@@ -34,20 +34,20 @@
*/
public class LoginContextDriverTest {
- private static String testId="Standalone-client-login-context-driver";
+ private static String testId="Standalone-client-login-context-driver";
private static boolean testStatus=false;
private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
private static InitialContext ic = null;
-
+
private static MySession1Remote my1r = null;
-
+
public static void main(String[] args) {
stat.addDescription("Security::EJB Method permissions test using " +
"Login Context Driver Standalone Client");
-
- System.out.println("*** EJBMethod Permission Test using Login Context Driver Standalone client ***");
+
+ System.out.println("*** EJBMethod Permission Test using Login Context Driver Standalone client ***");
try{
@@ -58,16 +58,16 @@
// Initialize the Context
ic = new InitialContext();
-
+
System.out.println("EJB lookup start...");
- java.lang.Object objref = ic.lookup("ejb/MySession1Bean");
-
+ java.lang.Object objref = ic.lookup("ejb/MySession1Bean");
+
MySession1RemoteHome my1rh = (MySession1RemoteHome)
PortableRemoteObject.narrow(objref, MySession1RemoteHome.class);
- my1r = my1rh.create();
-
- String retValue = my1r.businessMethod("blah");
+ my1r = my1rh.create();
+
+ String retValue = my1r.businessMethod("blah");
System.out.println("retValue="+retValue);
testStatus = true;
@@ -75,7 +75,7 @@
} catch(Exception e) {
e.printStackTrace();
} finally {
- if( testStatus)
+ if( testStatus)
stat.addStatus(testId, stat.PASS);
else
stat.addStatus(testId, stat.FAIL);
@@ -83,5 +83,5 @@
stat.printSummary(testId);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/descriptor/ejb-jar.xml
index dfb20a2..835087c 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/descriptor/ejb-jar.xml
@@ -34,16 +34,16 @@
<security-role>
- <role-name>staff</role-name>
+ <role-name>staff</role-name>
</security-role>
<method-permission>
- <description>method authorized to only staff role</description>
+ <description>method authorized to only staff role</description>
<role-name>staff</role-name>
<method>
- <ejb-name>MySession1Bean</ejb-name>
- <method-name>businessMethod</method-name>
- </method>
+ <ejb-name>MySession1Bean</ejb-name>
+ <method-name>businessMethod</method-name>
+ </method>
</method-permission>
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
index 556cacd..889caef 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
@@ -21,36 +21,36 @@
*/
public class MySession1Bean implements SessionBean, MySession1RemoteBusiness {
private SessionContext context;
-
+
/**
* @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
*/
public void setSessionContext(SessionContext aContext) {
context = aContext;
}
-
+
/**
* @see jakarta.ejb.SessionBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
+
/**
* @see jakarta.ejb.SessionBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
+
/**
* @see jakarta.ejb.SessionBean#ejbRemove()
*/
public void ejbRemove() {
-
+
}
// </editor-fold>
-
+
/**
* See section 7.10.3 of the EJB 2.0 specification
* See section 7.11.3 of the EJB 2.1 specification
@@ -61,9 +61,9 @@
// spanning all methods can be performed here such as home interfaces
// and data sources.
}
-
-
-
+
+
+
public String businessMethod(String name) {
return "hello " + name;
}
@@ -75,7 +75,7 @@
public String businessMethod3(String name) {
return "howdy "+name;
}
-
-
-
+
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
index 798d406..0e91e5b 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
@@ -21,6 +21,6 @@
* This is the remote interface for MySession1 enterprise bean.
*/
public interface MySession1Remote extends EJBObject, MySession1RemoteBusiness {
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
index 7ebc8f0..7c3303f 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
@@ -23,8 +23,8 @@
* This is the home interface for MySession1 enterprise bean.
*/
public interface MySession1RemoteHome extends EJBHome {
-
+
MySession1Remote create() throws CreateException, RemoteException;
-
-
+
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.properties b/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.properties
index 010b761..b32f455 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/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="security-timerStandalone"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.xml b/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.xml
index 65caa58..f96f7e9 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/build.xml
@@ -62,16 +62,16 @@
<target name="build" depends="compile">
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="**/Sful*.class,**/Sless*.class"/>
</antcall>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Client.class,**/Sful.class,**/Sless.class"/>
</antcall>
<echo message="appclient.jar=${assemble.dir}/${appname}-client.jar"/>
<jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
+ <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
excludes="META-INF/**"/>
</jar>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
index b0c3727..5d7d017 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
@@ -22,7 +22,7 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) {
@@ -31,8 +31,8 @@
Client client = new Client(args);
client.doTest();
stat.printSummary("security-timerStandalone");
- }
-
+ }
+
public Client (String[] args) {
}
@@ -74,7 +74,7 @@
e.printStackTrace();
stat.addStatus("local main" , stat.FAIL);
}
-
- return;
+
+ return;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
index e6b0801..85885c3 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
@@ -49,11 +49,11 @@
return timeoutWasCalled;
}
- @Timeout
+ @Timeout
private void timeout(Timer t) {
System.out.println("in SlessEJB:timeout");
sc.isCallerInRole("dummy");
timeoutWasCalled = true;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.properties b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.properties
index bff93b0..f4238aa 100644
--- a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/uncovered-http-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="UncoveredHTTPMethods"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.xml b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.xml
index 48ef350..601e155 100644
--- a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/build.xml
@@ -25,14 +25,14 @@
]>
<project name="uncovered-http-methods" default="usage" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
&commonSecurity;
-
+
<target name="all" depends="clean, setup, build, deploy, run, undeploy, unsetup"/>
-
+
<target name="setup" depends="init-common">
<antcall target="create-user-common">
<param name="user" value="testuser"/>
@@ -50,20 +50,20 @@
<arg value="javaee"/>
</java>
</target>
-
+
<target name="unsetup" depends="init-common">
<antcall target="delete-user-common">
<param name="user" value="testuser"/>
</antcall>
</target>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
</target>
-
+
<target name="build" depends="compile">
<antcall target="compile-common">
<param name="src" value="web"/>
@@ -80,10 +80,10 @@
<param name="war.file" value="${assemble.dir}/denyUncoveredServletTest-web.war"/>
</antcall>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <copy file="${glassfish-application.xml}" tofile="${build.classes.dir}/META-INF/glassfish-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <mkdir dir="${build.classes.dir}/META-INF"/>
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <copy file="${glassfish-application.xml}" tofile="${build.classes.dir}/META-INF/glassfish-application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.war"/>
</fileset>
@@ -91,13 +91,13 @@
<include name="META-INF/application.xml"/>
<include name="META-INF/glassfish-application.xml"/>
</fileset>
- </jar>
+ </jar>
<antcall target="compile-common">
<param name="src" value="client"/>
</antcall>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -105,7 +105,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java
index 9223906..787e6b8 100644
--- a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/client/Client.java
@@ -24,419 +24,419 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
- private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
- private static String testSuite = "Security::UncoveredHTTPMethods";
- private static String contextPathOpen = "/open";
- private static String contextPathDeny = "/deny";
-
- private String host;
- private String port;
- private String username;
- private String password;
+ private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
+ private static String testSuite = "Security::UncoveredHTTPMethods";
+ private static String contextPathOpen = "/open";
+ private static String contextPathDeny = "/deny";
- public static void main(String[] args) {
- stat.addDescription(testSuite);
- Client client = new Client(args);
- client.doTests();
- stat.printSummary();
- }
+ private String host;
+ private String port;
+ private String username;
+ private String password;
- public Client(String[] args) {
- host = args[0];
- port = args[1];
- username = args[2];
- password = args[3];
- System.out.println(" Host: " + host);
- System.out.println(" Port: " + port);
- System.out.println(" Username: " + username);
- }
+ public static void main(String[] args) {
+ stat.addDescription(testSuite);
+ Client client = new Client(args);
+ client.doTests();
+ stat.printSummary();
+ }
- public void doTests() {
- testExample1();
- testExample1Put();
- testExample2();
- testExample2Delete();
- testExample3a();
- testExample3aPut();
- testExample3bPost();
- testExample3bDelete();
- testCovered1Post();
- testCovered1Put();
- testCovered2();
- testCovered2Put();
- testCovered3aPost();
- testCovered3aDelete();
- testCovered3b();
- testCovered3bPut();
- }
+ public Client(String[] args) {
+ host = args[0];
+ port = args[1];
+ username = args[2];
+ password = args[3];
+ System.out.println(" Host: " + host);
+ System.out.println(" Port: " + port);
+ System.out.println(" Username: " + username);
+ }
- public void testExample1() {
- String servlet = "/Example1";
- String descriptionOpen = contextPathOpen+servlet;
- String descriptionDeny = contextPathDeny+servlet;
+ public void doTests() {
+ testExample1();
+ testExample1Put();
+ testExample2();
+ testExample2Delete();
+ testExample3a();
+ testExample3aPut();
+ testExample3bPost();
+ testExample3bDelete();
+ testCovered1Post();
+ testCovered1Put();
+ testCovered2();
+ testCovered2Put();
+ testCovered3aPost();
+ testCovered3aDelete();
+ testCovered3b();
+ testCovered3bPut();
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, null, 302, username, contextPathOpen, output);
- int index = output.indexOf("https://");
- if (success && (index != -1)) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample1() {
+ String servlet = "/Example1";
+ String descriptionOpen = contextPathOpen+servlet;
+ String descriptionDeny = contextPathDeny+servlet;
- output = new StringBuffer();
- success = doIndividualTest(servlet, null, 302, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, null, 302, username, contextPathOpen, output);
+ int index = output.indexOf("https://");
+ if (success && (index != -1)) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample1Put() {
- String servlet = "/Example1";
- String method = "PUT";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, null, 302, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample1Put() {
+ String servlet = "/Example1";
+ String method = "PUT";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample2() {
- String servlet = "/Example2";
- String descriptionOpen = contextPathOpen+servlet;
- String descriptionDeny = contextPathDeny+servlet;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, null, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample2() {
+ String servlet = "/Example2";
+ String descriptionOpen = contextPathOpen+servlet;
+ String descriptionDeny = contextPathDeny+servlet;
- output = new StringBuffer();
- success = doIndividualTest(servlet, null, 403, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, null, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample2Delete() {
- String servlet = "/Example2";
- String method = "DELETE";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, null, 403, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 403, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample2Delete() {
+ String servlet = "/Example2";
+ String method = "DELETE";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 403, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample3a() {
- String servlet = "/Example3a";
- String descriptionOpen = contextPathOpen+servlet;
- String descriptionDeny = contextPathDeny+servlet;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, null, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample3a() {
+ String servlet = "/Example3a";
+ String descriptionOpen = contextPathOpen+servlet;
+ String descriptionDeny = contextPathDeny+servlet;
- output = new StringBuffer();
- success = doIndividualTest(servlet, null, 200, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, null, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample3aPut() {
- String servlet = "/Example3a";
- String method = "PUT";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, null, 200, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample3aPut() {
+ String servlet = "/Example3a";
+ String method = "PUT";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample3bPost() {
- String servlet = "/Example3b";
- String method = "POST";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample3bPost() {
+ String servlet = "/Example3b";
+ String method = "POST";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 200, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testExample3bDelete() {
- String servlet = "/Example3b";
- String method = "DELETE";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 200, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testExample3bDelete() {
+ String servlet = "/Example3b";
+ String method = "DELETE";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered1Post() {
- String servlet = "/Covered1";
- String method = "POST";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 302, username, contextPathOpen, output);
- int index = output.indexOf("https://");
- if (success && (index != -1)) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered1Post() {
+ String servlet = "/Covered1";
+ String method = "POST";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 302, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 302, username, contextPathOpen, output);
+ int index = output.indexOf("https://");
+ if (success && (index != -1)) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered1Put() {
- String servlet = "/Covered1";
- String method = "PUT";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 302, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 302, username, contextPathOpen, output);
- int index = output.indexOf("https://");
- if (success && (index != -1)) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered1Put() {
+ String servlet = "/Covered1";
+ String method = "PUT";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 302, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 302, username, contextPathOpen, output);
+ int index = output.indexOf("https://");
+ if (success && (index != -1)) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered2() {
- String servlet = "/Covered2";
- String descriptionOpen = contextPathOpen+servlet;
- String descriptionDeny = contextPathDeny+servlet;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 302, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, null, 302, username, contextPathOpen, output);
- int index = output.indexOf("https://");
- if (success && (index != -1)) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered2() {
+ String servlet = "/Covered2";
+ String descriptionOpen = contextPathOpen+servlet;
+ String descriptionDeny = contextPathDeny+servlet;
- output = new StringBuffer();
- success = doIndividualTest(servlet, null, 302, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, null, 302, username, contextPathOpen, output);
+ int index = output.indexOf("https://");
+ if (success && (index != -1)) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered2Put() {
- String servlet = "/Covered2";
- String method = "PUT";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, null, 302, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 403, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered2Put() {
+ String servlet = "/Covered2";
+ String method = "PUT";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 403, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered3aPost() {
- String servlet = "/Covered3a";
- String method = "POST";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 403, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered3aPost() {
+ String servlet = "/Covered3a";
+ String method = "POST";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 200, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered3aDelete() {
- String servlet = "/Covered3a";
- String method = "DELETE";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 200, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
- if (success) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered3aDelete() {
+ String servlet = "/Covered3a";
+ String method = "DELETE";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 200, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 200, username, contextPathOpen, output);
+ if (success) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered3b() {
- String servlet = "/Covered3b";
- String descriptionOpen = contextPathOpen+servlet;
- String descriptionDeny = contextPathDeny+servlet;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 200, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, null, 302, username, contextPathOpen, output);
- int index = output.indexOf("https://");
- if (success && (index != -1)) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered3b() {
+ String servlet = "/Covered3b";
+ String descriptionOpen = contextPathOpen+servlet;
+ String descriptionDeny = contextPathDeny+servlet;
- output = new StringBuffer();
- success = doIndividualTest(servlet, null, 302, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, null, 302, username, contextPathOpen, output);
+ int index = output.indexOf("https://");
+ if (success && (index != -1)) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- public void testCovered3bPut() {
- String servlet = "/Covered3b";
- String method = "PUT";
- String descriptionOpen = contextPathOpen+servlet+"-"+method;
- String descriptionDeny = contextPathDeny+servlet+"-"+method;
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, null, 302, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- StringBuffer output = new StringBuffer();
- boolean success = doIndividualTest(servlet, method, 302, username, contextPathOpen, output);
- int index = output.indexOf("https://");
- if (success && (index != -1)) {
- stat.addStatus(descriptionOpen, stat.PASS);
- }
- else stat.addStatus(descriptionOpen, stat.FAIL);
+ public void testCovered3bPut() {
+ String servlet = "/Covered3b";
+ String method = "PUT";
+ String descriptionOpen = contextPathOpen+servlet+"-"+method;
+ String descriptionDeny = contextPathDeny+servlet+"-"+method;
- output = new StringBuffer();
- success = doIndividualTest(servlet, method, 302, username, contextPathDeny, output);
- if (success) stat.addStatus(descriptionDeny, stat.PASS);
- else stat.addStatus(descriptionDeny, stat.FAIL);
- }
+ StringBuffer output = new StringBuffer();
+ boolean success = doIndividualTest(servlet, method, 302, username, contextPathOpen, output);
+ int index = output.indexOf("https://");
+ if (success && (index != -1)) {
+ stat.addStatus(descriptionOpen, stat.PASS);
+ }
+ else stat.addStatus(descriptionOpen, stat.FAIL);
- private boolean doIndividualTest(String servlet, String method, int code, String user, String context, StringBuffer output) {
- boolean result = false;
- try {
- int rtncode;
- String url = "http://" + host + ":" + port + context + servlet;
- System.out.println("\nInvoking servlet at " + url);
- rtncode = invokeServlet(url, method, user, output);
- System.out.println("The servlet return code: " + rtncode);
- if (rtncode != code) {
- System.out.println("Incorrect return code, expecting: " + code);
- }
- else result = true;
- } catch (Exception ex) {
- System.out.println("Exception: " + ex.toString());
- //ex.printStackTrace();
- }
- return result;
- }
+ output = new StringBuffer();
+ success = doIndividualTest(servlet, method, 302, username, contextPathDeny, output);
+ if (success) stat.addStatus(descriptionDeny, stat.PASS);
+ else stat.addStatus(descriptionDeny, stat.FAIL);
+ }
- private int invokeServlet(String url, String method, String user, StringBuffer output) throws Exception {
- String httpMethod = "GET";
- if ((method != null) && (method.length() > 0)) httpMethod = method;
- System.out.println("Invoking servlet with HTTP method: " + httpMethod);
- URL u = new URL(url);
- HttpURLConnection c1 = (HttpURLConnection) u.openConnection();
- c1.setRequestMethod(httpMethod);
- if ((user != null) && (user.length() > 0)) {
- // Add BASIC header for authentication
- String auth = user + ":" + password;
- String authEncoded = new sun.misc.BASE64Encoder().encode(auth.getBytes());
- c1.setRequestProperty("Authorization", "Basic " + authEncoded);
- }
- c1.setUseCaches(false);
+ private boolean doIndividualTest(String servlet, String method, int code, String user, String context, StringBuffer output) {
+ boolean result = false;
+ try {
+ int rtncode;
+ String url = "http://" + host + ":" + port + context + servlet;
+ System.out.println("\nInvoking servlet at " + url);
+ rtncode = invokeServlet(url, method, user, output);
+ System.out.println("The servlet return code: " + rtncode);
+ if (rtncode != code) {
+ System.out.println("Incorrect return code, expecting: " + code);
+ }
+ else result = true;
+ } catch (Exception ex) {
+ System.out.println("Exception: " + ex.toString());
+ //ex.printStackTrace();
+ }
+ return result;
+ }
- // Connect and get the response code and/or output to verify
- c1.connect();
- int code = c1.getResponseCode();
- if (code == HttpURLConnection.HTTP_OK) {
- InputStream is = null;
- BufferedReader input = null;
- String line = null;
- try {
- is = c1.getInputStream();
- input = new BufferedReader(new InputStreamReader(is));
- while ((line = input.readLine()) != null) {
- output.append(line);
- //System.out.println(line);
- }
- }
- finally {
- try { if (is != null) is.close(); }
- catch (Exception exc) {}
- try { if (input != null) input.close(); }
- catch (Exception exc) {}
- }
- }
- else if (code == HttpURLConnection.HTTP_MOVED_TEMP) {
- URL redir = new URL(c1.getHeaderField("Location"));
- String line = "Servlet redirected to: " + redir.toString();
- output.append(line);
- System.out.println(line);
- }
- return code;
- }
+ private int invokeServlet(String url, String method, String user, StringBuffer output) throws Exception {
+ String httpMethod = "GET";
+ if ((method != null) && (method.length() > 0)) httpMethod = method;
+ System.out.println("Invoking servlet with HTTP method: " + httpMethod);
+ URL u = new URL(url);
+ HttpURLConnection c1 = (HttpURLConnection) u.openConnection();
+ c1.setRequestMethod(httpMethod);
+ if ((user != null) && (user.length() > 0)) {
+ // Add BASIC header for authentication
+ String auth = user + ":" + password;
+ String authEncoded = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+ c1.setRequestProperty("Authorization", "Basic " + authEncoded);
+ }
+ c1.setUseCaches(false);
+
+ // Connect and get the response code and/or output to verify
+ c1.connect();
+ int code = c1.getResponseCode();
+ if (code == HttpURLConnection.HTTP_OK) {
+ InputStream is = null;
+ BufferedReader input = null;
+ String line = null;
+ try {
+ is = c1.getInputStream();
+ input = new BufferedReader(new InputStreamReader(is));
+ while ((line = input.readLine()) != null) {
+ output.append(line);
+ //System.out.println(line);
+ }
+ }
+ finally {
+ try { if (is != null) is.close(); }
+ catch (Exception exc) {}
+ try { if (input != null) input.close(); }
+ catch (Exception exc) {}
+ }
+ }
+ else if (code == HttpURLConnection.HTTP_MOVED_TEMP) {
+ URL redir = new URL(c1.getHeaderField("Location"));
+ String line = "Servlet redirected to: " + redir.toString();
+ output.append(line);
+ System.out.println(line);
+ }
+ return code;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/deny-web.xml b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/deny-web.xml
index e9b466a..ded82ce 100644
--- a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/deny-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/deny-web.xml
@@ -35,7 +35,7 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Example2</web-resource-name>
@@ -45,7 +45,7 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Covered1</web-resource-name>
@@ -74,5 +74,5 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/web.xml
index 3dd3d80..6b77d59 100644
--- a/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/uncovered-http-methods/descriptor/web.xml
@@ -33,7 +33,7 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Example2</web-resource-name>
@@ -43,7 +43,7 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Covered1</web-resource-name>
@@ -72,5 +72,5 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.properties b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.properties
index a1835d4..f0f891a 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/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="security"/>
<property name="app.type" value="application"/>
@@ -26,4 +26,4 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appname" value="rpaLoginBean"/>
+<property name="appname" value="rpaLoginBean"/> \u0020
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.xml b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.xml
index cbf8b6c..549a479 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/build.xml
@@ -33,25 +33,25 @@
&commonRun;
&testProperties;
&commonSecurity;
-
+
<target name="all" depends="build, setup, deploy,run, undeploy, unsetup"/>
<target name="setup" depends="init-common">
<property environment="env"/>
- <echo message="file=${env.S1AS_HOME}/domains/domain1/config/keyfile2" file="temp.txt"/>
- <replace file="temp.txt" token=":" value="\:"/>
- <replace file="temp.txt" token="\" value="\\"/>
- <loadproperties srcFile="temp.txt"/>
+ <echo message="file=${env.S1AS_HOME}/domains/domain1/config/keyfile2" file="temp.txt"/>
+ <replace file="temp.txt" token=":" value="\:"/>
+ <replace file="temp.txt" token="\" value="\\"/>
+ <loadproperties srcFile="temp.txt"/>
<echo message="${file}"/>
<delete file="temp.txt"/>
-
+
<antcall target="asadmin-common">
<param name="admin.command" value="create-auth-realm" />
<param name="operand.props" value="--classname com.sun.enterprise.security.auth.realm.file.FileRealm --property file=${file}:jaas-context=fileRealm file2"/>
</antcall>
<!-- <antcall target="reconfig-common"/>-->
- <echo message="Creating user with an @ symbol: harpreet@foobar.com"/>
+ <echo message="Creating user with an @ symbol: harpreet@foobar.com"/>
<antcall target="create-user-common">
<param name="user" value="harpreet@foobar.com"/>
<param name="password" value="harpreet"/>
@@ -89,7 +89,7 @@
</target>
<target name="build" depends="compile">
-<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
+<!-- <property name="ejbjar.classes" value="**/*Home*.class,**/*Bean*.class,**/*Data*.class,*.dbschema"/>
-->
<antcall target="build-ear-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
index 2ffc42a..2356d26 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
@@ -38,31 +38,31 @@
RpaClient client = new RpaClient(args);
client.doTest();
}
-
+
public RpaClient(String[] args) {
//super(args);
}
-
+
public String doTest() {
-
- RpaRemote hr=null;
+
+ RpaRemote hr=null;
String res=null;
Context ic = null;
LoginContext lc=null;
RpaHome home=null;
String testId = "Sec::Username with @";
- try{
+ try{
stat.addDescription("Security::Username with @");
- ic = new InitialContext();
- // create EJB using factory from container
+ ic = new InitialContext();
+ // create EJB using factory from container
java.lang.Object objref = ic.lookup("rpaLoginBean");
-
- System.err.println("Looked up home!!");
-
- home = (RpaHome)PortableRemoteObject.narrow(
- objref, RpaHome.class);
- System.err.println("Narrowed home!!");
-
+
+ System.err.println("Looked up home!!");
+
+ home = (RpaHome)PortableRemoteObject.narrow(
+ objref, RpaHome.class);
+ System.err.println("Narrowed home!!");
+
hr = home.create("LizHurley");
System.out.println("Got the EJB!!");
@@ -88,11 +88,11 @@
stat.addStatus(testId, stat.FAIL);
System.out.println("Username with @:RpaLoginBean Test Failed");
System.exit(-1);
- } finally {
+ } finally {
stat.printSummary();
}
return res;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
index 4b53bd4..660b7c3 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
@@ -36,26 +36,26 @@
*/
public class RpaBean implements SessionBean {
-
+
private String shopper = "anonymous";
private String principal = "harpreet@foobar.com";
private int totalPrice = 0;
-
+
private int totalItems = 0;
-
+
private Vector items;
-
+
private Vector itemPrice;
-
+
private SessionContext sc = null;
-
+
/** Creates a new instance of ShoppingEJB */
public void ejbCreate(String shopperName) {
shopper = shopperName;
items = new Vector();
itemPrice = new Vector();
}
-
+
public void addItem(java.lang.String item, int price) throws EJBException,
RemoteException{
checkCallerPrincipal();
@@ -67,26 +67,26 @@
+ item +" for price ="+ price +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
}
-
- public void deleteItem(java.lang.String item) throws EJBException,
+
+ public void deleteItem(java.lang.String item) throws EJBException,
RemoteException{
checkCallerPrincipal();
int index = items.indexOf(item);
items.remove(item);
Integer price = (Integer) itemPrice.get(index);
- System.out.println("Shopping Cart: Removing item "+ item +" @price "+
+ System.out.println("Shopping Cart: Removing item "+ item +" @price "+
price.intValue());
totalPrice -= price.shortValue();
- itemPrice.remove(index);
+ itemPrice.remove(index);
System.out.println(" Shopping Cart: Shopper "+ shopper +" .Total Items = "+totalItems +
" .TotalPrice = " + totalPrice);
}
-
+
public double getTotalCost() throws EJBException{
checkCallerPrincipal();
return totalPrice;
}
-
+
public String[] getItems() throws EJBException{
checkCallerPrincipal();
@@ -98,26 +98,26 @@
}
return itemNames;
}
-
+
public void ejbActivate() {
System.out.println("In Rpa ejbActivate");
}
-
-
+
+
public void ejbPassivate() {
System.out.println("In Rpa ejbPassivate");
}
-
-
+
+
public void ejbRemove() {
System.out.println("In Rpa ejbRemove");
}
-
-
+
+
public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
sc = sessionContext;
}
-
+
private void checkCallerPrincipal() throws EJBException {
System.out.println("Caller Princial = " + sc.getCallerPrincipal() +
" comparing against " + principal);
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
index d4262d0..c993090 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
@@ -28,8 +28,8 @@
* @author Harpreet Singh
*/
public interface RpaHome extends EJBHome{
-
- public RpaRemote create(java.lang.String shopperName)
+
+ public RpaRemote create(java.lang.String shopperName)
throws java.rmi.RemoteException, jakarta.ejb.CreateException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
index fb8a773..43a3991 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
@@ -23,17 +23,17 @@
package shopping;
import jakarta.ejb.EJBObject;
/**
- * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
+ * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name
* -Dj2eelogin.password system properties.
* @author hsingh
*/
public interface RpaRemote extends EJBObject {
-
+
public void addItem(java.lang.String item, int price) throws java.rmi.RemoteException;
-
+
public void deleteItem(java.lang.String item) throws java.rmi.RemoteException;
-
+
public double getTotalCost() throws java.rmi.RemoteException;
-
+
public java.lang.String[] getItems() throws java.rmi.RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/WebSSLClient.java b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/WebSSLClient.java
index bb4f565..e99de6e 100644
--- a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/WebSSLClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/WebSSLClient.java
@@ -33,7 +33,7 @@
public class WebSSLClient {
private static final String TEST_NAME
- = "security-web-mutual-ssl";
+ = "security-web-mutual-ssl";
private static final String EXPECTED_RESPONSE
= "[Ljava.security.cert.X509Certificate;";
@@ -52,7 +52,7 @@
String sslPassword = args[5];
System.out.println("host/port=" + host + "/" + port);
-
+
try {
stat.addDescription(TEST_NAME);
SSLSocketFactory ssf = getSSLSocketFactory(sslPassword,
@@ -62,9 +62,9 @@
+ port + contextRoot
+ "/TestClientCert",
ssf);
-
+
parseResponse(connection);
-
+
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
t.printStackTrace();
@@ -81,7 +81,7 @@
try {
in = new BufferedReader(new InputStreamReader(
connection.getInputStream()));
-
+
String line = null;
while ((line = in.readLine()) != null) {
if (EXPECTED_RESPONSE.equals(line)) {
@@ -111,7 +111,7 @@
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = sslPassword.toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -125,7 +125,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.properties b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.properties
index 778c06d..7626c48 100644
--- a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web-mutual-ssl"/>
<property name="appname" value="${module}" />
@@ -27,6 +27,6 @@
<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="appname" value="statefulLoginBean"/>
+<property name="appname" value="statefulLoginBean"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.xml b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.xml
index 24ba176..09502bd 100644
--- a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/build.xml
@@ -33,7 +33,7 @@
&commonRun;
&commonSecurity;
&testProperties;
-
+
<target name="all" depends="build, setup, deploy, run, undeploy, unsetup"/>
<target name="clean" depends="init-common">
<delete dir="${build.classes.dir}"/>
@@ -50,10 +50,10 @@
</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>
</target>
@@ -100,7 +100,7 @@
<antcall target="generate-ca-client-certs-ee" />
<antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="unsetup">
<antcall target="restore"/>
</target>
@@ -148,11 +148,11 @@
</exec>
</target>
-<!--
+<!--
generate selfsigned CA cert testca, and testcert1(issued by/signed by testca) in ${nss.db.dir};
export testca to testca.rfc and then import to ${mytruststore.db.file};
export testcert1 to testcert.p12 and then import it to ${mykeystore.db.file}.
--->
+-->
<target name="generate-ca-client-certs-ee" depends="init-common" if="isNSS">
<mkdir dir="build"/>
<echo message="${ssl.password}" file="build/passfile"/>
@@ -204,7 +204,7 @@
<env key="LD_LIBRARY_PATH" path="${env.S1AS_HOME}/lib"/>
<arg line="-D -n testcert1 -d ${nss.db.dir}"/>
</exec>
-
+
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/descriptor/web.xml
index 3c6a6eb..d627531 100644
--- a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/descriptor/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>TestClientCert</display-name>
<servlet-name>TestClientCert</servlet-name>
<servlet-class>devtests.security.TestClientCert</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestClientCert</servlet-name>
<url-pattern>/TestClientCert</url-pattern>
@@ -36,7 +36,7 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
+ <web-resource-name>Protected Area</web-resource-name>
<url-pattern>/TestClientCert</url-pattern>
<http-method>DELETE</http-method>
<http-method>GET</http-method>
diff --git a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/servlet/TestClientCert.java b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/servlet/TestClientCert.java
index 00183d2..a79b03a 100644
--- a/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/servlet/TestClientCert.java
+++ b/appserver/tests/appserv-tests/devtests/security/web-mutual-ssl/servlet/TestClientCert.java
@@ -34,9 +34,9 @@
if (certs != null) {
for (X509Certificate cert : certs) {
getServletContext().log(cert.toString());
- }
+ }
clName = certs.getClass().getName();
- } else {
+ } else {
clName = "cert is null";
}
res.getWriter().print(clName);
diff --git a/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.properties b/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.properties
index 294f235..5f8ba3c 100644
--- a/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/weblogic-dd/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="weblogic-dd"/>
<property name="appname" value="${module}" />
diff --git a/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.xml b/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.xml
index 1152563..6fb7955 100644
--- a/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/weblogic-dd/build.xml
@@ -46,7 +46,7 @@
<target name="display-header">
<echo message="-->Running ${ant.project.name} tests from ${basedir} ..."/>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="create-user-common">
<param name="user" value="wlUser"/>
@@ -76,7 +76,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
@@ -114,7 +114,7 @@
</jar>
</target>
- <!-- variables needed by custom-build
+ <!-- variables needed by custom-build
1. wlpass
2. wluser
3. wlrole
@@ -178,7 +178,7 @@
<param name="wlrole" value="weblogic-app-xml"/>
</antcall>
</target>
-
+
<target name="run-negative" depends="init-common">
<antcall target="custom-neg-run">
<param name="wluser" value="wlUser"/>
@@ -193,7 +193,7 @@
<param name="wlrole" value="weblogic-app-xml"/>
</antcall>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/build.xml
index 76f9804..8acb250 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/build.xml
@@ -34,7 +34,7 @@
<target name="all">
<record name="security-wss.output" action="start" />
- <ant dir="encThenSign-default-conf" target="all"/>
+ <ant dir="encThenSign-default-conf" target="all"/>
<ant dir="permethod" target="all"/>
<!-- JWS 2.0 -->
@@ -44,6 +44,6 @@
<!-- <ant dir="ssl" target="all"/>-->
<!-- <ant dir="sslclientcert" target="all"/>-->
- <record name="security-wss.output" action="stop" />
+ <record name="security-wss.output" action="stop" />
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml
index fc7af03..21d3dab 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml
@@ -35,114 +35,114 @@
<!-- ======== Targets by execution granularity ========== -->
<target name="all">
- <antcall target="setup"/>
+ <antcall target="setup"/>
<antcall target="runwstargets">
<param name="ws-target" value="all"/>
</antcall>
- <antcall target="unsetup"/>
+ <antcall target="unsetup"/>
</target>
-
+
<target name="run-test">
<antcall target="runwstargets">
<param name="ws-target" value="run-test"/>
</antcall>
</target>
-
+
<target name="clean">
<antcall target="runwstargets">
<param name="ws-target" value="clean"/>
</antcall>
</target>
-
+
<target name="build">
<antcall target="runwstargets">
<param name="ws-target" value="build"/>
</antcall>
</target>
-
+
<target name="deploy">
<antcall target="runwstargets">
<param name="ws-target" value="deploy"/>
</antcall>
</target>
-
+
<target name="undeploy">
<antcall target="runwstargets">
<param name="ws-target" value="undeploy"/>
</antcall>
</target>
-
+
<target name="run">
<antcall target="runwstargets">
<param name="ws-target" value="run"/>
</antcall>
</target>
-
+
<target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
+ <!-- exports certdb stuff and imports into keystore -->
+ <antcall target="prepare-store-nickname-common">
<param name="cert.nickname" value="s1as"/>
</antcall>
- <antcall target="enable-wss-message-security-provider">
+ <antcall target="enable-wss-message-security-provider">
<param name="wss.server.provider.name" value="ServerProvider"/>
<param name="wss.client.provider.name" value="ClientProvider"/>
</antcall>
- <antcall target="set-wss-provider-request-auth-recipient">
+ <antcall target="set-wss-provider-request-auth-recipient">
<param name="wss.provider.name" value="ServerProvider"/>
<param name="request.auth.recipient" value="before-content"/>
</antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
+ <antcall target="set-wss-provider-response-auth-recipient">
<param name="wss.provider.name" value="ServerProvider"/>
<param name="response.auth.recipient" value="after-content"/>
</antcall>
- <antcall target="set-wss-provider-request-auth-recipient">
+ <antcall target="set-wss-provider-request-auth-recipient">
<param name="wss.provider.name" value="ClientProvider"/>
<param name="request.auth.recipient" value="before-content"/>
</antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
+ <antcall target="set-wss-provider-response-auth-recipient">
<param name="wss.provider.name" value="ClientProvider"/>
<param name="response.auth.recipient" value="after-content"/>
</antcall>
- <antcall target="backup-glassfish-acc.xml"/>
- <antcall target="enable-wss-appclient-message-security-provider">
+ <antcall target="backup-glassfish-acc.xml"/>
+ <antcall target="enable-wss-appclient-message-security-provider">
<param name="wss.client.provider.name" value="ClientProvider"/>
</antcall>
- <antcall target="set-wss-appclient-request-recipient">
+ <antcall target="set-wss-appclient-request-recipient">
<param name="request.auth.recipient" value="before-content"/>
</antcall>
- <antcall target="set-wss-appclient-response-recipient">
+ <antcall target="set-wss-appclient-response-recipient">
<param name="response.auth.recipient" value="after-content"/>
</antcall>
<antcall target="restart-server-instance-common" />
</target>
-
+
<target name="unsetup" depends="init-common" >
- <antcall target="set-wss-provider-request-auth-recipient">
+ <antcall target="set-wss-provider-request-auth-recipient">
<param name="wss.provider.name" value="ServerProvider"/>
<param name="request.auth.recipient" value=""/>
</antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
+ <antcall target="set-wss-provider-response-auth-recipient">
<param name="wss.provider.name" value="ServerProvider"/>
<param name="response.auth.recipient" value=""/>
</antcall>
- <antcall target="set-wss-provider-request-auth-recipient">
+ <antcall target="set-wss-provider-request-auth-recipient">
<param name="wss.provider.name" value="ClientProvider"/>
<param name="request.auth.recipient" value=""/>
</antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
+ <antcall target="set-wss-provider-response-auth-recipient">
<param name="wss.provider.name" value="ClientProvider"/>
<param name="response.auth.recipient" value=""/>
</antcall>
- <antcall target="disable-wss-message-security-provider"/>
- <antcall target="disable-wss-appclient-message-security-provider">
+ <antcall target="disable-wss-message-security-provider"/>
+ <antcall target="disable-wss-appclient-message-security-provider">
<param name="wss.client.provider.name" value="ClientProvider"/>
</antcall>
- <antcall target="unset-wss-appclient-request-recipient">
+ <antcall target="unset-wss-appclient-request-recipient">
<param name="request.auth.recipient" value="before-content"/>
</antcall>
- <antcall target="unset-wss-appclient-response-recipient">
+ <antcall target="unset-wss-appclient-response-recipient">
<param name="response.auth.recipient" value="after-content"/>
</antcall>
<antcall target="restart-server-instance-common" />
@@ -161,7 +161,7 @@
<record name="security-wss.output" action="stop" />
</target>
<target name="usage">
- <echo> Usage:
+ <echo> Usage:
======== Targets by execution granularity =========
ant clean (Cleans all ws tests)
@@ -178,11 +178,11 @@
ant all (Executes all the ws tests)
===== Targets by technoloy and execution granularity ======
- Note: Run the command of the following type:
+ Note: Run the command of the following type:
% ant servletws -Dws-target=clean
to run the 'clean' target for 'servletws' tests
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties
index 617b4fa..7ac4878 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ws"/>
-<property name="appname" value="${module}-taxcal"/>
+<property name="appname" value="${module}-taxcal"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client.TaxCalClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client.TaxCalClient"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="wsdl-file" value="wsdl/TaxCalServletService.wsdl"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml
index 8ea11c1..84ecb2a 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml
@@ -31,10 +31,10 @@
&testproperties;
&commonSecurity;
- <target name="all"
+ <target name="all"
depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
-
- <target name="run-test"
+
+ <target name="run-test"
depends="clean, build, deploy, run, undeploy"/>
<target name="clean" depends="init-common">
@@ -55,14 +55,14 @@
</target>
<target name="generate-artifacts">
- <echo message=" Client Mapping file : ${client-mapping.xml}"/>
+ <echo message=" Client Mapping file : ${client-mapping.xml}"/>
<antcall target="import-wsdl">
<param name="mapping.file"
value="${client-mapping.xml}"/>
<param name="config-wsdl.file"
value="config/config-client.xml"/>
</antcall>
- <echo message="Web Mapping File : ${web-mapping.xml}"/>
+ <echo message="Web Mapping File : ${web-mapping.xml}"/>
<antcall target="import-wsdl">
<param name="mapping.file"
value="${web-mapping.xml}"/>
@@ -137,67 +137,67 @@
</target>
<target name="build" depends="init-common,compile">
- <antcall target="ws-package-appclientjar-common">
- <param name="appclientjar.classes"
+ <antcall target="ws-package-appclientjar-common">
+ <param name="appclientjar.classes"
value="com/sun/s1asdev/security/wss/defprovider/servlet/taxcal/client/*.class" />
<param name="appclientjar.files"
value="${build.classes.dir}"/>
<param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- </antcall>
- <!--antcall target="ws-war-common"-->
- <antcall target="ws-package-war-common">
+ </antcall>
+ <!--antcall target="ws-war-common"-->
+ <antcall target="ws-package-war-common">
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- <param name="war.classes"
+ <param name="war.classes"
value="com/sun/s1asdev/security/wss/defprovider/servlet/taxcal/*.class" />
- <param name="mappingfile.name"
+ <param name="mappingfile.name"
value="${web-mapping.xml}" />
- <param name="mappingfile.location"
+ <param name="mappingfile.location"
value="${build.classes.dir}"/>
- <param name="webservices.xml"
+ <param name="webservices.xml"
value="${web-webservices.xml}" />
- </antcall>
+ </antcall>
<antcall target="ear-common"/>
- </target>
+ </target>
<target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <property name="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <property name="statetax-endpoint-url"
+ <property name="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
+ <property name="statetax-endpoint-url"
value="http://${http.host}:${http.port}/TaxCalWSServlet/statetaxservlet"/>
- <echo message="State Tax Endpoint URL = ${statetax-endpoint-url}"/>
- <property name="fedtax-endpoint-url"
+ <echo message="State Tax Endpoint URL = ${statetax-endpoint-url}"/>
+ <property name="fedtax-endpoint-url"
value="http://${http.host}:${http.port}/TaxCalWSServlet/fedtaxservlet"/>
- <echo message="Fed Tax Endpoint URL = ${fedtax-endpoint-url}"/>
- <echo message="VMARGS= ${VMARGS}"/>
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="${VMARGS}"/>
- <arg value="-client" />
- <arg value="${assemble.dir}/${appname}AppClient.jar"/>
- <arg value="-textauth"/>
- <arg value="-user"/>
- <arg value="j2ee"/>
- <arg value="-password"/>
- <arg value="j2ee"/>
- <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line="${statetax-endpoint-url} ${fedtax-endpoint-url}"/>
+ <echo message="Fed Tax Endpoint URL = ${fedtax-endpoint-url}"/>
+ <echo message="VMARGS= ${VMARGS}"/>
+ <exec executable="${APPCLIENT}">
+ <env key="VMARGS" value="${VMARGS}"/>
+ <arg value="-client" />
+ <arg value="${assemble.dir}/${appname}AppClient.jar"/>
+ <arg value="-textauth"/>
+ <arg value="-user"/>
+ <arg value="j2ee"/>
+ <arg value="-password"/>
+ <arg value="j2ee"/>
+ <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
+ <arg line="${statetax-endpoint-url} ${fedtax-endpoint-url}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
- <!--
- =======================================================
+ <!--
+ =======================================================
User Defined specific targets
=======================================================
-->
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java
index b77dde3..b55a039 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/client/TaxCalClient.java
@@ -24,95 +24,95 @@
public class TaxCalClient {
- private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
- private static String stateTaxEndpoint = null;
- private static String fedTaxEndpoint = null;
- private static String testSuite = "Sec::Servlet_Based_WSS_test Encrypt then Sign";
- private static String testCase = null;
- private static TaxCalServletService taxCalService = null;
+ private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
+ private static String stateTaxEndpoint = null;
+ private static String fedTaxEndpoint = null;
+ private static String testSuite = "Sec::Servlet_Based_WSS_test Encrypt then Sign";
+ private static String testCase = null;
+ private static TaxCalServletService taxCalService = null;
- public static void main (String[] args) {
+ public static void main (String[] args) {
- if(args[0] == null || args[1] == null){
- System.out.println("TaxCal client: Argument missing. Please provide target" +
- "endpoint address as argument");
- System.exit(1);
- } else {
- stateTaxEndpoint = args[0];
- fedTaxEndpoint = args[1];
- }
+ if(args[0] == null || args[1] == null){
+ System.out.println("TaxCal client: Argument missing. Please provide target" +
+ "endpoint address as argument");
+ System.exit(1);
+ } else {
+ stateTaxEndpoint = args[0];
+ fedTaxEndpoint = args[1];
+ }
- stat.addDescription(testSuite);
- try {
- TaxCalClient client = new TaxCalClient();
- Context ic = new InitialContext();
- taxCalService = (TaxCalServletService)
- ic.lookup("java:comp/env/service/TaxCalServletService");
+ stat.addDescription(testSuite);
+ try {
+ TaxCalClient client = new TaxCalClient();
+ Context ic = new InitialContext();
+ taxCalService = (TaxCalServletService)
+ ic.lookup("java:comp/env/service/TaxCalServletService");
- client.callStateTaxService();
- client.callFedTaxService();
- stat.addStatus(testSuite, stat.PASS);
- }catch(Exception e){
- stat.addStatus(testSuite, stat.FAIL);
- e.printStackTrace();
- }
+ client.callStateTaxService();
+ client.callFedTaxService();
+ stat.addStatus(testSuite, stat.PASS);
+ }catch(Exception e){
+ stat.addStatus(testSuite, stat.FAIL);
+ e.printStackTrace();
+ }
- stat.printSummary(testSuite);
+ stat.printSummary(testSuite);
}
-
- public void callStateTaxService() {
- double income = 85000.00;
- double deductions = 5000.00;
- //String targetEndpointAddress =
- // "http://localhost:1024/taxcalculator";
+ public void callStateTaxService() {
+ double income = 85000.00;
+ double deductions = 5000.00;
- try {
+ //String targetEndpointAddress =
+ // "http://localhost:1024/taxcalculator";
- StateTaxIF taxCalIFPort = taxCalService.getStateTaxIFPort();
+ try {
- ((Stub)taxCalIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- stateTaxEndpoint);
+ StateTaxIF taxCalIFPort = taxCalService.getStateTaxIFPort();
- double stateTax = taxCalIFPort.getStateTax(income, deductions);
- System.out.println("State tax from servlet based TaxCalService :" + stateTax);
+ ((Stub)taxCalIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
+ stateTaxEndpoint);
- if(stateTax == 24000.00)
- stat.addStatus(testSuite + " StateTaxPort", stat.PASS);
- else
- stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
+ double stateTax = taxCalIFPort.getStateTax(income, deductions);
+ System.out.println("State tax from servlet based TaxCalService :" + stateTax);
- } catch (Exception ex) {
- System.out.println("TaxCalEjbWebservice client failed");
- stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
- ex.printStackTrace();
- }
- }
+ if(stateTax == 24000.00)
+ stat.addStatus(testSuite + " StateTaxPort", stat.PASS);
+ else
+ stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
- public void callFedTaxService() {
- double income = 97000.00;
- double deductions = 7000.00;
- try {
- //String targetEndpointAddress =
- //"http://localhost:1024/FindInterestServlet/FindInterest";
+ } catch (Exception ex) {
+ System.out.println("TaxCalEjbWebservice client failed");
+ stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
+ ex.printStackTrace();
+ }
+ }
- FedTaxIF taxCalIFPort = taxCalService.getFedTaxIFPort();
- ((Stub)taxCalIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- fedTaxEndpoint);
+ public void callFedTaxService() {
+ double income = 97000.00;
+ double deductions = 7000.00;
+ try {
+ //String targetEndpointAddress =
+ //"http://localhost:1024/FindInterestServlet/FindInterest";
- double fedTax = taxCalIFPort.getFedTax(income, deductions);
- System.out.println("Fed tax from Servlet based TaxCalService :" + fedTax);
+ FedTaxIF taxCalIFPort = taxCalService.getFedTaxIFPort();
+ ((Stub)taxCalIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
+ fedTaxEndpoint);
- if(fedTax == 18000.00)
- stat.addStatus(testSuite + " FedTaxPort", stat.PASS);
- else
- stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
-
- } catch (Exception ex) {
- System.out.println("TaxCalServletWebService client failed");
- stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
- ex.printStackTrace();
- }
- }
+ double fedTax = taxCalIFPort.getFedTax(income, deductions);
+ System.out.println("Fed tax from Servlet based TaxCalService :" + fedTax);
+
+ if(fedTax == 18000.00)
+ stat.addStatus(testSuite + " FedTaxPort", stat.PASS);
+ else
+ stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
+
+ } catch (Exception ex) {
+ System.out.println("TaxCalServletWebService client failed");
+ stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
+ ex.printStackTrace();
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml
index d52f02c..e998508 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="wsdl/TaxCalServletService.wsdl"
packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml
index 3e39b67..cf80e0e 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml
@@ -18,16 +18,16 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="TaxCalServletService"
- targetNamespace="http://tax.org/wsdl"
- typeNamespace="http://tax.org/types"
- packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal">
- <interface name="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxIF"
- servantName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxServlet"/>
- <interface name="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxIF"
- servantName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxServlet">
- </interface>
- </service>
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ <service name="TaxCalServletService"
+ targetNamespace="http://tax.org/wsdl"
+ typeNamespace="http://tax.org/types"
+ packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal">
+ <interface name="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxIF"
+ servantName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxServlet"/>
+ <interface name="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxIF"
+ servantName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxServlet">
+ </interface>
+ </service>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml
index 9e06706..4b01e8b 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="wsdl/TaxCalServletService.wsdl"
packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java
index bb8b48a..01e6822 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxIF.java
@@ -22,6 +22,6 @@
public interface FedTaxIF extends Remote{
- public double getFedTax(double income, double deductions) throws RemoteException;
+ public double getFedTax(double income, double deductions) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java
index 6319458..029d0eb 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/FedTaxServlet.java
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
import jakarta.servlet.SingleThreadModel;
-public class FedTaxServlet implements
- SingleThreadModel, ServiceLifecycle {
+public class FedTaxServlet implements
+ SingleThreadModel, ServiceLifecycle {
public FedTaxServlet() {
System.out.println("FedTaxServlet() instantiated");
@@ -44,7 +44,7 @@
}
public double getFedTax(double income, double deductions) {
- System.out.println("getStateTax invoked from servlet endpoint");
- return ((income - deductions) * 0.2);
+ System.out.println("getStateTax invoked from servlet endpoint");
+ return ((income - deductions) * 0.2);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java
index 3a75d27..cc4f07a 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxIF.java
@@ -22,6 +22,6 @@
public interface StateTaxIF extends Remote{
- public double getStateTax(double income, double deductions) throws RemoteException;
+ public double getStateTax(double income, double deductions) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java
index 7a51b2b..938b7e7 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/web/StateTaxServlet.java
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
import jakarta.servlet.SingleThreadModel;
-public class StateTaxServlet implements
- SingleThreadModel, ServiceLifecycle {
+public class StateTaxServlet implements
+ SingleThreadModel, ServiceLifecycle {
public StateTaxServlet() {
System.out.println("StateTaxServlet() instantiated");
@@ -44,7 +44,7 @@
}
public double getStateTax(double income, double deductions) {
- System.out.println("getStateTax invoked from servlet endpoint");
- return ((income - deductions) * 0.3);
+ System.out.println("getStateTax invoked from servlet endpoint");
+ return ((income - deductions) * 0.3);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.properties
index bc1760c..9d80293 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/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="security-wss-gartner"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
index 38a896d..1dd8eb0 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
@@ -95,7 +95,7 @@
<target name="build" depends="compile">
<delete file="${assemble.dir}/${appname}.ear"/>
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -103,7 +103,7 @@
<param name="ejbjar.classes" value="com/sun/**/*.class"/>
</antcall>
- <copy file="${sun-web.xml}" tofile="${build.classes.dir}/servletws/WEB-INF/sun-web.xml" failonerror="true"/>
+ <copy file="${sun-web.xml}" tofile="${build.classes.dir}/servletws/WEB-INF/sun-web.xml" failonerror="true"/>
<jar destfile="${assemble.dir}/${appname}-web.war">
<fileset dir="${build.classes.dir}/servletws"/>
</jar>
@@ -123,19 +123,19 @@
</metainf>
</jar>
- <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"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <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"/>
+ <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"/>
</fileset>
<fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
- </jar>
+ </jar>
</target>
<target name="deploy" depends="init-common">
@@ -149,8 +149,8 @@
<env key="VMARGS" value="${VMARGS}"/>
<arg line="-client" />
<arg line="${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="${http.host}"/>
- <arg line="${http.port}"/>
+ <arg line="${http.host}"/>
+ <arg line="${http.port}"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/client/PingClient.java b/appserver/tests/appserv-tests/devtests/security/wss/gartner/client/PingClient.java
index a8bb4e1..b331e85 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/client/PingClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/client/PingClient.java
@@ -41,7 +41,7 @@
((BindingProvider)pingEjbPort).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://" + host + ":" + port +
+ "http://" + host + ":" + port +
"/PingEjbService/PingEjb?WSDL");
String result = pingEjbPort.ping("Hello");
@@ -60,7 +60,7 @@
((BindingProvider)pingServletPort).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://" + host + ":" + port +
+ "http://" + host + ":" + port +
"/security-wss-gartner-web/PingServletService?WSDL");
String result = pingServletPort.ping("Hello");
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client.xml
index 693e7fc..4f07511 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client2.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client2.xml
index a5fcde9..c4d3d09 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client2.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/custom-client2.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml
index 14c70c3..7d16e8e 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/descriptor/sun-application-client.xml
@@ -35,7 +35,7 @@
<message/>
<request-protection
auth-source="content" auth-recipient="after-content"/>
- <response-protection
+ <response-protection
auth-source="content" auth-recipient="after-content"/>
</message-security>
</message-security-binding>
@@ -55,7 +55,7 @@
<message/>
<request-protection
auth-source="content" auth-recipient="after-content"/>
- <response-protection
+ <response-protection
auth-source="content" auth-recipient="after-content"/>
</message-security>
</message-security-binding>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml
index 68db00d..62b5182 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml
@@ -35,56 +35,56 @@
<!-- ======== Targets by execution granularity ========== -->
<target name="all">
- <antcall target="setup"/>
+ <antcall target="setup"/>
<antcall target="runwstargets">
<param name="ws-target" value="all"/>
</antcall>
- <antcall target="unsetup"/>
+ <antcall target="unsetup"/>
</target>
-
+
<target name="run-test">
<antcall target="runwstargets">
<param name="ws-target" value="run-test"/>
</antcall>
</target>
-
+
<target name="clean">
<antcall target="runwstargets">
<param name="ws-target" value="clean"/>
</antcall>
</target>
-
+
<target name="build">
<antcall target="runwstargets">
<param name="ws-target" value="build"/>
</antcall>
</target>
-
+
<target name="deploy">
<antcall target="runwstargets">
<param name="ws-target" value="deploy"/>
</antcall>
</target>
-
+
<target name="undeploy">
<antcall target="runwstargets">
<param name="ws-target" value="undeploy"/>
</antcall>
</target>
-
+
<target name="run">
<antcall target="runwstargets">
<param name="ws-target" value="run"/>
</antcall>
</target>
-
+
<target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
+ <!-- exports certdb stuff and imports into keystore -->
+ <antcall target="prepare-store-nickname-common">
<param name="cert.nickname" value="s1as"/>
</antcall>
</target>
-
+
<target name="unsetup" depends="init-common" >
</target>
@@ -101,7 +101,7 @@
<record name="security-wss.output" action="stop" />
</target>
<target name="usage">
- <echo> Usage:
+ <echo> Usage:
======== Targets by execution granularity =========
ant clean (Cleans all ws tests)
@@ -118,11 +118,11 @@
ant all (Executes all the ws tests)
===== Targets by technoloy and execution granularity ======
- Note: Run the command of the following type:
+ Note: Run the command of the following type:
% ant servletws -Dws-target=clean
to run the 'clean' target for 'servletws' tests
- </echo>
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties
index 079b36b..e0783af 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties
@@ -15,19 +15,19 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="security-wss-permethod-servlet"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1asdev.security.wss.permethod.servlet.client.Client"/>
+<property name="test.client"\u0020
+ value="com.sun.s1asdev.security.wss.permethod.servlet.client.Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="wsdl-file" value="wsdl/HelloServletService.wsdl"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml
index 1a9be89..6fd0192 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml
@@ -31,10 +31,10 @@
&testproperties;
&commonSecurity;
- <target name="all"
+ <target name="all"
depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
- <target name="run-test"
+ <target name="run-test"
depends="clean, build, deploy, run, undeploy"/>
<target name="clean" depends="init-common">
@@ -65,14 +65,14 @@
</target>
<target name="generate-artifacts">
- <echo message=" Client Mapping file : ${client-mapping.xml}"/>
+ <echo message=" Client Mapping file : ${client-mapping.xml}"/>
<antcall target="import-wsdl">
<param name="mapping.file"
value="${client-mapping.xml}"/>
<param name="config-wsdl.file"
value="config/config-client.xml"/>
</antcall>
- <echo message="Web Mapping File : ${web-mapping.xml}"/>
+ <echo message="Web Mapping File : ${web-mapping.xml}"/>
<antcall target="import-wsdl">
<param name="mapping.file"
value="${web-mapping.xml}"/>
@@ -153,63 +153,63 @@
</target>
<target name="build" depends="init-common,compile">
- <antcall target="ws-package-appclientjar-common">
- <param name="appclientjar.classes"
+ <antcall target="ws-package-appclientjar-common">
+ <param name="appclientjar.classes"
value="com/sun/s1asdev/security/wss/permethod/servlet/client/*.class" />
<param name="appclientjar.files"
value="${build.classes.dir}"/>
<param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- </antcall>
- <!--antcall target="ws-war-common"-->
- <antcall target="ws-package-war-common">
+ </antcall>
+ <!--antcall target="ws-war-common"-->
+ <antcall target="ws-package-war-common">
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- <param name="war.classes"
+ <param name="war.classes"
value="com/sun/s1asdev/security/wss/permethod/servlet/*.class" />
- <param name="mappingfile.name"
+ <param name="mappingfile.name"
value="${web-mapping.xml}" />
- <param name="mappingfile.location"
+ <param name="mappingfile.location"
value="${build.classes.dir}"/>
- <param name="webservices.xml"
+ <param name="webservices.xml"
value="${web-webservices.xml}" />
- </antcall>
+ </antcall>
<antcall target="ear-common"/>
- </target>
+ </target>
<target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
- <property name="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <property name="hello-endpoint-url"
+ <property name="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
+ <property name="hello-endpoint-url"
value="http://${http.host}:${http.port}/${appname}/helloservlet"/>
- <echo message="VMARGS= ${VMARGS}"/>
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="${VMARGS}"/>
- <arg value="-client" />
- <arg value="${assemble.dir}/${appname}AppClient.jar"/>
- <arg value="-textauth"/>
- <arg value="-user"/>
- <arg value="j2ee"/>
- <arg value="-password"/>
- <arg value="j2ee"/>
- <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line="${hello-endpoint-url}"/>
+ <echo message="VMARGS= ${VMARGS}"/>
+ <exec executable="${APPCLIENT}">
+ <env key="VMARGS" value="${VMARGS}"/>
+ <arg value="-client" />
+ <arg value="${assemble.dir}/${appname}AppClient.jar"/>
+ <arg value="-textauth"/>
+ <arg value="-user"/>
+ <arg value="j2ee"/>
+ <arg value="-password"/>
+ <arg value="j2ee"/>
+ <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
+ <arg line="${hello-endpoint-url}"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
- <!--
- =======================================================
+ <!--
+ =======================================================
User Defined specific targets
=======================================================
-->
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java
index 58d5ccb..4592276 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/client/Client.java
@@ -37,9 +37,9 @@
}
stat.addDescription(testSuite);
-
+
HelloIF helloIFPort = null;
- try {
+ try {
Context ic = new InitialContext();
HelloServletService helloService = (HelloServletService)
ic.lookup("java:comp/env/service/HelloServletService");
@@ -54,7 +54,7 @@
stat.addStatus(testSuite + " sayHello", stat.FAIL);
e.printStackTrace();
}
-
+
try {
System.out.println("Calling sendSecret");
int code = helloIFPort.sendSecret("It is a secret");
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml
index 2f051d8..7118cee 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="wsdl/HelloServletService.wsdl"
packageName="com.sun.s1asdev.security.wss.permethod.servlet.client"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml
index eb69b7d..d8cac47 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml
@@ -18,14 +18,14 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="HelloServletService"
- targetNamespace="http://hello.org/wsdl"
- typeNamespace="http://hello.org/types"
- packageName="com.sun.s1asdev.security.wss.permethod.servlet">
- <interface name="com.sun.s1asdev.security.wss.permethod.servlet.HelloIF"
- servantName="com.sun.s1asdev.security.wss.permethod.servlet.HelloServlet"/>
- </interface>
- </service>
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ <service name="HelloServletService"
+ targetNamespace="http://hello.org/wsdl"
+ typeNamespace="http://hello.org/types"
+ packageName="com.sun.s1asdev.security.wss.permethod.servlet">
+ <interface name="com.sun.s1asdev.security.wss.permethod.servlet.HelloIF"
+ servantName="com.sun.s1asdev.security.wss.permethod.servlet.HelloServlet"/>
+ </interface>
+ </service>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml
index 4eb520f..d8a751d 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="wsdl/HelloServletService.wsdl"
packageName="com.sun.s1asdev.security.wss.permethod.servlet"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml
index e5b49c2..630e4e7 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml
@@ -35,24 +35,24 @@
<request-protection/>
<response-protection/>
</message-security>
- <message-security>
+ <message-security>
<message>
<operation-name>sendSecret</operation-name>
</message>
- <request-protection
+ <request-protection
auth-source="content"/>
- <response-protection
+ <response-protection
auth-source="content"/>
- </message-security>
- <message-security>
+ </message-security>
+ <message-security>
<message>
<operation-name>getSecret</operation-name>
</message>
- <request-protection
+ <request-protection
auth-source="sender"/>
- <response-protection
+ <response-protection
auth-source="content"/>
- </message-security>
+ </message-security>
</message-security-binding>
</port-info>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java
index f660cdf..560bff1 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/web/HelloServlet.java
@@ -19,8 +19,8 @@
import jakarta.servlet.SingleThreadModel;
import javax.xml.rpc.server.ServiceLifecycle;
-public class HelloServlet implements
- SingleThreadModel, ServiceLifecycle {
+public class HelloServlet implements
+ SingleThreadModel, ServiceLifecycle {
public HelloServlet() {
System.out.println("HelloServlet() instantiated");
@@ -43,7 +43,7 @@
System.out.println("sendSecret invoked from servlet endpoint");
return message.hashCode();
}
-
+
public String getSecret(double key) {
System.out.println("getSecret invoked from servlet endpoint");
return "Secret-" + key;
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties
index 5e82f84..331310a 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/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="security-wss-roles"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml
index ce7f3a1..ee74440 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml
@@ -79,7 +79,7 @@
</target>
<target name="compile-client">
- <mkdir dir="${build.classes.dir}/client"/>
+ <mkdir dir="${build.classes.dir}/client"/>
<antcall target="wsimport">
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WssRolesEjbService/HelloEjb?WSDL"/>
@@ -105,7 +105,7 @@
<target name="build-server" depends="compile-server">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -122,16 +122,16 @@
<classes dir="${build.classes.dir}/servletws"/>
</war>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
+ <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/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
<target name="build-client" depends="compile-client">
@@ -139,11 +139,11 @@
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/*.class"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
index 99ce593..5564a6c 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
@@ -55,7 +55,7 @@
public String rolesAllowed1(String who) {
return "Hello, " + who;
}
-
+
@RolesAllowed(value={"webuser"})
public String rolesAllowed2(String who) {
return "Hello, " + who;
@@ -69,7 +69,7 @@
@PermitAll
public String permitAll(String who) {
return "Hello, " + who;
- }
+ }
public String runAs1() {
return sful.hello();
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
index ba06231..d722d7d 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
@@ -27,7 +27,7 @@
public String rolesAllowed1(String who) {
return "Hello, " + who;
}
-
+
@RolesAllowed(value={"webuser"})
public String rolesAllowed2(String who) {
return "Hello, " + who;
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties
index 7f3642f..7097c0c 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/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="security-wss-roles2"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml
index 47196a6..04a70cb 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml
@@ -63,7 +63,7 @@
</target>
<target name="compile-client">
- <mkdir dir="${build.classes.dir}/client"/>
+ <mkdir dir="${build.classes.dir}/client"/>
<antcall target="wsimport">
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WssRoles2EjbService/HelloEjb?WSDL"/>
@@ -81,7 +81,7 @@
<target name="build-server" depends="compile-server">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -95,11 +95,11 @@
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/*.class"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
index c67cc18..467f0fa 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
@@ -51,7 +51,7 @@
public String rolesAllowed1(String who) {
return "Hello, " + who;
}
-
+
@RolesAllowed(value={"webuser"})
public String rolesAllowed2(String who) {
return "Hello, " + who;
@@ -65,7 +65,7 @@
@PermitAll
public String permitAll(String who) {
return "Hello, " + who;
- }
+ }
public String runAs1() {
return sful.hello();
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
index c13f90b..4f1faf8 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
@@ -27,7 +27,7 @@
@RunAs("j2ee")
public class SfulEJB implements SfulLocal {
@EJB private SlessLocal sless;
-
+
@RolesAllowed(value={"javaee"})
public String hello() {
return "hello from Sful";
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties
index 44c63f9..e91a248 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/ssl/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="security-wss-ssl"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml
index f4c1b50..214c112 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml
@@ -55,7 +55,7 @@
</target>
<target name="compile-client" depends="prepare-truststore-common, init-security-util">
- <mkdir dir="${build.classes.dir}/client"/>
+ <mkdir dir="${build.classes.dir}/client"/>
<antcall target="wsimport">
<!--value="-keep -d ${build.classes.dir}/client https://${s1asCN}:${https.port}/WssSslEjbService/HelloEjb?WSDL"/>-->
<param name="wsimport.VMARGS" value=" -Djavax.net.ssl.trustStore=${build.base.dir}/cacerts.jks -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
@@ -80,7 +80,7 @@
<target name="build-server" depends="compile-server">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -93,16 +93,16 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
</fileset>
<fileset dir="${build.classes.dir}">
- <include name="META-INF/application.xml"/>
+ <include name="META-INF/application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
<target name="build-client" depends="compile-client">
@@ -110,11 +110,11 @@
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/*.class"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties
index 2018a65..050c8b5 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties
+++ b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/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="security-wss-sslclientcert"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml
index 4a5ed3c..f203a72 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml
@@ -38,8 +38,8 @@
</target>
<target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
+ <!-- exports certdb stuff and imports into keystore -->
+ <antcall target="prepare-store-nickname-common">
<param name="cert.nickname" value="s1as"/>
</antcall>
</target>
@@ -59,7 +59,7 @@
</target>
<target name="compile-client" depends="init-common, init-security-util">
- <mkdir dir="${build.classes.dir}/client"/>
+ <mkdir dir="${build.classes.dir}/client"/>
<antcall target="wsimport">
<param name="wsimport.VMARGS" value=" -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
<param name="wsimport.args"
@@ -83,7 +83,7 @@
<target name="build-server" depends="compile-server, init-security-util">
<mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <mkdir dir="${build.classes.dir}/META-INF"/>
<antcall target="package-ejbjar-common">
<param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
@@ -100,17 +100,17 @@
<replace file="${build.classes.dir}/META-INF/sun-application.xml">
<replacefilter token="@HOST@" value="${s1asCN}"/>
</replace>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}">
<include name="*.jar"/>
<include name="*.war"/>
</fileset>
<fileset dir="${build.classes.dir}">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
</fileset>
- </jar>
+ </jar>
</target>
<target name="build-client" depends="compile-client">
@@ -118,11 +118,11 @@
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
+ <param name="appclientjar.files"
value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
+ <param name="appclient.jar"
value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="com/sun/**/*.class"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/build.properties
index 03c82b9..fedfa68 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/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="tx-ee-autorecovery"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/client/Client.java
index f4eb8bb..ec2a57c 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
index 783ea4f..585bdb2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
index c03af78..2a41352 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/build.properties
index df2228f..cc44e29 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/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="tx-ee-cli"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/client/Client.java
index 320d79e..cd91b5b 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
@@ -140,10 +140,10 @@
.append(File.separator).append(INSTANCE1_NAME).append(File.separator)
.append("logs").append(File.separator).append(INSTANCE1_NAME)
.append(File.separator).append("tx").toString();
- result = asadminWithOutput("recover-transactions", "--target", INSTANCE2_NAME,
- "--transactionlogdir", txLog, INSTANCE1_NAME);
+ result = asadminWithOutput("recover-transactions", "--target", INSTANCE2_NAME,
+ "--transactionlogdir", txLog, INSTANCE1_NAME);
} else {
- result = asadminWithOutput("recover-transactions", INSTANCE1_NAME);
+ result = asadminWithOutput("recover-transactions", INSTANCE1_NAME);
}
System.out.println("Executed command: " + result.out);
if (!result.returnValue) {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
index 783ea4f..585bdb2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
index c03af78..2a41352 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/common/ClientBase.java b/appserver/tests/appserv-tests/devtests/transaction/ee/common/ClientBase.java
index e37327e..ebf3966 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/common/ClientBase.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/common/ClientBase.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public abstract class ClientBase extends AdminBaseDevTest {
@@ -119,7 +119,7 @@
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
-
+
String line = null;
while ((line = input.readLine()) != null) {
System.out.println("Processing line: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/build.properties
index 478c6ca..ddda1c0 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/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="tx-ee-dblogs-base"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/client/Client.java
index 926b8de..bdbcfdb 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
index 783ea4f..585bdb2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
index c03af78..2a41352 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/build.properties
index 211bb35..0aea2c9 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/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="tx-ee-dblogs-mdb"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
index 8a23176..5ed1aac 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
index 3e310a3..7211e35 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
@@ -37,7 +37,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -46,7 +46,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.testtwo(req.getLocalPort(), false) : bean.testtwo(req.getLocalPort(), true)));
+ out.println("" + ((type == null)? bean.testtwo(req.getLocalPort(), false) : bean.testtwo(req.getLocalPort(), true)));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
index d501483..bc3efe7 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
@@ -37,7 +37,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -46,8 +46,8 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.verifyxa());
- //out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + bean.verifyxa());
+ //out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/build.properties
index 9bcbaaa..a4c4c80 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/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="tx-ee-mdb"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java
index 4bf4f0e..75de789 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
index bf5cdf3..ac08196 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
@@ -37,7 +37,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -46,8 +46,8 @@
out.println("</head>");
out.println("<body>");
try {
- //out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
- out.println("" + bean.testtwo(req.getLocalPort()));
+ //out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + bean.testtwo(req.getLocalPort()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
index d501483..bc3efe7 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
@@ -37,7 +37,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -46,8 +46,8 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + bean.verifyxa());
- //out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + bean.verifyxa());
+ //out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/build.properties
index f0b1dbf..08402b6 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/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="tx-ee-resendautorecovery"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/client/Client.java
index 3857e52..b0dce8b 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
index c583ce8..32389fe 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
System.err.println("RT: " + type);
@@ -53,7 +53,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
index c03af78..2a41352 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/build.properties
index f002a2e..6ed549c 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/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="tx-ee-selfrecovery"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/client/Client.java
index f8e28ab..7babab1 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
index 783ea4f..585bdb2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + ((type == null)? bean.testone(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
index c03af78..2a41352 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/build.properties b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/build.properties
index c6f4434..d5646af 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/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="tx-ee-timer-with-autorecovery"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/client/Client.java
index 3cc3d5f..49aaa9e 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/client/Client.java
@@ -24,7 +24,7 @@
import java.util.*;
/*
- * CLI Dev test
+ * CLI Dev test
* @author mvatkina
*/
public class Client extends ClientBase {
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
index d718521..8f1cc30 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("" + ((type == null)? bean.create_timer(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
+ out.println("" + ((type == null)? bean.create_timer(req.getLocalPort()) : bean.testtwo(req.getLocalPort())));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
index c03af78..2a41352 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
@@ -43,7 +43,7 @@
throws ServletException, IOException {
PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
+ resp.setContentType("text/html");
String type = req.getQueryString();
out.println("<html>");
@@ -52,7 +52,7 @@
out.println("</head>");
out.println("<body>");
try {
- out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
+ out.println("RESULT:" + ((type == null)? bean.verifydefault() : bean.verifyxa()));
}catch(Throwable e){
out.println("got exception");
out.println(e);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.properties b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.properties
index 919b09a..3e80f67 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -23,9 +23,9 @@
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appname" value="txglobal"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/txglobal-client.jar"/>
+<property name="appname" value="txglobal"/> \u0020
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
+<property name="appclient.jar" value="${assemble.dir}/txglobal-client.jar"/>\u0020
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
<property name="db.url1" value="jdbc:oracle:thin:@mig:1521:mig"/>
<property name="db.url2" value="jdbc:oracle:thin:@129.158.229.59:1521:ORCL9"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.xml b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.xml
index e9d5eaa..347740c 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common" />
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="ejb/beanB"/>
@@ -48,8 +48,8 @@
<target name="build" depends="compile">
<antcall target="build-ear-common"/>
- </target>
-
+ </target>
+
<target name="setup-pointbase" depends="init-common">
<antcall target="execute-sql-common">
<param name="sql.file" value="sql/create_pointbase.sql"/>
@@ -107,11 +107,11 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common"/>
</target>
-
+
<target name="unsetup-pointbase" depends="init-common">
<antcall target="delete-jdbc-resource-common">
<param name="jdbc.resource.name" value="jdbc/s1qeDB1"/>
@@ -130,7 +130,7 @@
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
<antcall target="execute-sql-common">
- <param name="db.url"
+ <param name="db.url"
value="jdbc:pointbase:server://${db.host}:9093/sun-appserv-samples"/>
<param name="sql.file" value="sql/drop_pointbase.sql"/>
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/client/Client.java
index 5327d24..081998f 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/client/Client.java
@@ -32,15 +32,15 @@
public Client() {
}
- public static void main(String[] args) {
- System.out.println("\nStarting Txglobal Test Suite");
- Client client = new Client();
+ public static void main(String[] args) {
+ System.out.println("\nStarting Txglobal Test Suite");
+ Client client = new Client();
// initialize the context and home object
client.setup();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void setup() {
@@ -73,7 +73,7 @@
}
public void test1() {
- try {
+ try {
System.out.println("Execute BeanB::test1");
TxRemoteB beanB = home.create();
@@ -82,7 +82,7 @@
if (result == 0) {
status.addStatus("txglobal test1: ", status.PASS);
- } else {
+ } else {
status.addStatus("txglobal test1: ", status.FAIL);
}
@@ -96,7 +96,7 @@
public void test2() {
TxRemoteB beanB = null;
- try {
+ try {
System.out.println("Execute BeanB::test2");
beanB = home.create();
@@ -105,7 +105,7 @@
if (result == 1) {
status.addStatus("txglobal test2: ", status.PASS);
- } else {
+ } else {
status.addStatus("txglobal test2: ", status.FAIL);
}
beanB.remove();
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/descriptor/ejb-jar.xml
index 4e1da59..d805965 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/descriptor/ejb-jar.xml
@@ -73,7 +73,7 @@
<method-name>test1</method-name>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>TxBeanB</ejb-name>
@@ -81,7 +81,7 @@
<method-name>test2</method-name>
</method>
<trans-attribute>Required</trans-attribute>
- </container-transaction>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>TxBeanB</ejb-name>
@@ -89,6 +89,6 @@
<method-name>getCommitStatus</method-name>
</method>
<trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
+ </container-transaction>
</assembly-descriptor>
</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
index 58273c2..b42a51c 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
@@ -36,14 +36,14 @@
private String dbURL1 = null;
private String dbURL2 = null;
private String password = null;
- private SessionContext ctx = null;
+ private SessionContext ctx = null;
private int commitStatus = 2; // 0 - commit, 1 - rollback, 2 - don't know
// ------------------------------------------------------------------------
// Container Required Methods
// ------------------------------------------------------------------------
public void setSessionContext(SessionContext sc) {
- System.out.println("setSessionContext in BeanB");
+ System.out.println("setSessionContext in BeanB");
try {
ctx = sc;
Context ic = new InitialContext();
@@ -59,23 +59,23 @@
}
public void ejbCreate() {
- System.out.println("ejbCreate in BeanB");
- }
+ System.out.println("ejbCreate in BeanB");
+ }
public void ejbDestroy() {
- System.out.println("ejbDestroy in BeanB");
+ System.out.println("ejbDestroy in BeanB");
}
public void ejbActivate() {
- System.out.println("ejbActivate in BeanB");
+ System.out.println("ejbActivate in BeanB");
}
-
+
public void ejbPassivate() {
- System.out.println("ejbPassivate in BeanB");
+ System.out.println("ejbPassivate in BeanB");
}
public void ejbRemove() {
- System.out.println("ejbRemove in BeanB");
+ System.out.println("ejbRemove in BeanB");
}
// ------------------------------------------------------------------------
@@ -88,7 +88,7 @@
Statement stmt2 = null;
ResultSet rs1 = null;
ResultSet rs2 = null;
- System.out.println("test1 in BeanB");
+ System.out.println("test1 in BeanB");
try {
con1 = getConnection(dbURL1);
stmt1 = con1.createStatement();
@@ -131,7 +131,7 @@
Statement stmt2 = null;
ResultSet rs1 = null;
ResultSet rs2 = null;
- System.out.println("test2 in BeanB");
+ System.out.println("test2 in BeanB");
try {
con1 = getConnection(dbURL1);
stmt1 = con1.createStatement();
@@ -194,7 +194,7 @@
private Connection getConnection(String dbURL) {
Connection con = null;
- System.out.println("getConnection in BeanB");
+ System.out.println("getConnection in BeanB");
try{
Context context = new InitialContext();
DataSource ds = (DataSource) context.lookup(dbURL);
@@ -203,7 +203,7 @@
System.out.println("Got DB Connection Successfully...");
} catch (Exception ex) {
System.out.println("Exception in getConnection: " + ex.toString());
- ex.printStackTrace();
+ ex.printStackTrace();
}
return con;
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/build.properties b/appserver/tests/appserv-tests/devtests/transaction/txhung/build.properties
index 214081e..cd2fb80 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -24,6 +24,6 @@
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
<property name="appname" value="txhung"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/txhung-client.jar"/>
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
index a9f38b2..6eee894 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
@@ -33,9 +33,9 @@
status = new SimpleReporterAdapter("appserv-tests");
}
-
+
public static void main(String[] args) {
- System.out.println("\nStarting Txglobal Test Suite");
+ System.out.println("\nStarting Txglobal Test Suite");
Client client = new Client();
// run the tests
@@ -43,7 +43,7 @@
}
public void runTestClient() {
- status.addDescription("This is to test the hung transaction!");
+ status.addDescription("This is to test the hung transaction!");
try {
System.out.println("START");
@@ -59,12 +59,12 @@
try {
result = t.testA1(xa);
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (Exception e) {
- System.out.println("TEST PASSED");
+ System.out.println("TEST PASSED");
// System.out.println(""+e.getMessage());
}
if (!result) {
@@ -72,16 +72,16 @@
} else {
status.addStatus("txhung testA1 ", status.FAIL);
}
- result = false;
+ result = false;
try {
result = t.testA1(nonxa);
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (Exception e) {
- System.out.println("TEST PASSED");
+ System.out.println("TEST PASSED");
// System.out.println(""+e.getMessage());
}
if (!result) {
@@ -99,6 +99,6 @@
ex.printStackTrace();
status.addStatus("txhung testA1 ", status.FAIL);
}
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/transaction/txhung/descriptor/ejb-jar.xml
index 043423d..a0c5246 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/descriptor/ejb-jar.xml
@@ -64,7 +64,7 @@
</session>
</enterprise-beans>
<assembly-descriptor>
- <container-transaction>
+ <container-transaction>
<method>
<ejb-name>TestHung</ejb-name>
<method-name>*</method-name>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
index 9fc0273..5350569 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
@@ -42,15 +42,15 @@
// SessionBean methods
-
- public void ejbCreate() throws CreateException {
- System.out.println("TestBean ejbCreate");
- }
-
+ public void ejbCreate() throws CreateException {
+ System.out.println("TestBean ejbCreate");
+
+ }
+
public void ejbActivate() {
System.out.println("TestBean ejbActivate");
- }
+ }
public void ejbPassivate() {
}
@@ -58,7 +58,7 @@
public void ejbRemove() {
}
-
+
public void setSessionContext(SessionContext sc) {
System.out.println("setSessionContext in BeanB");
try {
@@ -67,7 +67,7 @@
user = (String) ic.lookup("java:comp/env/user");
password = (String) ic.lookup("java:comp/env/password");
dbURL1XA = (String) ic.lookup("java:comp/env/dbURL1-XA");
- dbURL1NonXA = (String) ic.lookup("java:comp/env/dbURL1-NonXA");
+ dbURL1NonXA = (String) ic.lookup("java:comp/env/dbURL1-NonXA");
} catch (Exception ex) {
System.out.println("Exception in setSessionContext: " +ex.getMessage());
ex.printStackTrace();
@@ -78,35 +78,35 @@
public boolean testA1(boolean xa) throws CreateException {
- if(xa)
- resource = dbURL1XA;
+ if(xa)
+ resource = dbURL1XA;
else
- resource = dbURL1NonXA;
+ resource = dbURL1NonXA;
System.out.println("Executing the business method testA1");
- return true;
+ return true;
}
public void beforeCompletion() {
System.out.println("in beforeCompletion");
- Connection con1 = null;
+ Connection con1 = null;
System.out.println("insert in BeanB");
try {
con1 = getConnection(resource);
Statement stmt1 = con1.createStatement();
- String acc = "100";
+ String acc = "100";
float bal = 5000;
stmt1.executeUpdate("INSERT INTO txAccount VALUES ('" + acc + "', " + bal + ")");
System.out.println("Account added Successfully in "+resource+"...");
System.out.println("Rolling back the transaction");
- ctx.setRollbackOnly();
+ ctx.setRollbackOnly();
//return true;
} catch (Exception ex) {
System.out.println("Exception in insert: " + ex.toString());
ex.printStackTrace();
- //return false;
+ //return false;
} finally {
try {
con1.close();
@@ -140,4 +140,4 @@
-}
+}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
index a6a2dcb..9aad89a 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
@@ -20,6 +20,6 @@
import java.rmi.*;
public interface TestHome extends EJBHome {
-
+
TestRemote create() throws RemoteException, CreateException;
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
index 228c1f4..ca5d673 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
@@ -20,7 +20,7 @@
import java.rmi.*;
public interface TestRemote extends EJBObject {
-
+
public boolean testA1(boolean xa) throws CreateException, RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/build.properties b/appserver/tests/appserv-tests/devtests/transaction/txlao/build.properties
index d89a3b4..da97a2f 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -24,6 +24,6 @@
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
<property name="appname" value="txlao"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/txlao-client.jar"/>
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/client/Client.java
index 6881f90..bebb5be 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/client/Client.java
@@ -34,15 +34,15 @@
public Client() {
}
- public static void main(String[] args) {
- System.out.println("\nStarting Txglobal Test Suite");
- Client client = new Client();
+ public static void main(String[] args) {
+ System.out.println("\nStarting Txglobal Test Suite");
+ Client client = new Client();
// initialize the context and home object
client.setup();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void setup() {
@@ -255,7 +255,7 @@
}
}
public void testTxCommit() {
- try {
+ try {
System.out.println("Execute BeanA::testTxCommit");
TxRemoteA beanA = home.create();
@@ -263,7 +263,7 @@
if (result) {
status.addStatus("txlao testTxCommit: ", status.PASS);
- } else {
+ } else {
status.addStatus("txlao testTxCommit: ", status.FAIL);
}
@@ -276,7 +276,7 @@
}
public void testTxRollback() {
- try {
+ try {
System.out.println("Execute BeanA::testTxRollback");
TxRemoteA beanA = home.create();
@@ -284,7 +284,7 @@
if (result) {
status.addStatus("txlao testTxRollback: ", status.PASS);
- } else {
+ } else {
status.addStatus("txlao testTxRollback: ", status.FAIL);
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
index aeca033..593bc62 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
@@ -55,7 +55,7 @@
public void ejbRemove() {
System.out.println("ejbRemove in BeanA");
}
-
+
public void ejbDestroy() {
System.out.println("ejbDestroy in BeanA");
}
@@ -420,7 +420,7 @@
if ( (beanB == null) || (tx == null) ) {
throw new NullPointerException();
}
-
+
tx.begin();
beanB.delete("A1001");
beanB.insert("A1003", 8000);
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
index 144447f..178920f 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
@@ -508,7 +508,7 @@
System.out.println("Got DB Connection Successfully...");
} catch (Exception ex) {
System.out.println("Exception in getConnection: " + ex.toString());
- ex.printStackTrace();
+ ex.printStackTrace();
}
return con;
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txnegative/build.properties b/appserver/tests/appserv-tests/devtests/transaction/txnegative/build.properties
index c3ffd2a..eda43ba 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txnegative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/txnegative/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -24,6 +24,6 @@
<property name="application-client.xml" value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
<property name="appname" value="txnegative"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/txnegative-client.jar"/>
<property name="jdbc.resource.type" value="javax.sql.XADataSource"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
index 9009d47..7ca58a6 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
@@ -36,13 +36,13 @@
try{
userTransaction = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
}catch(Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
public static void main(String[] args) {
- System.out.println("\nStarting Txglobal Test Suite");
+ System.out.println("\nStarting Txglobal Test Suite");
Client client = new Client();
// run the tests
@@ -50,7 +50,7 @@
}
public void runTestClient() {
- status.addDescription("This is to test the valid transaction exception!");
+ status.addDescription("This is to test the valid transaction exception!");
try {
System.out.println("START");
@@ -66,28 +66,28 @@
try {
result = t.testA1(xa);
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (Exception e) {
- System.out.println("TEST PASSED");
+ System.out.println("TEST PASSED");
}
if (!result) {
status.addStatus("txnegative testA1 ", status.PASS);
} else {
status.addStatus("txnegative testA1 ", status.FAIL);
}
- result = false;
+ result = false;
try {
result = t.testA1(nonxa);
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (jakarta.ejb.CreateException e) {
System.out.println("CreateException");
- System.out.println("TEST FAILED");
+ System.out.println("TEST FAILED");
} catch (Exception e) {
- System.out.println("TEST PASSED");
+ System.out.println("TEST PASSED");
}
if (!result) {
status.addStatus("txnegative testA2 ", status.PASS);
@@ -97,83 +97,83 @@
boolean result=false;
try {
- userTransaction.begin();
- userTransaction.begin();
- System.out.println("TEST FAILED");
+ userTransaction.begin();
+ userTransaction.begin();
+ System.out.println("TEST FAILED");
} catch (NotSupportedException ne) {
System.out.println("NotSupportedException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (SystemException ne) {
System.out.println("SystemException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (Exception e) {
- e.printStackTrace();
- System.out.println("TEST FAILED");
+ e.printStackTrace();
+ System.out.println("TEST FAILED");
}
if (result) {
status.addStatus("txnegative t1 ", status.PASS);
} else {
status.addStatus("txnegative t1 ", status.FAIL);
}
- result = false;
+ result = false;
try {
- userTransaction.commit();
- System.out.println("TEST FAILED");
+ userTransaction.commit();
+ System.out.println("TEST FAILED");
} catch (IllegalStateException ne) {
System.out.println("IllegalStateException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (SystemException ne) {
System.out.println("SystemException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (Exception e) {
- e.printStackTrace();
- System.out.println("TEST FAILED");
+ e.printStackTrace();
+ System.out.println("TEST FAILED");
}
if (result) {
status.addStatus("txnegative t2 ", status.PASS);
} else {
status.addStatus("txnegative t2 ", status.FAIL);
}
- result = false;
+ result = false;
try {
- userTransaction.rollback();
- System.out.println("TEST FAILED");
+ userTransaction.rollback();
+ System.out.println("TEST FAILED");
} catch (IllegalStateException ne) {
System.out.println("IllegalStateException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (SystemException ne) {
System.out.println("SystemException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (Exception e) {
- e.printStackTrace();
- System.out.println("TEST FAILED");
+ e.printStackTrace();
+ System.out.println("TEST FAILED");
}
if (result) {
status.addStatus("txnegative t3 ", status.PASS);
} else {
status.addStatus("txnegative t3 ", status.FAIL);
}
- result = false;
+ result = false;
try {
- userTransaction.setRollbackOnly();
- System.out.println("TEST FAILED");
+ userTransaction.setRollbackOnly();
+ System.out.println("TEST FAILED");
} catch (IllegalStateException ne) {
System.out.println("IllegalStateException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (SystemException ne) {
System.out.println("SystemException");
- System.out.println("TEST PASSED");
- result = true;
+ System.out.println("TEST PASSED");
+ result = true;
} catch (Exception e) {
- e.printStackTrace();
- System.out.println("TEST FAILED");
+ e.printStackTrace();
+ System.out.println("TEST FAILED");
}
if (result) {
status.addStatus("txnegative t4 ", status.PASS);
@@ -191,6 +191,6 @@
ex.printStackTrace();
status.addStatus("txnegative testA1 ", status.FAIL);
}
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txnegative/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/transaction/txnegative/descriptor/ejb-jar.xml
index 043423d..a0c5246 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txnegative/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/txnegative/descriptor/ejb-jar.xml
@@ -64,7 +64,7 @@
</session>
</enterprise-beans>
<assembly-descriptor>
- <container-transaction>
+ <container-transaction>
<method>
<ejb-name>TestHung</ejb-name>
<method-name>*</method-name>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/build.properties b/appserver/tests/appserv-tests/devtests/transaction/txstress/build.properties
index f26ee22..ce5dd11 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
index debe2f6..0e6d6ed 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
@@ -121,7 +121,7 @@
"', " + bal + ")");
System.out.println("Account added Successfully in DB2...");
stmt1.close();
- con1.close();
+ con1.close();
stmt2.close();
con2.close();
tx.commit();
@@ -133,7 +133,7 @@
"', " + bal + ")");
System.out.println("Account added Successfully in DB1...");
stmt2.close();
- con2.close();
+ con2.close();
tx.commit();
tx.begin();
con1 = getConnection(dbURL1,user1,password1);
@@ -177,7 +177,7 @@
System.out.println("Got DB Connection Successfully...");
} catch (Exception ex) {
System.out.println("Exception in getConnection: " + ex.toString());
- ex.printStackTrace();
+ ex.printStackTrace();
}
return con;
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/servlet/Hello.java
index 6eced0e..29a0593 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/servlet/Hello.java
@@ -86,45 +86,45 @@
}
- response.setContentType("text/html");
- PrintWriter writer = response.getWriter();
+ response.setContentType("text/html");
+ PrintWriter writer = response.getWriter();
- writer.println("<html>");
- writer.println("<head>");
- writer.println("<title>Sample Transaction Stress Test Application</title>");
- writer.println("</head>");
- writer.println("<body bgcolor=white>");
+ writer.println("<html>");
+ writer.println("<head>");
+ writer.println("<title>Sample Transaction Stress Test Application</title>");
+ writer.println("</head>");
+ writer.println("<body bgcolor=white>");
- writer.println("<table border=\"0\">");
- writer.println("<tr>");
- writer.println("<td>");
- //writer.println("<img src=\"images/tomcat.gif\">");
- writer.println("</td>");
- writer.println("<td>");
- writer.println("<h1>Sample Transaction Stress Test Application</h1>");
- writer.println("This is the output of a servlet that is part of");
- writer.println("the Hello, World application. It displays the");
- writer.println("Number that you input.");
- writer.println("</td>");
- writer.println("</tr>");
- writer.println("</table>");
+ writer.println("<table border=\"0\">");
+ writer.println("<tr>");
+ writer.println("<td>");
+ //writer.println("<img src=\"images/tomcat.gif\">");
+ writer.println("</td>");
+ writer.println("<td>");
+ writer.println("<h1>Sample Transaction Stress Test Application</h1>");
+ writer.println("This is the output of a servlet that is part of");
+ writer.println("the Hello, World application. It displays the");
+ writer.println("Number that you input.");
+ writer.println("</td>");
+ writer.println("</tr>");
+ writer.println("</table>");
- writer.println("<table border=\"0\" width=\"100%\">");
- /*Enumeration names = request.getHeaderNames();
- while (names.hasMoreElements()) {
- String name = (String) names.nextElement();
- writer.println("<tr>");
- writer.println(" <th align=\"right\">" + name + ":</th>");
- writer.println(" <td>" + request.getHeader(name) + "</td>");
- writer.println("</tr>");
- }*/
- writer.println("<tr>");
- writer.println(" <td>" + "Value supplied as Input param is " + identity+"</td>");
- writer.println("</tr>");
- writer.println("</table>");
+ writer.println("<table border=\"0\" width=\"100%\">");
+ /*Enumeration names = request.getHeaderNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
+ writer.println("<tr>");
+ writer.println(" <th align=\"right\">" + name + ":</th>");
+ writer.println(" <td>" + request.getHeader(name) + "</td>");
+ writer.println("</tr>");
+ }*/
+ writer.println("<tr>");
+ writer.println(" <td>" + "Value supplied as Input param is " + identity+"</td>");
+ writer.println("</tr>");
+ writer.println("</table>");
- writer.println("</body>");
- writer.println("</html>");
+ writer.println("</body>");
+ writer.println("</html>");
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/build.properties b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/build.properties
index 6f82ab4..bbc91d8 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
index 85324b7..8d29551 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
@@ -119,7 +119,7 @@
"', " + bal + ")");
System.out.println("Account added Successfully in DB2...");
stmt1.close();
- con1.close();
+ con1.close();
stmt2.close();
con2.close();
tx.commit();
@@ -156,7 +156,7 @@
System.out.println("Got DB Connection Successfully...");
} catch (Exception ex) {
System.out.println("Exception in getConnection: " + ex.toString());
- ex.printStackTrace();
+ ex.printStackTrace();
}
return con;
}
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/build.properties b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/build.properties
index 6f82ab4..bbc91d8 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/build.properties
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/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="transaction"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/servlet/Hello.java
index 65ff9bc..3751fd0 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/servlet/Hello.java
@@ -82,45 +82,45 @@
}
- response.setContentType("text/html");
- PrintWriter writer = response.getWriter();
+ response.setContentType("text/html");
+ PrintWriter writer = response.getWriter();
- writer.println("<html>");
- writer.println("<head>");
- writer.println("<title>Sample Transaction Stress Test Application</title>");
- writer.println("</head>");
- writer.println("<body bgcolor=white>");
+ writer.println("<html>");
+ writer.println("<head>");
+ writer.println("<title>Sample Transaction Stress Test Application</title>");
+ writer.println("</head>");
+ writer.println("<body bgcolor=white>");
- writer.println("<table border=\"0\">");
- writer.println("<tr>");
- writer.println("<td>");
- //writer.println("<img src=\"images/tomcat.gif\">");
- writer.println("</td>");
- writer.println("<td>");
- writer.println("<h1>Sample Transaction Stress Test Application</h1>");
- writer.println("This is the output of a servlet that is part of");
- writer.println("the Hello, World application. It displays the");
- writer.println("Number that you input.");
- writer.println("</td>");
- writer.println("</tr>");
- writer.println("</table>");
+ writer.println("<table border=\"0\">");
+ writer.println("<tr>");
+ writer.println("<td>");
+ //writer.println("<img src=\"images/tomcat.gif\">");
+ writer.println("</td>");
+ writer.println("<td>");
+ writer.println("<h1>Sample Transaction Stress Test Application</h1>");
+ writer.println("This is the output of a servlet that is part of");
+ writer.println("the Hello, World application. It displays the");
+ writer.println("Number that you input.");
+ writer.println("</td>");
+ writer.println("</tr>");
+ writer.println("</table>");
- writer.println("<table border=\"0\" width=\"100%\">");
- /*Enumeration names = request.getHeaderNames();
- while (names.hasMoreElements()) {
- String name = (String) names.nextElement();
- writer.println("<tr>");
- writer.println(" <th align=\"right\">" + name + ":</th>");
- writer.println(" <td>" + request.getHeader(name) + "</td>");
- writer.println("</tr>");
- }*/
- writer.println("<tr>");
- writer.println(" <td>" + "Value supplied as Input param is " + identity+"</td>");
- writer.println("</tr>");
- writer.println("</table>");
+ writer.println("<table border=\"0\" width=\"100%\">");
+ /*Enumeration names = request.getHeaderNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
+ writer.println("<tr>");
+ writer.println(" <th align=\"right\">" + name + ":</th>");
+ writer.println(" <td>" + request.getHeader(name) + "</td>");
+ writer.println("</tr>");
+ }*/
+ writer.println("<tr>");
+ writer.println(" <td>" + "Value supplied as Input param is " + identity+"</td>");
+ writer.println("</tr>");
+ writer.println("</table>");
- writer.println("</body>");
- writer.println("</html>");
+ writer.println("</body>");
+ writer.println("</html>");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java
index 61459a6..24661c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java
@@ -21,7 +21,7 @@
/**
* Unit test for:
*
- * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
+ * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
* ("ACCESS LOG DOES NOT RECORD REQUESTS THAT FAIL WITH AN HTTP 400 ERROR")
*/
public class WebTest {
@@ -37,14 +37,14 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -85,6 +85,6 @@
// ignore
}
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java
index 339db3a..617aa00 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java
@@ -21,7 +21,7 @@
/**
* Unit test for:
*
- * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
+ * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
* ("ACCESS LOG DOES NOT RECORD REQUESTS THAT FAIL WITH AN HTTP 400 ERROR")
*/
@@ -45,7 +45,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 12303232");
WebTest2 webTest = new WebTest2(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -72,7 +72,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties
index a9a8057..e46db67 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-access-logging-bad-requests"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml
index fb6553b..b6d2cfc 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml
@@ -40,7 +40,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,16 +48,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest*"/>
- </target>
-
+ </target>
+
<target name="enable-access-logging" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/access"/>
<antcall target="asadmin-common-ignore-fail">
@@ -77,7 +77,7 @@
<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}"/>
@@ -101,10 +101,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="disable-access-logging" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
index 5d9013b..f2ec9ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
@@ -42,6 +42,6 @@
}
}
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java
index 5ac1b6a..927e7ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3398");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -72,7 +72,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties
index d2aa5e2..fb5e02a 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-access-logging-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml
index 42017c3..42c1fde 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="enable-access-logging" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/access"/>
<antcall target="asadmin-common-ignore-fail">
@@ -68,7 +68,7 @@
<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}"/>
@@ -81,10 +81,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="disable-access-logging" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
index a859212..6442212 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
@@ -27,6 +27,6 @@
String[] files = new File(location + "/domains/domain1/logs/access").list();
if (files != null && files.length == 2) {
resp.getWriter().println("SUCCESS!");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java
index 2f4d2fd..501a2f8 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java
@@ -37,14 +37,14 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -52,14 +52,14 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/index.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java
index 5db9995..3c25546 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 13450");
WebTest2 webTest = new WebTest2(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -72,7 +72,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties
index 0426377..6d733d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-access-logging-write-interval-seconds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml
index c6abe6e..f3585af 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml
@@ -40,7 +40,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,16 +48,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest*"/>
- </target>
-
+ </target>
+
<target name="enable-access-logging" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/access"/>
<antcall target="asadmin-common-ignore-fail">
@@ -77,7 +77,7 @@
<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}"/>
@@ -101,10 +101,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="disable-access-logging" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
index 34a00c1..f76338a 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
@@ -36,6 +36,6 @@
}
}
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml
index cc564cb..d0fb4d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml
@@ -30,7 +30,7 @@
&run;
<import file="build-properties.xml"/>
-
+
<path id="class.path">
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
<pathelement location="build"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java
index d5c34bb..21d67c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java
+++ b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java
@@ -61,7 +61,7 @@
try {
connection = (HttpURLConnection) new URL("http://localhost:" + adminPort + "/management/domain/resources/jdbc-resource/jdbc%2F__TimerPool.xml").openConnection();
connection.setRequestProperty("X-GlassFish-3", "true");
- System.out.println("Connection response code returned "+connection.getResponseCode());
+ System.out.println("Connection response code returned "+connection.getResponseCode());
report("response-" + expectedCode + "-try-" + count, expectedCode == connection.getResponseCode());
} finally {
if(connection != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java
index 35b9c76..e8a6312 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4932547");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
}
public void doTest() {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties
index 064ba21..e075e3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-anonymous-access-forbidden"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/anonymousAccessForbidden/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/descriptor/web.xml
index 5e07154..54ec581 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/descriptor/web.xml
@@ -35,7 +35,7 @@
<security-role>
<description>test role</description>
<role-name>testrole</role-name>
- </security-role>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java
index 814b8df..bc41adb 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Request Dispatcher in Servlet.init()");
String host = args[0];
@@ -41,16 +41,16 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "ApplicationDispatcher", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
}
if (count != EXPECTED_COUNT){
stat.addStatus("applicationDispatcher", stat.FAIL);
- }
+ }
stat.printSummary("web/applicationDispatcher---> expect 2 PASS");
}
@@ -65,7 +65,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -77,20 +77,20 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("applicationDispatcher: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("applicationDispatcher: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("applicationDispatcher: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties
index 588356a..ffc3b2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-applicationDispatcher"/>
+<property name="appname" value="${module}-applicationDispatcher"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-applicationDispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/applicationDispatcher/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/descriptor/web.xml
index 655c0ca..12554f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/descriptor/web.xml
@@ -28,12 +28,12 @@
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
<load-on-startup>1000</load-on-startup>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
index 5dec147..dae8861 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
@@ -34,23 +34,23 @@
private ServletContext context;
private static String status = "ApplicationDispatcher::PASS";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
try{
- RequestDispatcher requestD =
+ RequestDispatcher requestD =
getServletContext().getRequestDispatcher("/test.jsp");
if ( requestD == null){
- status = "ApplicationDispatcher::FAIL";
+ status = "ApplicationDispatcher::FAIL";
}
System.out.println("[Servlet.RequestDispatcher: " + requestD + "]");
} catch (Throwable t){
- status = "ApplicationDispatcher::FAIL";
+ status = "ApplicationDispatcher::FAIL";
}
- System.out.println("status: " + status);
+ System.out.println("status: " + status);
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,7 +58,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties b/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties
index 46b120e..694cbb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-asadmin-deletes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties
index 4dbf747..1935115 100644
--- a/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-asadmin-deletes-target"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java
index 44105d6..ddd1a5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String EXPECTED_RESPONSE =
+ private static final String EXPECTED_RESPONSE =
"RemoteAddress=123.456.789";
private static final String TEST_NAME =
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6347215");
WebTest test = new WebTest(args);
@@ -72,7 +72,7 @@
stat.printSummary(TEST_NAME);
}
- private void doTest() throws Exception {
+ private void doTest() throws Exception {
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/remoteAddress.jsp "
@@ -81,7 +81,7 @@
os.write(get.getBytes());
os.write("Proxy-ip: 123.456.789\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties
index ebb05a2..3c6fa44 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-get-remote-address"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java
index fe74da8..b7e63b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java
@@ -34,7 +34,7 @@
= new SimpleReporterAdapter("appserv-tests");
private static String EXPECTED_RESPONSE = null;
- private static final String EXPECTED_RESPONSE_LOCALHOST =
+ private static final String EXPECTED_RESPONSE_LOCALHOST =
"RemoteHost=localhost";
static{
@@ -68,7 +68,7 @@
public void doTest() {
- try {
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties
index 7cbfa5d..9be83dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-get-remote-host"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
index 3d1fd8b..f8adba4 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java
index de95de9..3a9516d 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6170450");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -71,7 +71,7 @@
}
private void invokeJsp() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties
index f9fece6..3a3cabf 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-get-scheme"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java
index 14aeae6..b67aecc 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6397218");
WebTest test = new WebTest(args);
@@ -71,7 +71,7 @@
}
private void invokeJsp() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
@@ -80,7 +80,7 @@
os.write("Proxy-keysize: 512\n".getBytes());
os.write("Proxy-ip: 123.456.789\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties
index e5f2ba7..5496a3d 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-request-is-secure"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java
index 775b57f..5c97d3b 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java
@@ -39,7 +39,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String EXPECTED_LOCATION =
+ private static final String EXPECTED_LOCATION =
"https://lbhost:8888/jsp/redirect/target.jsp";
private static final String TEST_NAME =
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6269102");
WebTest webTest = new WebTest(args);
@@ -64,8 +64,8 @@
}
public void doTest() {
-
- try {
+
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -83,7 +83,7 @@
}
private void testRemoteAddress() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/sendRedirect.jsp "
@@ -93,7 +93,7 @@
os.write("Proxy-keysize: 512\n".getBytes());
os.write("Proxy-ip: 123.456.789\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties
index 3338931..26bd2d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-send-redirect-from-jsp-with-https-server-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
index 2b1e2b9..18c1d9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java
index b2dc3e9..524794f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6590921");
WebTest webTest = new WebTest(args);
@@ -59,8 +59,8 @@
}
public void doTest() {
-
- try {
+
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -78,7 +78,7 @@
}
private void testRemoteAddress() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties
index 04b829e..32add35 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-send-redirect-host-request-header-without-port"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java
index 84a88ed..38dba9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6269102");
WebTest webTest = new WebTest(args);
@@ -64,8 +64,8 @@
}
public void doTest() {
-
- try {
+
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -83,7 +83,7 @@
}
private void testRemoteAddress() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties
index 9d03ca5..234356c 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-auth-passthrough-send-redirect-with-https-server-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
index 2b1e2b9..18c1d9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java b/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java
index 4a7483c..73fe3a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test BodyTag behavior when tag is reused");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus("BodyTag test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -75,7 +75,7 @@
count++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
if (count == 1)
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties b/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties
index 9eaf5aa..cc3355a 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-bodytag"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml b/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/bodyTag/servlet/mypack/MyBody.java b/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
index 2dce391..737a7bf 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
@@ -21,7 +21,7 @@
public class MyBody extends BodyTagSupport {
-
+
public int doEndTag() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java
index 9656e4b..dd3d6aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java
@@ -30,8 +30,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -48,12 +48,12 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
- System.out.println("broken_webapp: " + responseCode + " Expected code: 404");
+ System.out.println("broken_webapp: " + responseCode + " Expected code: 404");
if (urlConnection.getResponseCode() != 404){
stat.addStatus("Test broken_webapp", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties
index 5d83f67..64e8d4d 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-broken_webapp"/>
+<property name="appname" value="${module}-broken_webapp"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-broken_webapp"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml
index 0b01046..485280f 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,24 +44,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="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}"/>
@@ -73,10 +73,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/web/broken_webapp/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/broken_webapp/descriptor/web.xml
index 29ac78b..c7df9d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
index 5f5f378..807480f 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
@@ -46,11 +46,11 @@
public class ServletTest extends HttpServlet{
private String status = "DelegateTest::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,16 +58,16 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println(status);
response.setContentType("text/html");
-
+
status = "broken_webapp::FAIL";
out.println(status);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/build.xml b/appserver/tests/appserv-tests/devtests/web/build.xml
index 8871a47..d391f8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/build.xml
@@ -57,7 +57,7 @@
<ant dir="jspConfigIncludeChain" target="all"/>
<ant dir="jspConfigJavacSource" target="build-publish-war"/>
<ant dir="jspConfigJspFile" target="all"/>
- <ant dir="jspConfigModificationTestInterval" target="all"/>
+ <ant dir="jspConfigModificationTestInterval" target="all"/>
<ant dir="jspConfigUndeclaredNS" target="all"/>
<ant dir="jspConfigUsePrecompiled" target="all"/>
<ant dir="jspConfigUsePrecompiled2" target="all"/>
@@ -81,15 +81,15 @@
<ant dir="jspNullFragment" target="all"/>
<ant dir="jspPoundSyntax" target="all"/>
<ant dir="jspPrecompileConsiderDomainLibJarFilesAndClasses" target="all"/>
- <ant dir="jspPrecompileDeployDashDashLibraries" target="all"/>
+ <ant dir="jspPrecompileDeployDashDashLibraries" target="all"/>
<ant dir="jspPrecompileIgnoreFragmentErrors" target="all"/>
<ant dir="jspReloadGeneratedServletIfUpdated" target="all"/>
<ant dir="jspResourceInjectionContextListener" target="all"/>
<ant dir="jspResourceInjectionSimpleTagHandler" target="all"/>
<ant dir="jspResourceInjectionTagHandler" target="all"/>
<ant dir="jspResourceInjectionTagHandlerPoolingDisabled" target="all"/>
- <ant dir="jspRuntimeCompileConsiderDomainLibJarFilesAndClasses" target="all"/>
- <ant dir="jspRuntimeDeployDashDashLibraries" target="all"/>
+ <ant dir="jspRuntimeCompileConsiderDomainLibJarFilesAndClasses" target="all"/>
+ <ant dir="jspRuntimeDeployDashDashLibraries" target="all"/>
<ant dir="jspScriptlessTagBodyJspDocument" target="all"/>
<ant dir="jspScriptletAfterScriptlessTag" target="all"/>
<ant dir="jspScriptletDeclNestedInCustomAction" target="all"/>
@@ -145,7 +145,7 @@
<ant dir="cacheFilterMappingDispatcher" target="all"/>
<ant dir="cacheHelperRef" target="all"/>
<ant dir="contentlength" target="all"/>
- <ant dir="cookiePropertiesSunWebXml" target="all"/>
+ <ant dir="cookiePropertiesSunWebXml" target="all"/>
<ant dir="defaultCharset" target="all"/>
<ant dir="dirListing" target="all"/>
<ant dir="defaultServletWithSubdirectoryMapping" target="all"/>
@@ -153,8 +153,8 @@
<ant dir="errorPageExceptionTypeWrapper" target="all"/>
<ant dir="errorPageHandlingForError" target="all"/>
<ant dir="servletInitBeforeGetServletConfig" target="all"/>
- <ant dir="listenerFilterServletInit" target="all"/>
- <ant dir="filterMultipleInit" target="all"/>
+ <ant dir="listenerFilterServletInit" target="all"/>
+ <ant dir="filterMultipleInit" target="all"/>
<ant dir="filterURIMapping" target="all"/>
<ant dir="forwardWithQueryString" target="all"/>
<ant dir="getAttributeAfterForward" target="all"/>
@@ -210,7 +210,7 @@
<ant dir="servlet-3.0/asyncTimeoutNoListener" target="all"/>
<ant dir="servlet-3.0/asyncDelayDispatchAndComplete" target="all"/>
<ant dir="servlet-3.0/dispatchForwardAsyncDispatch" target="all"/>
- <ant dir="servlet-3.0/cookieHttpOnly" target="all"/>
+ <ant dir="servlet-3.0/cookieHttpOnly" target="all"/>
<ant dir="servlet-3.0/defaultErrorPage" target="all"/>
<ant dir="servlet-3.0/javaxServletContextOrderedLibs" target="all"/>
<ant dir="servlet-3.0/multiWebFragments" target="all"/>
@@ -306,9 +306,9 @@
<ant dir="sessionSetMaxInactiveIntervalExpire" target="all"/>
<ant dir="sessionSetMaxInactiveIntervalToZeroAndInvalidate" target="all"/>
<ant dir="setMultiValuedResponseHeader" target="all"/>
- <ant dir="standalonewar" target="all"/>
- <ant dir="sessionWithoutCookie" target="all"/>
- <ant dir="createSessionInServletRequestListener" target="all"/>
+ <ant dir="standalonewar" target="all"/>
+ <ant dir="sessionWithoutCookie" target="all"/>
+ <ant dir="createSessionInServletRequestListener" target="all"/>
<ant dir="servlet-3.1/networkPathReference" target="all"/>
<ant dir="servlet-3.1/nonBlockingOutput" target="all"/>
<ant dir="servlet-3.1/nonBlockingInput" target="all"/>
@@ -355,13 +355,13 @@
<ant dir="contextPathXmlConfig" target="all"/>
<ant dir="contextRoot" target="all"/>
<ant dir="contextValveSetRequestedSessionCookiePath" target="all"/>
- <ant dir="contextXmlConfig" target="all"/>
+ <ant dir="contextXmlConfig" target="all"/>
<ant dir="contextXmlLifecycleListener" target="all"/>
<ant dir="contextXmlLifecycleListenerGlobal" target="all"/>
<ant dir="contextXmlRemoteHostValve" target="all"/>
<ant dir="cookieValueWithEquals" target="all"/>
<ant dir="cookieValueWithSpaces" target="all"/>
- <ant dir="crossContextDispatchLongestContextRootMatch" target="all"/>
+ <ant dir="crossContextDispatchLongestContextRootMatch" target="all"/>
<ant dir="delegate" target="all"/>
<ant dir="disableDefaultErrorPage" target="all"/>
<ant dir="emptyContextRoot" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java
index eca641f..70888f8 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6175642");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -63,14 +63,14 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties
index 99b0be1..ee36df3 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cache-control-response-headers"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml
index 431473f..af28de4 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -75,7 +75,7 @@
<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}"/>
@@ -87,10 +87,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/web/cacheFilterMappingDispatcher/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/WebTest.java
index aaac949..185808c 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/WebTest.java
@@ -49,9 +49,9 @@
* body.
* Counter in /dispatchTo gets incremented.
*/
- success = doTest("http://" + hostPortRoot + "/dispatchTo",
+ success = doTest("http://" + hostPortRoot + "/dispatchTo",
"RESPONSE-0");
-
+
if (success) {
/*
* Access /dispatchTo directly, expect "RESPONSE-1" in response
@@ -114,7 +114,7 @@
*/
success = doTest("http://" + hostPortRoot + "/dispatchFrom?action=include",
"RESPONSE-4");
- }
+ }
if (success) {
/*
@@ -147,7 +147,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.out.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
return false;
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties
index ca444c5..cb7b623 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cache-filter-mapping-dispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml
index 48bb787..76e5660 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml
@@ -27,6 +27,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
</cache-mapping>
- </cache>
+ </cache>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java
index 633aa64..834da50 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 12891, 17377");
@@ -63,8 +63,8 @@
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/" + path);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties
index 34478fa..e5b8a00 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cache-hang"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml
index 7e8cf85..947d5bc 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class"/>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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>
- </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">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -72,9 +72,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java
index 4710ec0..a1f2658 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java
@@ -37,24 +37,24 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6240539");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200, "
+ "received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties
index e17b834..75994a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cache-helper-ref"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
index 1c18db2..e57e17a 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
@@ -29,21 +29,21 @@
public class MyCacheHelper implements CacheHelper {
// Values is initialized to CacheAble
- private static String cacheKey="myKey";
+ private static String cacheKey="myKey";
private static boolean isCacheAble=true;
private static boolean isRefreshNeeded=false;
private static int timeOut=20;
-
-
+
+
public void init (ServletContext context, Map props) throws Exception {
System.out.println("myCacheHelper2:init");
// Nothing to initialize
}
-
+
public void destroy() throws Exception {
System.out.println("myCacheHelper2:exit");
}
-
+
public String getCacheKey(HttpServletRequest req) {
System.out.println("myCacheHelper2:getCacheKey");
String key = req.getParameter("cacheKey");
@@ -53,7 +53,7 @@
// If user do not enter a key, the default value is "myKey"
return cacheKey;
}
-
+
public int getTimeout(HttpServletRequest req) {
String timeOutStr = null;
int time = 0;
@@ -66,7 +66,7 @@
System.out.println("Number Format Exception Occurs: "
+ nfe.getMessage());
}
- // Negative time out value treat as 0
+ // Negative time out value treat as 0
if (time > 0)
return time;
else return 0;
@@ -74,18 +74,18 @@
// if user do not enter time out, use default timeOut value
else return timeOut;
}
-
+
public boolean isCacheable(HttpServletRequest req) {
String isCacheAbleStr = null;
System.out.println("myCacheHelper2:isCacheable");
isCacheAbleStr = (String)req.getParameter("isCacheAble");
- // Check if isCacheAble null
+ // Check if isCacheAble null
if ((isCacheAbleStr != null)
&& (isCacheAbleStr.compareTo("false") != 0))
return false;
else return isCacheAble;
}
-
+
public boolean isRefreshNeeded(HttpServletRequest req) {
String isRefreshNeededStr = null;
System.out.println("myCacheHelper2:isRefreshNeeded");
@@ -94,6 +94,6 @@
&& (isRefreshNeededStr.compareTo("true") !=0))
return true;
else return isRefreshNeeded;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
index 026f0b0..703fec1 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
@@ -21,9 +21,9 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
// Do nothing
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
index 35b8b61..cc39b79 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
@@ -25,7 +25,7 @@
public class ServletTest extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@@ -34,7 +34,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties
index 9986a22..0c4055f 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-case-sensitive-host-mapping"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml
index 4c4d4dc..6c9714e 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,10 +46,10 @@
</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
@@ -57,14 +57,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="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="run" depends="init-common">
<java classname="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/web/caseSensitiveHostMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/descriptor/web.xml
index fe24a0f..ffd668e 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/descriptor/web.xml
@@ -26,7 +26,7 @@
<servlet>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java
index 699cfaa..99096a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java
@@ -23,10 +23,10 @@
* Fix for CR 6947296
*/
public class WebTest {
-
+
private static final String TEST_NAME = "change-session-id-on-authentication";
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -39,7 +39,7 @@
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
String result = goGet(host, port, contextRoot + "/welcome.jsp",
null, false);
@@ -47,12 +47,12 @@
if (result != null && result.length() > 0) {
result2 = goGet(host, port, contextRoot + "/secure.jsp",
result, true);
- }
-
+ }
+
stat.addStatus(TEST_NAME,
(result != null && result.length() > 0 &&
result2 != null && result2.length() > 0 &&
- !result.equals(result2)) ?
+ !result.equals(result2)) ?
stat.PASS : stat.FAIL);
} catch (Throwable t) {
System.out.println(t.getMessage());
@@ -97,7 +97,7 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -118,5 +118,5 @@
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties
index 51670f1..9b21976 100644
--- a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-change-session-id-on-authentication"/>
+<property name="appname" value="${module}-change-session-id-on-authentication"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="context.xml" value="descriptor/context.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml
index 6f062b0..21d88b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,10 +43,10 @@
</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
@@ -54,7 +54,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -65,11 +65,11 @@
<param name="groups" value="javaee"/>
</antcall>
</target>
-
+
<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}"/>
@@ -81,10 +81,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java
index f8fce13..fb92b09 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4861933");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -65,7 +65,7 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
@@ -76,7 +76,7 @@
os.write(hostHeader.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties
index 9d7c1d9..1b9e0b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-chunking-disabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml
index eb3dc68..8c82e68 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -67,7 +67,7 @@
<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="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml
index 4d9d4a0..98d1684 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
index 6013b69..19910f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
@@ -27,7 +27,7 @@
throws IOException, ServletException {
PrintWriter out = res.getWriter();
-
+
/*
* Check to see if we are in SE/EE, by trying to load a class that's
* available only in SE/EE.
@@ -40,7 +40,7 @@
"com.sun.enterprise.ee.web.authenticator.HASingleSignOn");
// EE
out.println("This is EE");
- } catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
// PE
for (int i=0; i<BUFFER_SIZE; i++) {
out.print("X");
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java
index 1195887..df795f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 11417 and IT 11419");
@@ -65,11 +65,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String jsp) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + jsp);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties
index 6a8c0b0..a319f9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-class-path-manifest-attribute"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml
index b1b55ef..baed4f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,23 +46,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}"/>
@@ -74,10 +74,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/web/classPathManifestAttributePrecompile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/WebTest.java
index 9ed954d..0784ebb 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 11417 and IT 11419");
@@ -65,11 +65,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String jsp) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + jsp);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties
index f25b58a..d340b3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-class-path-manifest-attribute-precompile"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml
index b1b55ef..baed4f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,23 +46,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}"/>
@@ -74,10 +74,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/web/classloaderGetResourceJarFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/WebTest.java
index 7f81ff5..08cdda3 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6495991");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -71,6 +71,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties
index 4f236b6..1b343ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-classloader-get-resource-jar-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/classloaderGetResourceJarFile/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/descriptor/web.xml
index b7c11b0..c784e81 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/descriptor/web.xml
@@ -18,6 +18,6 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java
index bdb965d..ec1ad97 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java
@@ -18,7 +18,7 @@
/*
* Dummy class to make sure the war has WEB-INF/classes folder. The test.jsp
- * in this web application does getResource with a resource path that is
+ * in this web application does getResource with a resource path that is
* relative to WEB-INF/classes folder.
*/
public class Dummy {
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java
index fbacc99..ddbefd9 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 6568");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -72,6 +72,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties
index 710236f..c4c2169 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-classloader-get-resources-delegate-false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml
index 4345c0d..d843d67 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml
index b1c86c3..ea69c41 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml
@@ -28,6 +28,6 @@
<servlet-name>TestServlet</servlet-name>
<url-pattern>/test</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
index c22efda..0af35db 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
@@ -32,7 +32,7 @@
throw new ServletException(
"Wrong number of resource URLs, expected 2");
}
- urls[i++] = e.nextElement();
+ urls[i++] = e.nextElement();
}
if (i != 2) {
@@ -51,14 +51,14 @@
/*
* Since delegate is set to false, we expect the first URL in the
* returned enum:
- *
+ *
* jar:file:/space/luehe/ws/v3/distributions/web/target/glassfish\
- * /domains/domain1/applications\
+ * /domains/domain1/applications\
* /web-classloader-get-resources-delegate-false-web/WEB-INF/lib\
* /mytest.jar!/test.txt
- *
+ *
* to be longer than the second:
- *
+ *
* jar:file:/space/luehe/ws/v3/distributions/web/target/glassfish\
* /lib/test.jar!/test.txt|#]
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java
index 0d56d9c..60147cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for comet: echo");
@@ -126,7 +126,7 @@
int statusCode = urlConnection.getResponseCode();
if (HttpURLConnection.HTTP_OK != statusCode) {
throw new IllegalStateException("Incorrect return code: " + statusCode);
- }
+ }
} finally {
try {
if (os != null) {
@@ -178,7 +178,7 @@
listenMessage = br.readLine();
endSignal.countDown();
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new IllegalStateException("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties
index 4b1da17..c03a1c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-comet-echo"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml
index 7931a0f..4b399e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml
@@ -39,7 +39,7 @@
<fileset dir="${basedir}" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,20 +47,20 @@
</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:${env.S1AS_HOME}/lib/appserv-rt.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>
@@ -81,7 +81,7 @@
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -96,7 +96,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java b/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
index 9896c9d..4587948 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
@@ -83,7 +83,7 @@
res.setContentType("text/html");
res.setHeader("Cache-Control", "private");
res.setHeader("Pragma", "no-cache");
-
+
PrintWriter writer = res.getWriter();
ChatListnerHandler handler = new ChatListnerHandler();
handler.attach(writer);
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java
index 8fa4ebc..4804080 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6314912");
@@ -58,7 +58,7 @@
}
private void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -76,7 +76,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -94,6 +94,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties
index 682bf52..0eefab0 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-commons-digester-class-not-found-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml
index abeb6fe..62109d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
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}"/>
@@ -74,10 +74,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/web/commonsLogging/WebTest.java b/appserver/tests/appserv-tests/devtests/web/commonsLogging/WebTest.java
index c007b51..115863a 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6220818");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -58,7 +58,7 @@
}
private void invokeServlet() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/From");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties b/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties
index 4d00f8d..978260a 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-commons-logging"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml b/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml
index 3f1f8f5..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
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}"/>
@@ -72,10 +72,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/web/commonsLogging/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/commonsLogging/descriptor/web.xml
index 66b9875..41767a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/descriptor/web.xml
@@ -42,6 +42,6 @@
<servlet-name>To</servlet-name>
<url-pattern>/To</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java
index 896c4cb..78563c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2692");
@@ -57,11 +57,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -80,7 +80,7 @@
br = new BufferedReader(new InputStreamReader(is));
String line = br.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -98,6 +98,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties
index ad325a2..a96a95a 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-commons-logging-local-and-global"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml
index 469ba33..7c34dc1 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,23 +46,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}"/>
@@ -74,10 +74,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java
index 54cb2c0..1775efe 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java
@@ -23,7 +23,7 @@
public String toString() {
Log log = LogFactory.getLog(MyTest.class);
- return "SUCCESS";
+ return "SUCCESS";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
index 8964c36..1e5cc21 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
@@ -26,8 +26,8 @@
try {
Object o = Class.forName("test.MyTest").newInstance();
res.getWriter().println(o.toString());
- } catch (Exception e) {
- throw new ServletException(e);
- }
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java
index b85d2a9..6c3c869 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java
@@ -26,8 +26,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -35,7 +35,7 @@
try{
stat.addDescription("Standalone Servlet/Filter war test");
-
+
System.out.println("Running test");
url = new URL("http://" + host + ":" + port + contextRoot + "/ServletTest");
String originalLoc = url.toString();
@@ -46,7 +46,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
@@ -54,13 +54,13 @@
String encodedURL = urlConnection.getHeaderField ("Location");
System.out.println("responseCode: " + responseCode);
System.err.println("encodedURL : " + encodedURL);
-
+
if (urlConnection.getResponseCode() != 201){
stat.addStatus("contentLength-responseCode", stat.FAIL);
} else {
stat.addStatus("contentLength-responseCode", stat.PASS);
}
-
+
if (encodedURL != null && !encodedURL.startsWith(originalLoc)){
stat.addStatus("contentLength-header", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties b/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties
index 5706241..092362d 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-contentType"/>
+<property name="appname" value="${module}-contentType"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-contentType"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml b/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml
index 3f1f8f5..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
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}"/>
@@ -72,10 +72,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/web/contentlength/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/contentlength/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
index 78751a7..96605cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
HttpSession session = request.getSession(true);
@@ -62,7 +62,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java
index accc230..61c7333 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java
@@ -21,8 +21,8 @@
/*
* Unit test for glassfish/domains/domain1/config/web-context-path-xml-config.xml
*
- * This unit test ensures webapp context_path.xml packaged outside of the archive. Needs to be a separate test from contextXmlConfig since contextXmlConfig tests webapp/META-INF/context.xml packaged inside the WAR
- *
+ * This unit test ensures webapp context_path.xml packaged outside of the archive. Needs to be a separate test from contextXmlConfig since contextXmlConfig tests webapp/META-INF/context.xml packaged inside the WAR
+ *
*/
public class WebTest {
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context_path.xml");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties
index e405f9e..55b5100 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-path-xml-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml
index 294ad9c..630f6e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<copy file="descriptor/web-context-path-xml-config.xml" todir="${env.S1AS_HOME}/domains/domain1/config"/>
</target>
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,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/web/contextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextRoot/WebTest.java
index 65c2afe..95fe7f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context-root setting in "
+ "sun-web.xml");
@@ -50,8 +50,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties
index 5c75cf3..fa2fcbc 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml
index 65404f8..6c7a286 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/web/contextRoot/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/contextRoot/descriptor/sun-web.xml
index 3214c9d..c72cb16 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/descriptor/sun-web.xml
@@ -20,5 +20,5 @@
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-1.dtd">
<sun-web-app>
- <context-root>mycontextroot</context-root>
+ <context-root>mycontextroot</context-root>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java
index 9d57fde..e1cd8d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java
@@ -19,8 +19,8 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for GLASSFISH-18861
- *
+ * Unit test for GLASSFISH-18861
+ *
* After setting context root of two wars which deployed on the server target with the same value,
* both of the two wars accessed failed.
*
@@ -42,7 +42,7 @@
contextRoot1 = args[2];
contextRoot2 = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GLASSFISH-18861");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties
index b11ac9f..f805d6b 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-root-duplicate"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml
index 567e3ed..b544c56 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,17 +44,17 @@
</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">
@@ -92,7 +92,7 @@
value="applications.application.contextroot2.context-root=contextroot1"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -105,7 +105,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
@@ -119,7 +119,7 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${contextroot2}"/>
</exec>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java
index 26cc8f8..0b7f017 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7426");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties
index 643ee31..3d0c94d 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-valve-set-requested-session-cookie-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml
index 5f36715..62db9d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,22 +42,22 @@
</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}"/>
@@ -69,10 +69,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/web/contextXmlConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/WebTest.java
index d84e828..732a29a 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/WebTest.java
@@ -23,18 +23,18 @@
* ("Add support for context.xml"):
*
* This unit test ensures the following context.xml configuration.
- *
- * 1. default virtual-server context.xml using virtual-server property
- * "contextXmlDefault"
- *
+ *
+ * 1. default virtual-server context.xml using virtual-server property
+ * "contextXmlDefault"
+ *
* 2. deployed webapps's context.xml (META-INF/context.xml)
*
* The global context.xml and virtual-server context.xml will be copied to config
* and removed after this unit test.
- *
+ *
* The "contextXml" property of the virtual-server "server" is added (before
* the webapp's deployment) and removed (after the webapp's undeployment)
- *
+ *
*/
public class WebTest {
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2439");
@@ -66,7 +66,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
@@ -93,7 +93,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties
index 9c2a154..4ff25e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-xml-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml
index 80a228c..8ef7ce1 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<copy file="descriptor/context.xml" todir="${env.S1AS_HOME}/domains/domain1/config"/>
<copy file="descriptor/context.xml.default" todir="${env.S1AS_HOME}/domains/domain1/config"/>
@@ -83,7 +83,7 @@
<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}"/>
@@ -95,10 +95,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/web/contextXmlLifecycleListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/WebTest.java
index c2bf517..f1e8f0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for LifecycleListener in context.xml");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties
index c57793e..8c079ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-xml-lifecycle-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml
index 42d265d..b1c258d 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/contextXmlLifecycleListener/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
index d21827c..fded175 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -54,7 +54,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java
index 469ea0b..7c03573 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java
@@ -20,7 +20,7 @@
/*
*
- * This unit test checkes LifecycleListener in context.xml configuration.
+ * This unit test checkes LifecycleListener in context.xml configuration.
* The global context.xml should be shared across by all webapps.
*/
public class WebTest {
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for global LifecycleListener in context.xml");
@@ -55,7 +55,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties
index 9e6b060..4a5402f 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-xml-lifecycle-listener-global"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml
index 19f8a7a..8d67178 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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"/>
@@ -59,7 +59,7 @@
<copy file="lib/test.jar" todir="${env.S1AS_HOME}/lib"
failonerror="true"/>
-->
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -86,13 +86,13 @@
</delete>
<delete file="${env.S1AS_HOME}/domains/domain1/config/context.xml"/>
</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}"/>
@@ -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/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
index d21827c..fded175 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -54,7 +54,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java
index b6b8bf7..267f913 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Valve in context.xml");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties
index bb70fe2..ff378a9 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-context-xml-remote-host-valve"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml
index 4bf71cd..127eb32 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/contextXmlRemoteHostValve/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
index 57f89be..77bcf44 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,14 +44,14 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
index 334ac3c..7bda64e 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
@@ -33,7 +33,7 @@
!"VALUE_3".equals(req.getAttribute("ATTR_3"))) {
throw new ServletException("Missing request attributes");
*/
- if (!"VALUE_1".equals(req.getAttribute("ATTR_1"))) {
+ if (!"VALUE_1".equals(req.getAttribute("ATTR_1"))) {
throw new ServletException("Missing request attributes");
} else {
res.getWriter().print(true);
diff --git a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java
index 951122f..1097911 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * This unit tests expects the following Set-Cookie response header, based on
+ * This unit tests expects the following Set-Cookie response header, based on
* the cookie-properties specified in sun-web.xml:
*
* Set-Cookie: JSESSIONID=[...]; Domain=.iplanet.com; Path=/
@@ -62,7 +62,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4924948");
WebTest webTest = new WebTest(args);
@@ -71,8 +71,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.properties b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.properties
index feea854..2ee503f 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/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="web"/>
-<property name="appname" value="${module}-cookie-properties"/>
+<property name="appname" value="${module}-cookie-properties"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/cookieValueWithEquals/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/WebTest.java
index 94c3015..2e53274 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6456553");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeCreateCookie();
invokeGetCookie();
stat.addStatus(TEST_NAME, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties
index b6ca126..15bc3e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cookie-value-with-equals"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml
index 4d845ee..392ce8b 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,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}"/>
@@ -73,10 +73,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/web/cookieValueWithSpaces/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/WebTest.java
index a9ca676..6f6a49e 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6456553");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeCreateCookie();
invokeGetCookie();
stat.addStatus(TEST_NAME, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties
index 0fa3d70..61c0376 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cookie-value-with-spaces"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/createHttpsListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/WebTest.java
index 321a103..3a20227 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -53,7 +53,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode != 200){
stat.addStatus("createHttpsListener", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties
index b301f46..459867e 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-createHttpsListener"/>
+<property name="appname" value="${module}-createHttpsListener"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml
index ca8bc81..9d55ea2 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml
@@ -50,7 +50,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -80,7 +80,7 @@
<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}"/>
@@ -92,10 +92,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/web/createHttpsListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
index 0f736a8..59dc98c 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java
index 8ee79db..a1268eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for "
+ "create session in HttpRequestListener.requestInitialized");
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/checkresult";
HttpURLConnection conn = (HttpURLConnection)
@@ -94,7 +94,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -114,7 +114,7 @@
}
}
}
-
+
private String getSessionId(HttpURLConnection conn) {
String sessionId = null;
String cookieString = conn.getHeaderField("Set-Cookie");
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties
index e5c1d48..9c916a4 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-create-session-in-servlet-request-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/createSessionInServletRequestListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/descriptor/web.xml
index 4b01b45..6e5f4a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <listener>
+ <listener>
<listener-class>test.MyServletRequestListener</listener-class>
</listener>
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
index 36572ef..97a5090 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
@@ -38,6 +38,6 @@
(currentTime - lastAccessedTime <= maxIdleTime));
}
out.println(result);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java
index 19532ca..e951a23 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java
@@ -40,7 +40,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3284");
WebTest webTest = new WebTest(args);
@@ -57,13 +57,13 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/123/From");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties
index 1a747f2..b0f44df 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-cross-context-dispatch-longest-context-root-match"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="from.war" value="from.war"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml
index 8544f0c..1cc07fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${from.war}"/>
@@ -48,8 +48,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -62,8 +62,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -74,7 +74,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java
index a239251..024f661 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT GLASSFISH-16768");
@@ -79,7 +79,7 @@
sb.append("?").append(param);
}
URL url = new URL(sb.toString());
-
+
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties
index c5e4e76..7c6e760 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-csrf-filter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml
index 05c71d8..82ae005 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml
@@ -37,7 +37,7 @@
<fileset dir="${basedir}" includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,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}"/>
@@ -73,10 +73,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/web/csrfFilter/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/csrfFilter/descriptor/web.xml
index 1c55372..bf45148 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/descriptor/web.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
-
+
<filter>
<filter-name>csrf</filter-name>
<filter-class>org.apache.catalina.filters.CsrfPreventionFilter</filter-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java b/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java
index 6371494..d157037 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4921329");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary("default-charset");
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println("default-charset test failed.");
@@ -64,7 +64,7 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
System.out.println(("GET " + contextRoot + "/jsp/getRequestCharset.jsp"
@@ -72,7 +72,7 @@
os.write(("GET " + contextRoot + "/jsp/getRequestCharset.jsp"
+ " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.properties
index ad5a426..5bf8557 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultCharset/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="web"/>
-<property name="appname" value="${module}-default-charset"/>
+<property name="appname" value="${module}-default-charset"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml
index 525c627..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/defaultContentType/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultContentType/build.properties
index a4725f9..57d36a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultContentType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultContentType/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-default-content-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml
index 4d9d4a0..98d1684 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties
index 1ca51a4..27077c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-defaultKeepAlive"/>
+<property name="appname" value="${module}-defaultKeepAlive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-defaultKeepAlive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml
index f5491b1..3105528 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java
index 3f023f5..ccf02f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("defaultResponseType");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -57,7 +57,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/test.xyz");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties
index b4a3178..d5353a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-default-response-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml
index 1fe7a27..bfb4357 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
- <copy file="docroot/test.xyz"
+ <copy file="docroot/test.xyz"
todir="${env.S1AS_HOME}/domains/domain1/docroot"/>
<antcall target="asadmin-common-ignore-fail">
@@ -73,7 +73,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -87,10 +87,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java
index 21397ea..80bc21a 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java
@@ -24,9 +24,9 @@
* Issue: GLASSFISH-17413
*/
public class WebTest {
-
+
private static final String TEST_NAME = "web-default-servlet-with-subdirectory-mapping";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("DefaultServlet with sub-directory mapping.");
String host = args[0];
@@ -43,11 +43,11 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
boolean ok = goGet(host, port, "From index.jsp", contextRoot + "/index.jsp" );
ok = ok && goGet(host, port, "From test.txt", contextRoot + "/static/test.txt");
-
+
stat.addStatus(TEST_NAME,
((ok)? stat.PASS : stat.FAIL));
} catch (Throwable t) {
@@ -69,7 +69,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -85,11 +85,11 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
return ok;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties
index cc35be5..5662291 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-default-servlet-with-subdirectory-mapping"/>
+<property name="appname" value="${module}-default-servlet-with-subdirectory-mapping"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-directoryListing"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml
index a02c945..e41ba73 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,20 +45,20 @@
</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>
- </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">
<javac
srcdir="."
@@ -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/web/delegate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/delegate/WebTest.java
index 8f783ee..d3a56a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/WebTest.java
@@ -23,10 +23,10 @@
*
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 2;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Classloader delegate flag");
String host = args[0];
@@ -43,16 +43,16 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "delegate-flag", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
System.out.println(t.getMessage());
}
if (count != EXPECTED_COUNT){
stat.addStatus("delegate", stat.FAIL);
- }
+ }
stat.printSummary("web/delegateFlag---> expect " + EXPECTED_COUNT + " PASS");
}
@@ -66,7 +66,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -78,20 +78,20 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(result +": " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
+ stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/build.properties b/appserver/tests/appserv-tests/devtests/web/delegate/build.properties
index 0829ddd..56bcda2 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-delegate"/>
+<property name="appname" value="${module}-delegate"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="glassfish-web.xml" value="descriptor/glassfish-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/build.xml b/appserver/tests/appserv-tests/devtests/web/delegate/build.xml
index 797931b..aac0777 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/build.xml
@@ -41,9 +41,9 @@
<javac srcdir="./shared/test"
destdir="./shared" includes="*.java"/>
<jar destfile="shared.jar" basedir="shared"/>
- <copy file="shared.jar"
+ <copy file="shared.jar"
todir="${env.S1AS_HOME}/lib"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="test-sun-web-xml">
@@ -61,7 +61,7 @@
<antcall target="run"/>
<antcall target="undeploy"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -81,10 +81,10 @@
</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
@@ -94,14 +94,14 @@
<delete file="${sun-web.xml}" failonerror="false"/>
<delete file="${glassfish-web.xml}" failonerror="false"/>
- </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}"/>
@@ -113,14 +113,14 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore-appserv" depends="setup-appserv">
<delete file="${env.S1AS_HOME}/lib/shared.jar"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml
index 196a604..81e62e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
index ecea96b..0a51d3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
@@ -25,11 +25,11 @@
public class ServletTest extends HttpServlet{
private String status = "DelegateTest::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,11 +37,11 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
-
+
DelegateTest delegate = null;
try{
Class clazz = Class.forName("test.DelegateTest");
@@ -54,7 +54,7 @@
if (delegate != null){
try{
- System.out.println("Delegate: " + delegate.getChildName());
+ System.out.println("Delegate: " + delegate.getChildName());
status = "DelegateTest::PASS";
} catch (Exception ex){
status = "DelegateTest::FAIL";
@@ -72,13 +72,13 @@
} else {
status = "OverridableJavax::PASS";
}
-
+
} catch (Exception ex){
status = "OverridableJavax::FAIL";
ex.printStackTrace();
}
out.println(status);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java b/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java
index d6934c8..2631a0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java
@@ -24,9 +24,9 @@
* Bug 6172839
*/
public class WebTest {
-
+
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone Session Invalid war test");
String host = args[0];
@@ -43,10 +43,10 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
boolean ok = goGet(host, port, "", contextRoot + "/" );
-
+
stat.addStatus("web-directoryListing",
((ok)? stat.PASS : stat.FAIL));
} catch (Throwable t) {
@@ -69,7 +69,7 @@
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("Authorization: Basic ajJlZTpqMmVl\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -86,11 +86,11 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
return (count == EXPECTED_COUNT);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties b/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties
index 2ebce29..8477d16 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-directoryListing"/>
+<property name="appname" value="${module}-directoryListing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-directoryListing"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml b/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml
index dce4b75..3f28b0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,20 +42,20 @@
</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>
- </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">
<javac
srcdir="."
@@ -72,10 +72,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/web/dirListing/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/dirListing/descriptor/web.xml
index 6f43e08..93e2518 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<servlet-name>default</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java
index 7a99557..87707b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 11423");
@@ -66,7 +66,7 @@
stat.printSummary();
}
- private void doTest() throws Exception {
+ private void doTest() throws Exception {
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test" + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties
index 634e813..3fd3d83 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-disable-default-error-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java
index b0d01e3..55bc915 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4981028");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
diff --git a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties
index b42a005..4b47979 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-distributable-webapp-enforce-serializable-session-attrs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/dosBrokenPost/build.properties b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.properties
index 3cb14b3..f36cf12 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-dosBrokenPost"/>
+<property name="appname" value="${module}-dosBrokenPost"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-dosBrokenPost"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml
index 66780eb..c7c5c65 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,13 +42,13 @@
</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>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/dosBrokenPost/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
index 78751a7..96605cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
HttpSession session = request.getSession(true);
@@ -62,7 +62,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java
index 2b17755..7073bd4 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java
@@ -18,30 +18,30 @@
import java.util.concurrent.atomic.AtomicInteger;
public class WebTest extends Thread{
- private static String TEST_NAME = "dos-slow-client";
+ private static String TEST_NAME = "dos-slow-client";
- public static final AtomicInteger count = new AtomicInteger();
+ public static final AtomicInteger count = new AtomicInteger();
- static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", TEST_NAME);
+ static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", TEST_NAME);
- public static void main(String args[]) throws InterruptedException {
+ public static void main(String args[]) throws InterruptedException {
- // The stat reporter writes out the test info and results
- // into the top-level quicklook directory during a run.
+ // The stat reporter writes out the test info and results
+ // into the top-level quicklook directory during a run.
- stat.addDescription("Slow client bytes write");
+ stat.addDescription("Slow client bytes write");
- String host = args[0];
- int port = Integer.parseInt(args[1]);
- int num = Integer.parseInt(args[2]);
+ String host = args[0];
+ int port = Integer.parseInt(args[1]);
+ int num = Integer.parseInt(args[2]);
- for (int i=0; i < num; i++) {
- new SlowClient(host, port, new WebTest());
- }
- Thread.sleep(30000);
+ for (int i=0; i < num; i++) {
+ new SlowClient(host, port, new WebTest());
+ }
+ Thread.sleep(30000);
- stat.addStatus(TEST_NAME, count.get() == num ? stat.PASS : stat.FAIL);
- stat.printSummary(TEST_NAME);
- }
+ stat.addStatus(TEST_NAME, count.get() == num ? stat.PASS : stat.FAIL);
+ stat.printSummary(TEST_NAME);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties
index 9a93395..8ebe417 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-dosSlowClient"/>
+<property name="appname" value="${module}-dosSlowClient"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-dosSlowClient"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml
index 9a6639a..d9f8502 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml
@@ -56,7 +56,7 @@
<param name="operand.props"
value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=5"/>
</antcall>
-
+
</target>
<target name="restore" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java
index b0298da..7eb4a38 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Double content-length header");
String host = args[0];
@@ -41,15 +41,15 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "EXPIRED", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
} finally{
if (count != EXPECTED_COUNT){
stat.addStatus("web-doubleContentLength", stat.FAIL);
- }
+ }
}
stat.printSummary("web/doubleContentLength---> expect 2 PASS");
@@ -73,7 +73,7 @@
} catch (Exception e) {
// Web server sometimes sends the response with 400 status
// code right after the second content-length header in which
- // case next os.write will cause an exception.
+ // case next os.write will cause an exception.
}
InputStream is = s.getInputStream();
@@ -89,11 +89,11 @@
stat.addStatus("web-doubleContentLength", stat.PASS);
count++;
break;
- }
+ }
lineNum++;
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties
index 64d741d..ac38d7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-doubleContentLength"/>
+<property name="appname" value="${module}-doubleContentLength"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-doubleContentLength"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml
index 32d49d6..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,13 +42,13 @@
</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>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/doubleContentLength/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
index 78751a7..96605cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
HttpSession session = request.getSession(true);
@@ -62,7 +62,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java
index d72998d..9578b3f 100644
--- a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java
@@ -37,9 +37,9 @@
java.math.BigDecimal.class);
System.out.println("Result: " + o);
if ("1234567890123456789".equals(o.toString()))
- stat.addStatus(testName, stat.PASS);
+ stat.addStatus(testName, stat.PASS);
else
- stat.addStatus(testName, stat.FAIL);
+ stat.addStatus(testName, stat.FAIL);
stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
index 807b2d2..4fcf732 100644
--- a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
@@ -32,14 +32,14 @@
<target name="clean">
<delete file="WebTest.class" />
</target>
-
+
<target name="compile">
<javac
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar;${env.S1AS_HOME}/modules/jakarta.el.jar;${env.S1AS_HOME}/modules/jakarta.el-api.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="compile">
<java classname="WebTest">
@@ -51,7 +51,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java
index 914ab7a..f5184c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 26628");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -56,14 +56,14 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/foo.jsp HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties
index 0b6a2f2..85ee296 100644
--- a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-el-function-without-params"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/elUninterpretedTag/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/WebTest.java
index 50a118f..c49404c 100644
--- a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test EL is empty instead of null when appear in uninterpreted tag attributes");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jspx" );
stat.addStatus("BodyTag test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -76,7 +76,7 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties
index 05b66af..401b230 100644
--- a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-elUninterpretedTag"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/elequals/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elequals/WebTest.java
index 565a51c..219aed2 100644
--- a/appserver/tests/appserv-tests/devtests/web/elequals/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elequals/WebTest.java
@@ -47,7 +47,7 @@
webTest.test("/equals.jsp");
} catch (Exception ex) {
ex.printStackTrace();
- stat.addStatus(testName, stat.FAIL);
+ stat.addStatus(testName, stat.FAIL);
}
stat.printSummary();
diff --git a/appserver/tests/appserv-tests/devtests/web/elequals/build.properties b/appserver/tests/appserv-tests/devtests/web/elequals/build.properties
index 1fbb61b..db31616 100644
--- a/appserver/tests/appserv-tests/devtests/web/elequals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/elequals/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-elexpr-equals"/>
+<property name="appname" value="${module}-elexpr-equals"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
<property name="precompilejsp" value="false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/elequals/build.xml b/appserver/tests/appserv-tests/devtests/web/elequals/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/elequals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elequals/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/emptyContextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/WebTest.java
index b611b7d..8bfd97c 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/WebTest.java
@@ -26,7 +26,7 @@
* sun-web.xml, as follows:
*
* <sun-web-app>
- * <context-root>/</context-root>
+ * <context-root>/</context-root>
* </sun-web-app>
*/
public class WebTest {
@@ -45,7 +45,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context-root setting in "
+ "sun-web.xml");
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -108,6 +108,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties
index ed00c28..7958e36 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-empty-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml
index 6c9683f..968deb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/web/emptyContextRoot/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/descriptor/sun-web.xml
index 656c52c..12921d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/descriptor/sun-web.xml
@@ -20,5 +20,5 @@
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-1.dtd">
<sun-web-app>
- <context-root>/</context-root>
+ <context-root>/</context-root>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java
index 3787482..e8296e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 28058");
WebTest webTest = new WebTest(args);
@@ -49,15 +49,15 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties
index f0756e7..ad3a8a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-empty-servlet-path-jsp-include"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/emptyServletPathJspInclude/servlet/Foo.java b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
index f2c6b99..2833aec 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
@@ -27,6 +27,6 @@
System.out.println("FOOFOO: " + req.getRequestURL());
RequestDispatcher rd = getServletConfig().getServletContext().getNamedDispatcher("jsp");
rd.forward(req, res);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java
index f0ae591..d991e32 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for exception-type-to-custom-error-page mapping");
@@ -60,8 +60,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -79,7 +79,7 @@
}
private void invoke() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/sqlException.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties
index 2f86482..4bb4114 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-error-page-exception-type-mapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/errorPageExceptionTypeWrapper/WebTest.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/WebTest.java
index 43633c1..af931d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 13924");
WebTest webTest = new WebTest(args);
@@ -60,15 +60,15 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties
index 4893ace..4cf2868 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-error-page-exception-type-wrapper"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/errorPageHandlingForError/WebTest.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/WebTest.java
index 2d2cf81..c8465cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for error-page-handling-for-error");
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("HelloServlet",
"HTTP/1.1 500 ",
"Error page for Hello Exception");
@@ -81,7 +81,7 @@
}
private void invoke(String page, String expectedStatus, String expectedResponseBody) throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/" + page + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties
index 92c82d0..cb1aca6 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-error-page-handling-for-error"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/errorPageHandlingForError/servlet/test/HelloServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
index ccad9ef..f77cf60 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
@@ -35,8 +35,8 @@
*/
@WebServlet(name="HelloServlet", urlPatterns={"/HelloServlet"})
public class HelloServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,10 +53,10 @@
// the servlet returns 200 if PrintWriter is closed
// out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -67,9 +67,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -82,7 +82,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
index 88ddcb5..944f505 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
@@ -25,6 +25,6 @@
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- if (true) throw new NoClassDefFoundError();
+ if (true) throw new NoClassDefFoundError();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java
index 78f2c87..22d04b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java
@@ -26,7 +26,7 @@
new SimpleReporterAdapter("appserv-tests");
public static void main(String args[]) {
-
+
stat.addDescription("IT 11802: exploded war support");
String host = args[0];
@@ -35,7 +35,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -60,7 +60,7 @@
System.out.println(getString);
os.write(getString.getBytes());
os.write("\n".getBytes());
-
+
is = s.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -90,5 +90,5 @@
}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.properties b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.properties
index a4527a0..ca25f81 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/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="web"/>
-<property name="appname" value="${module}-exploded-war"/>
+<property name="appname" value="${module}-exploded-war"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
index 026f89a..2b11992 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
@@ -37,7 +37,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -60,17 +60,17 @@
<copy file="${web.xml}" todir="${assemble.dir}/WEB-INF"/>
<echo message="test.ServletContainerInitializerTest"
file="${assemble.dir}/WEB-INF/lib/foo.jar/META-INF/services/jakarta.servlet.ServletContainerInitializer"/>
-
+
<javac
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-dir"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -82,10 +82,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/web/explodedWar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/explodedWar/descriptor/web.xml
index db8bc3a..2a5289b 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/descriptor/web.xml
@@ -21,14 +21,14 @@
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
index a71f636..bd7f577 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
@@ -19,19 +19,19 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession(true).setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
+
+ }
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
index ac702d5..ca52181 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
@@ -22,19 +22,19 @@
@WebFilter("/*")
public class FilterTest2 implements Filter{
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession(true).setAttribute("FILTER2", "PASS");
filterChain.doFilter(request, response);
-
- }
-
+
+ }
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
index 40d8be4..27718ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
@@ -28,12 +28,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println(request.getSession(true).getAttribute("FILTER") + " " +
request.getSession(true).getAttribute("FILTER2") + " " +
- getServletContext().getAttribute("SCInit"));
+ getServletContext().getAttribute("SCInit"));
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java
index 681a193..59bafbf 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java
@@ -23,8 +23,8 @@
* (Add support for nested JAR files to <sun-web-app><class-loader>'s
* extra-class-path attribute and to "asadmin deploy --libraries"):
*
- * This unit adds "jar:file:/tmp/abc.jar!/" to the extra-class-path in
- * sun-web.xml, and expects the servlet to be able to instantiate the
+ * This unit adds "jar:file:/tmp/abc.jar!/" to the extra-class-path in
+ * sun-web.xml, and expects the servlet to be able to instantiate the
* aaa.bbb.ccc.Test class from this JAR file.
*
* Notice that because of 4735639 ("URLClassLoader does not work with
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 2917");
@@ -61,11 +61,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -84,10 +84,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties
index c95541b..4a78590 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-extra-class-path-jar-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml
index 5006e93..23f7379 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,23 +46,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}"/>
@@ -74,10 +74,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<copy file="abc.jar" todir="/tmp" failonerror="true"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java
index 03472a0..5b4bca1 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 904");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -77,10 +77,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties
index 28d0cc4..9b774e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-extra-class-path-relative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml
index 3cebf8f..3fb5f14 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/fileDownloadTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.properties
index e0e5e6b..22b446f 100644
--- a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-file-download-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml
index 6f4c388..7934386 100644
--- a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml
@@ -45,31 +45,31 @@
<target name="build">
<mkdir dir="build/webapp"/>
- <copy file="${env.S1AS_HOME}/modules/webservices-osgi.jar" todir="build/webapp"/>
+ <copy file="${env.S1AS_HOME}/modules/webservices-osgi.jar" todir="build/webapp"/>
<javac srcdir="src/main/java" destdir="build" debug="true"
classpath="${test}"
includes="**/*.java"/>
- <zip file="${assemble.dir}/${appname}-web.war">
- <fileset dir="build/webapp"/>
- <fileset dir="src/main/webapp"/>
- </zip>
+ <zip file="${assemble.dir}/${appname}-web.war">
+ <fileset dir="build/webapp"/>
+ <fileset dir="src/main/webapp"/>
+ </zip>
</target>
- <target name="deploy">
- <property name="force" value="true"/>
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy">
+ <property name="force" value="true"/>
+ <antcall target="deploy-war-common"/>
+ </target>
- <target name="undeploy">
- <property name="force" value="true"/>
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy">
+ <property name="force" value="true"/>
+ <antcall target="undeploy-war-common"/>
+ </target>
<target name="all" depends="init-common, build, run, deploy, undeploy"/>
-
+
<target name="run" depends="init-common, build, deploy">
- <java classname="org.glassfish.devtests.web.filedownload.WebTest" classpath="${test}"/>
+ <java classname="org.glassfish.devtests.web.filedownload.WebTest" classpath="${test}"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java
index a7df538..e964127 100644
--- a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java
@@ -30,63 +30,63 @@
* @author justin.d.lee@oracle.com
*/
public class WebTest extends BaseDevTest {
- private static final String TEST_NAME = "default-response-type";
+ private static final String TEST_NAME = "default-response-type";
- byte[] ba = new byte[1024];
+ byte[] ba = new byte[1024];
- @Override
- protected String getTestDescription() {
- return "file download time out test";
- }
+ @Override
+ protected String getTestDescription() {
+ return "file download time out test";
+ }
- @Override
- protected String getTestName() {
- return TEST_NAME;
- }
+ @Override
+ protected String getTestName() {
+ return TEST_NAME;
+ }
- /**
- * @param args the command line arguments
- */
- public void run() throws Exception {
- asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=300");
- // TODO code application logic here
- URL u = new URL("http://localhost:" + antProp("http.port") + "/web-file-download-timeout/webservices-osgi.jar");
- HttpURLConnection huc = (HttpURLConnection) u.openConnection();
- huc.setRequestMethod("GET");
- huc.setReadTimeout(0);
+ /**
+ * @param args the command line arguments
+ */
+ public void run() throws Exception {
+ asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=300");
+ // TODO code application logic here
+ URL u = new URL("http://localhost:" + antProp("http.port") + "/web-file-download-timeout/webservices-osgi.jar");
+ HttpURLConnection huc = (HttpURLConnection) u.openConnection();
+ huc.setRequestMethod("GET");
+ huc.setReadTimeout(0);
- InputStream is = huc.getInputStream();
+ InputStream is = huc.getInputStream();
- File base = new File("src/main/webapp/webservices-osgi.jar");
- File tmp = new File("/tmp");
- if(!tmp.exists()) {
- tmp = new File(System.getProperty("java.io.tmpdir"));
- }
- File file = File.createTempFile("webservices-osgi", ".jar", tmp);
- file.deleteOnExit();
- FileOutputStream fos = new FileOutputStream(file);
+ File base = new File("src/main/webapp/webservices-osgi.jar");
+ File tmp = new File("/tmp");
+ if(!tmp.exists()) {
+ tmp = new File(System.getProperty("java.io.tmpdir"));
+ }
+ File file = File.createTempFile("webservices-osgi", ".jar", tmp);
+ file.deleteOnExit();
+ FileOutputStream fos = new FileOutputStream(file);
- int c;
- Long start = System.currentTimeMillis();
- try {
- while ((c = is.read(ba)) != -1) {
- fos.write(ba, 0, c);
- Thread.sleep(10);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- is.close();
- fos.close();
- asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=");
- }
- Long end = System.currentTimeMillis();
+ int c;
+ Long start = System.currentTimeMillis();
+ try {
+ while ((c = is.read(ba)) != -1) {
+ fos.write(ba, 0, c);
+ Thread.sleep(10);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ is.close();
+ fos.close();
+ asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=");
+ }
+ Long end = System.currentTimeMillis();
- report(TEST_NAME, 30 <= (end - start)/1000);
- boolean same = base.length() == file.length();
- report(TEST_NAME, same);
- }
+ report(TEST_NAME, 30 <= (end - start)/1000);
+ boolean same = base.length() == file.length();
+ report(TEST_NAME, same);
+ }
public static void main(String[] args) throws Exception {
new WebTest().run();
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java
index 387b887..288a8d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11979");
@@ -78,7 +78,7 @@
public boolean doTest(String page) throws Exception {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/" + page);
-
+
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties
index 65750ba..b806f32 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-filter-multiple-init"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml
index bc87390..5e70419 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml
@@ -37,7 +37,7 @@
<fileset dir="${basedir}" includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,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}"/>
@@ -73,10 +73,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/web/filterURIMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/WebTest.java
index 69ae624..3ce20ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -43,16 +43,16 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Unit test for 4903209");
WebTest webTest = new WebTest(args);
int port = new Integer(webTest.portS).intValue();
String name;
-
+
try {
- // Check if it strips out uri parameters (";.*")
+ // Check if it strips out uri parameters (";.*")
// before mapping to webapps
webTest.goGet(webTest.host, port,
webTest.contextRoot + "/ServletTest;test=aaa" );
@@ -82,7 +82,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
@@ -123,5 +123,5 @@
stat.addStatus(TEST_NAME + " FAILED", stat.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties
index 41b37e8..405e0cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-filterURIMapping"/>
+<property name="appname" value="${module}-filterURIMapping"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-filterURIMapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/filterURIMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/descriptor/web.xml
index c9b81fe..1d702b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/descriptor/web.xml
@@ -26,23 +26,23 @@
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/ServletTest</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
index a76f882..f1f627c 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,18 +39,18 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
Object obj = request.getSession().getAttribute("FILTER");
System.out.println(obj);
if ((obj != null) && (obj.equals("PASS"))) {
out.println("Filter invoked");
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java
index 7b6af66..7af4608 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
private static final String TEST_NAME = "form-based";
private static final String JSESSIONID = "JSESSIONID";
private static final String FILTER_REQUEST = "FILTER-REQUEST:";
@@ -52,7 +52,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone jsr115 war test");
WebTest webTest = new WebTest(args);
@@ -92,7 +92,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -111,7 +111,7 @@
close(is);
close(br);
}
-
+
if (cookie == null) {
throw new Exception("Missing Set-Cookie response header");
}
@@ -141,7 +141,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -188,7 +188,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/build.properties b/appserver/tests/appserv-tests/devtests/web/form-based/build.properties
index 3f42c58..695fc81 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-form-based"/>
+<property name="appname" value="${module}-form-based"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-form-based"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/build.xml b/appserver/tests/appserv-tests/devtests/web/form-based/build.xml
index 4767586..dc3984d 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -52,11 +52,11 @@
</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="**/*.jsp"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.jsp"/>
</antcall>
<javac
@@ -64,8 +64,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -75,7 +75,7 @@
<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}"/>
@@ -89,10 +89,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml
index f15f4c3..7391d79 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java
index 0925729..643fbf5 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4925406");
WebTest webTest = new WebTest(args);
@@ -59,8 +59,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintField/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintField/build.properties
index c8aab4a..27011f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintField/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintField/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="web"/>
-<property name="appname" value="${module}-form-hint-field"/>
+<property name="appname" value="${module}-form-hint-field"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/formHintFieldPostWithQueryParam/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/WebTest.java
index 36d9319..a62d710 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/WebTest.java
@@ -25,7 +25,7 @@
* form-hint-field if form action contains query parameters.
*/
public class WebTest {
-
+
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -66,10 +66,10 @@
// Construct body
String body = URLEncoder.encode("j_encoding", "UTF-8")
+ "=" + URLEncoder.encode("Shift_JIS", "UTF-8");
-
+
// Create a socket to the host
Socket socket = new Socket(host, new Integer(port).intValue());
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream(), "UTF8"));
@@ -78,7 +78,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
@@ -101,5 +101,5 @@
stat.addStatus(TEST_NAME, stat.PASS);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties
index 9590c7f..fcb95cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-form-hint-field-post-with-query-param"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java
index 78bfe93..6b1b7fa 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6346738");
WebTest test = new WebTest(args);
@@ -67,7 +67,7 @@
}
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -76,7 +76,7 @@
// Create a socket to the host
socket = new Socket(host, new Integer(port).intValue());
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream()));
@@ -85,7 +85,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties
index f00095b..5df65c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-form-hint-field-post-with-query-param-precedence"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/formHintFieldPrecedence/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/WebTest.java
index 0252223..6195e78 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/WebTest.java
@@ -24,8 +24,8 @@
* <locale-charset-info>, which has been deprecated.
*
* In its sun-web.xml, this web module specifies two parameter-encoding
- * elements, each with a form-hint-field attribute: the value of the
- * form-hint-field attribute of the <parameter-encoding> subelement of
+ * elements, each with a form-hint-field attribute: the value of the
+ * form-hint-field attribute of the <parameter-encoding> subelement of
* <sun-web-app> is 'sunWebAppFromHintField', whereas the value of the
* form-hint-field attribute of the <parameter-encoding> subelement of
* <locale-charset-info> is 'localeCharsetInfoFormHintField'.
@@ -69,7 +69,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(TEST_NAME);
WebTest webTest = new WebTest(args);
@@ -77,8 +77,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.properties
index 43a141f..1a895c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/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="web"/>
-<property name="appname" value="${module}-form-hint-field-precedence"/>
+<property name="appname" value="${module}-form-hint-field-precedence"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/formLoginAccessSessionOnResumedRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/WebTest.java
index ccc19eb..9781d97 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for http://forums.java.net/jive/thread.jspa?messageID=299899
- *
+ *
* Make sure that session established by FormAuthenticator may be accessed
* (resumed) by protected resource (in this case, AccessSession servlet) even
* if the original request that caused a (re)login contains a cookie with an
@@ -56,7 +56,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test that accesses session established by " +
@@ -71,7 +71,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -102,7 +102,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -121,7 +121,7 @@
close(is);
close(br);
}
-
+
if (cookie == null) {
throw new Exception("Missing Set-Cookie response header");
}
@@ -151,7 +151,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -198,7 +198,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties
index f12a19a..aa2214b 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-form-login-access-session-on-resumed-request"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml
index 417f845..53bdbf2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -50,10 +50,10 @@
</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
@@ -61,14 +61,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -85,7 +85,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml
index 99fd1d7..5d8b991 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml
@@ -35,12 +35,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
index e871aa1..5401657 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
@@ -32,7 +32,7 @@
}
HttpSession session = req.getSession(false);
- if (session == null) {
+ if (session == null) {
throw new ServletException("Unable to access login session");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java
index 80db35b..868e7bf 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java
@@ -48,7 +48,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -62,7 +62,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -122,7 +122,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties
index d673a47..1a6562d 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-form-login-jsecurity-check-direct-access"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml
index 417f845..53bdbf2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -50,10 +50,10 @@
</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
@@ -61,14 +61,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -85,7 +85,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java
index 4b1fd13..a4560f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java
@@ -25,7 +25,7 @@
*
* This unit test has been reworked in light of the fix for CR 6633257:
* Rather than issuing a redirect over https to the login.jsp login page
- * (which is protected by a transport-guarantee of CONFIDENTIAL), the
+ * (which is protected by a transport-guarantee of CONFIDENTIAL), the
* redirect over https will be applied to the original request (that is,
* to protected.jsp), followed by a FORWARD dispatch to login.jsp.
*
@@ -51,7 +51,7 @@
httpsPort = args[2];
contextRoot = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3374");
@@ -80,11 +80,11 @@
}
String redirectLocation = conn.getHeaderField("Location");
System.out.println("Location: " + redirectLocation);
-
+
String expectedRedirectLocation = "https://" + host + ":" + httpsPort
+ contextRoot + "/protected.jsp";
if (!expectedRedirectLocation.equals(redirectLocation)) {
throw new Exception("Unexpected redirect location");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties
index d197535..b3149b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-form-login-transport-guarantee-confidential"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml
index 75d78ff..da38959 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -76,7 +76,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java
index a0be862..738eb48 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Forward With Query String");
String host = args[0];
@@ -41,7 +41,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest?queryString=test" );
} catch (Throwable t) {
@@ -50,7 +50,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("forwardWithQueryString", stat.FAIL);
- }
+ }
stat.printSummary("web/forwardWithQueryString---> expect " + EXPECTED_COUNT);
}
@@ -65,7 +65,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -80,18 +80,18 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-forwardWithQueryString: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-forwardWithQueryString: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-forwardWithQueryString: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties
index b470ee5..9bafb17 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-forwardWithQueryString"/>
+<property name="appname" value="${module}-forwardWithQueryString"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-forwardWithQueryString"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml
index 743470d..a937d7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -60,7 +60,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -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/web/forwardWithQueryString/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
index d4371f6..147e8ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
@@ -19,18 +19,18 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
filterChain.doFilter(request, response);
- }
-
-
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
index 4cd933e..995671d 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
@@ -28,7 +28,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -38,12 +38,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
index 0a51ae2..d330493 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
@@ -25,7 +25,7 @@
public class ServletTest2 extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -35,13 +35,13 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
index 26d5ca5..508d67a 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
@@ -25,20 +25,20 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- context = config.getServletContext();
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
System.out.println("queryString: " + request.getQueryString());
out.println("FILTER-QUERYSTRING:" +
(request.getQueryString() != null ? "PASS" : "FAIL"));
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java
index 2d046aa..726a0fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java
@@ -21,7 +21,7 @@
public class WebTest {
private static final String TEST_NAME = "get-attribute-after-forward";
-
+
private static final SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -40,7 +40,7 @@
stat.addDescription("Get attribute after forward");
WebTest webTest = new WebTest(args);
-
+
try {
webTest.doTest(
"/forward.jsp?forward=include.jsp&include=process.jsp" );
@@ -63,5 +63,5 @@
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties
index 7fdc9f9..13baeab 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-get-attribute-after-forward"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml
index 1a0fc3e..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/getAttributeAfterInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/WebTest.java
index bcf10b7..47acdef 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final String TEST_NAME = "get-attribute-after-include";
private static final SimpleReporterAdapter stat =
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties
index 86eba21..c20560c 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-get-attribute-after-include"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml
index 1a0fc3e..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/getLocalPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getLocalPort/WebTest.java
index 6253733..dbe5e86 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test for getLocalName() getLocalPort Servlet 2.4 new Features");
@@ -44,13 +44,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "getLocalPort", contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("localPort getLocalPort UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("localPort getLocalPort UNPREDICTED-FAILURE", stat.FAIL);
@@ -72,7 +72,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,19 +87,19 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase(String.valueOf(port))){
stat.addStatus("web-localPort: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-localPort: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-localPort: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("localPort getLocalPort UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties b/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties
index 6ccadaf..acc8934 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-localName"/>
+<property name="appname" value="${module}-localName"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-localName"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml b/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml
index eec3bec..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/getLocalPort/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/getLocalPort/descriptor/web.xml
index 6be4073..3dcff7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/descriptor/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
index 68296c9..7e52e63 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
@@ -23,13 +23,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,12 +37,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("getLocalPort:" + request.getLocalPort());
out.flush();
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java
index da1e18c..b74e2b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4894654");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJSP();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -65,14 +65,14 @@
}
private void invokeJSP() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/main.jsp" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -93,7 +93,7 @@
int i = line.indexOf("/jsp/first.jsp");
line = line.substring(i);
System.out.println(line);
-
+
Socket sock2 = new Socket(host, new Integer(port).intValue());
os = sock2.getOutputStream();
get = "GET "+ contextRoot + line + " HTTP/1.0\n";
@@ -105,7 +105,7 @@
while ((line = bis.readLine()) != null) {
i = line.indexOf("iPlanetDirectoryPro=");
- if (i > 0) {
+ if (i > 0) {
param1 = line.substring(i);
System.out.println("First param is " + param1);
if ((line = bis.readLine()) != null) {
@@ -113,7 +113,7 @@
if (i > 0) {
param2 = line.substring(i);
System.out.println("Second param is " + param2);
- }
+ }
}
}
}
@@ -128,7 +128,7 @@
fail = false;
} else {
stat.addStatus("Parameters encoding/decoding is not consistent",
- stat.FAIL);
+ stat.FAIL);
fail = true;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties b/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties
index 10eecca..9bc420e 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-getRequestURI"/>
+<property name="appname" value="${module}-getRequestURI"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-getRequestURI"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml b/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/getRequestURI/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/getRequestURI/descriptor/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/descriptor/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java
index f2292b8..7415e9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6021119");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -78,7 +78,7 @@
os.write(("GET " + contextRoot + "/TestServlet HTTP/1.1\n").getBytes());
os.write(("Host: " + SERVER_NAME + ":" + SERVER_PORT + "\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties
index b4829c1..90517c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-get-server-name-and-port"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml
index f579559..77d690c 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
index f7b5512..0d4bfa1 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
index 13b1803..39049ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index 03aeb46..92d0f2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -32,8 +32,8 @@
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -47,7 +47,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -63,13 +63,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -80,9 +80,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -95,7 +95,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties
index 7a8f104..3271c26 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ha-web"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml
index 53c7612..38a57c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -72,11 +72,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
index 8b15f37..a6e1a75 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
@@ -116,7 +116,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -134,7 +134,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -169,7 +169,7 @@
result = result && prev.getJsessionCookie().equals(current.getJsessionCookie());
result = result && prev.getHttpCounter() < current.getHttpCounter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
index c4b608b..0cf7255 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml
index c51a2b9..9a89c01 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml
index 001b1dd..4c682f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index ed64b72..0f12964 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,7 +75,7 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
@@ -84,7 +84,7 @@
session.setAttribute(KEY_1, sfsb1);
session.setAttribute(KEY_2, sfsb2);
-
+
out.println("<h3>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h3>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -113,13 +113,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -130,9 +130,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -145,7 +145,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java
index 9be04e4..51b10c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java
@@ -113,7 +113,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -131,7 +131,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -198,7 +198,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml
index 3dafe05..a0687e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml
index 54dee0e..a203249 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java
index b676835..feed93f 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java
@@ -113,7 +113,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -131,7 +131,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -198,7 +198,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml
index f579559..77d690c 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
index f7b5512..0d4bfa1 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
index 13b1803..39049ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index f81f933..31be01b 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
index 62f4dfd..6040133 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
@@ -113,7 +113,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -131,7 +131,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -198,7 +198,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
index c4b608b..0cf7255 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java
index b13617d..da15b11 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java
@@ -64,7 +64,7 @@
user = args[5];
password = args[6];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -152,7 +152,7 @@
// follow the redirect
int cA1 = go(port1, new URL(redirect).getPath(), "A");
int cB1 = go(port1, contextRootPrefix + "-b/index.jsp", "B");
-
+
// stop inst1
asadmin("stop-local-instance", instancename1);
@@ -208,7 +208,7 @@
System.out.println(sb);
os.write("\n\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -231,7 +231,7 @@
close(os);
close(br);
close(is);
- }
+ }
if (count == -1) {
throw new Exception("Failed to access index.jsp");
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties
index eb8451b..46679a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ha-sso-failover"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml
index 3f43fe5..769c967 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/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,7 +47,7 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<delete file="${basedir}/docroot/index.jsp"/>
<copy file="${basedir}/docroot/index.jsp.a" tofile="${basedir}/docroot/index.jsp"/>
@@ -68,7 +68,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -118,7 +118,7 @@
<param name="operand.props" value="--cluster ${cluster.name} --systemproperties HTTP_LISTENER_PORT=${instance.http.port} ${instance.name}"/>
</antcall>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common">
<param name="appname" value="${appname}-a"/>
@@ -157,7 +157,7 @@
</antcall>
<antcall target="run"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common">
<param name="appname" value="${appname}-a"/>
@@ -167,7 +167,7 @@
<param name="appname" value="${appname}-b"/>
<param name="appserver.instance.name" value="${cluster.name}"/>
</antcall>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml
index bb5d516..4851c74 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml
@@ -26,12 +26,12 @@
<distributable/>
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java
index 9ca539f..2133138 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("headerBufferSize");
@@ -62,7 +62,7 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -86,6 +86,6 @@
} else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties
index 30780f5..c56577e 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-headerBufferFull"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml
index 5b43fb0..d3abc12 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -74,7 +74,7 @@
value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.max-response-headers=100"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -90,10 +90,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/web/headerBufferSize/WebTest.java b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/WebTest.java
index ed9c518..eea996a 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/WebTest.java
@@ -36,7 +36,7 @@
= new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "headerBufferSize";
- // Request keys
+ // Request keys
/** Hashtable key for headers property (type of corresponding value = Hashtable). */
public static final String HEADERS = "headers";
@@ -46,7 +46,7 @@
/** Hashtable key for request parameters property (type of corresponding value = Hashtable). */
public static final String REQUEST_PARAMS = "request_params";
- // Response keys
+ // Response keys
/** Hashtable key for response code property (type of corresponding value = Integer). */
public static final String RESPONSE_CODE = "response_code";
@@ -56,18 +56,18 @@
/** Hashtable key for response content property (type of corresponding value = String). */
public static final String RESPONSE_CONTENT = "response_content";
- // Request and response keys
+ // Request and response keys
/** Hashtable key for cookies property (type of corresponding value = String[]). */
public static final String COOKIES = "cookies";
- // Values
+ // Values
/** GET value for property method. */
public static final String GET_METHOD = "GET";
/** POST value for property method. */
public static final String POST_METHOD = "POST";
- // Default values
+ // Default values
/** Default value for property method. */
private static final String DEFAULT_METHOD = GET_METHOD;
@@ -77,7 +77,7 @@
/** Default value for user-agent header. */
private static final String DEFAULT_CONNECTION_HEADER = "close";
- // Static methods
+ // Static methods
/**
** Main method for testing purposes.
@@ -89,62 +89,62 @@
String host = args[0];
String port = args[1];
String contextRoot = args[2];
-
- try {
- String[] testUrls = new String[1];
- testUrls[0] = "http://" + host + ":" + port + contextRoot
+
+ try {
+ String[] testUrls = new String[1];
+ testUrls[0] = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
- String[] methods = new String[2];
- methods[0] = "GET";
- methods[1] = "GET";
- Hashtable[] paramsTables = new Hashtable[4];
- Hashtable params1 = new Hashtable();
- params1.put("test", "on");
- params1.put("num_tel", "065216464");
- Hashtable params2 = new Hashtable();
- params2.put("test", "on");
- params2.put("num_tel", "0577749059");
- Hashtable params3 = new Hashtable();
- params3.put("num_tel", "0652361456");
- Hashtable params4 = new Hashtable();
- String[] multipleParam = new String[3];
- multipleParam[0] = "1";
- multipleParam[1] = "2";
- multipleParam[2] = "3";
- params4.put("a", multipleParam);
- params4.put("b", "2");
- params4.put("c", "3");
- paramsTables[0] = params1;
- paramsTables[1] = params2;
- paramsTables[2] = params3;
- paramsTables[3] = params4;
- for(int i = 0; i < 1; i++) {
- Hashtable reqProperties = new Hashtable();
- reqProperties.put(METHOD, methods[i]);
- reqProperties.put(REQUEST_PARAMS, paramsTables[i]);
- System.out.println("TEST " + (i + 1) + ": " + testUrls[i] + " (" + methods[i] + ")");
- System.out.println("Parameters:");
- for(Enumeration keys = (paramsTables[i]).keys(); keys.hasMoreElements(); ) {
- String paramName = (String) keys.nextElement();
- Object paramValues = (paramsTables[i]).get(paramName);
- if(paramValues instanceof String[]) {
- // Multiple parameter values
- String[] paramValueList = (String[]) paramValues;
- for(int j = 0; j < paramValueList.length; j++) {
- String paramValue = paramValueList[j];
- if(j == 0)
- System.out.print(paramName + " = " + paramValue);
- else
- System.out.print(", " + paramValue);
- }
- System.out.println();
- }
- else {
- // Single parameter value
- String paramValue = (String) paramValues;
- System.out.println(paramName + " = " + paramValue);
- }
- }
+ String[] methods = new String[2];
+ methods[0] = "GET";
+ methods[1] = "GET";
+ Hashtable[] paramsTables = new Hashtable[4];
+ Hashtable params1 = new Hashtable();
+ params1.put("test", "on");
+ params1.put("num_tel", "065216464");
+ Hashtable params2 = new Hashtable();
+ params2.put("test", "on");
+ params2.put("num_tel", "0577749059");
+ Hashtable params3 = new Hashtable();
+ params3.put("num_tel", "0652361456");
+ Hashtable params4 = new Hashtable();
+ String[] multipleParam = new String[3];
+ multipleParam[0] = "1";
+ multipleParam[1] = "2";
+ multipleParam[2] = "3";
+ params4.put("a", multipleParam);
+ params4.put("b", "2");
+ params4.put("c", "3");
+ paramsTables[0] = params1;
+ paramsTables[1] = params2;
+ paramsTables[2] = params3;
+ paramsTables[3] = params4;
+ for(int i = 0; i < 1; i++) {
+ Hashtable reqProperties = new Hashtable();
+ reqProperties.put(METHOD, methods[i]);
+ reqProperties.put(REQUEST_PARAMS, paramsTables[i]);
+ System.out.println("TEST " + (i + 1) + ": " + testUrls[i] + " (" + methods[i] + ")");
+ System.out.println("Parameters:");
+ for(Enumeration keys = (paramsTables[i]).keys(); keys.hasMoreElements(); ) {
+ String paramName = (String) keys.nextElement();
+ Object paramValues = (paramsTables[i]).get(paramName);
+ if(paramValues instanceof String[]) {
+ // Multiple parameter values
+ String[] paramValueList = (String[]) paramValues;
+ for(int j = 0; j < paramValueList.length; j++) {
+ String paramValue = paramValueList[j];
+ if(j == 0)
+ System.out.print(paramName + " = " + paramValue);
+ else
+ System.out.print(", " + paramValue);
+ }
+ System.out.println();
+ }
+ else {
+ // Single parameter value
+ String paramValue = (String) paramValues;
+ System.out.println(paramName + " = " + paramValue);
+ }
+ }
String[] cookieList = new String[9];
@@ -180,35 +180,35 @@
reqProperties.put(COOKIES, cookieList);
- Hashtable result = call(testUrls[i], reqProperties);
- System.out.println("Result:");
- System.out.println( "Response Code = " + ( (Integer) result.get(RESPONSE_CODE) ).toString() );
- System.out.println( "Response Message = " + (String) result.get(RESPONSE_MESSAGE) );
- System.out.println("Response Content:");
- System.out.println( (String) result.get(RESPONSE_CONTENT) );
- String[] setCookies = (String[]) result.get(COOKIES);
- if( (setCookies != null) && (setCookies.length > 0) ) {
- System.out.println("Cookies set by Server:");
- for(int j = 0; j < setCookies.length; j++) {
- System.out.println("Cookie " + (j + 1) + " = " + setCookies[j]);
- }
- }
- System.out.println();
- System.out.println("-------------------------------------------");
- System.out.println();
- System.out.println();
+ Hashtable result = call(testUrls[i], reqProperties);
+ System.out.println("Result:");
+ System.out.println( "Response Code = " + ( (Integer) result.get(RESPONSE_CODE) ).toString() );
+ System.out.println( "Response Message = " + (String) result.get(RESPONSE_MESSAGE) );
+ System.out.println("Response Content:");
+ System.out.println( (String) result.get(RESPONSE_CONTENT) );
+ String[] setCookies = (String[]) result.get(COOKIES);
+ if( (setCookies != null) && (setCookies.length > 0) ) {
+ System.out.println("Cookies set by Server:");
+ for(int j = 0; j < setCookies.length; j++) {
+ System.out.println("Cookie " + (j + 1) + " = " + setCookies[j]);
+ }
+ }
+ System.out.println();
+ System.out.println("-------------------------------------------");
+ System.out.println();
+ System.out.println();
if ( ((Integer)result.get(RESPONSE_CODE)) == 200){
stat.addStatus(TEST_NAME, stat.PASS);
} else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
- } catch(Exception exc) {
- System.err.println( "Exception occurred: " + exc.getMessage() );
- exc.printStackTrace(System.err);
+ }
+ } catch(Exception exc) {
+ System.err.println( "Exception occurred: " + exc.getMessage() );
+ exc.printStackTrace(System.err);
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
stat.printSummary(TEST_NAME);
}
@@ -252,33 +252,33 @@
** @throws IOException if an I/O exception occurs during the HTTP request
**/
public static Hashtable call(String url, Hashtable requestProperties)
- throws MalformedURLException, IOException {
- if(url == null)
- throw new MalformedURLException("URL address cannot be null!");
- if(requestProperties == null)
- throw new MalformedURLException("URL request properties cannot be null!");
- // else
- Hashtable headers = (Hashtable) requestProperties.get(HEADERS);
- if(headers == null)
- headers = new Hashtable();
- if( ( ( (String) headers.get("User-Agent") ) == null ) || ( ( (String) headers.get("User-Agent") ).equals("") ) )
- headers.put("User-Agent", DEFAULT_USER_AGENT_HEADER);
- if( ( ( (String) headers.get("Connection") ) == null ) || ( ( (String) headers.get("Connection") ).equals("") ) )
- headers.put("Connection", DEFAULT_CONNECTION_HEADER);
- String method = (String) requestProperties.get(METHOD);
- if( (method == null) || !( method.equalsIgnoreCase(GET_METHOD) || method.equalsIgnoreCase(POST_METHOD) ) )
- method = DEFAULT_METHOD;
- Hashtable requestParams = (Hashtable) requestProperties.get(REQUEST_PARAMS);
- if(requestParams == null)
- requestParams = new Hashtable();
- String[] cookies = (String[]) requestProperties.get(COOKIES);
- if(cookies == null)
- cookies = new String[0];
- if( method.equalsIgnoreCase(GET_METHOD) )
- return( doGetCall(url, headers, cookies, requestParams) );
- else
- return( doPostCall(url, headers, cookies, requestParams) );
- }
+ throws MalformedURLException, IOException {
+ if(url == null)
+ throw new MalformedURLException("URL address cannot be null!");
+ if(requestProperties == null)
+ throw new MalformedURLException("URL request properties cannot be null!");
+ // else
+ Hashtable headers = (Hashtable) requestProperties.get(HEADERS);
+ if(headers == null)
+ headers = new Hashtable();
+ if( ( ( (String) headers.get("User-Agent") ) == null ) || ( ( (String) headers.get("User-Agent") ).equals("") ) )
+ headers.put("User-Agent", DEFAULT_USER_AGENT_HEADER);
+ if( ( ( (String) headers.get("Connection") ) == null ) || ( ( (String) headers.get("Connection") ).equals("") ) )
+ headers.put("Connection", DEFAULT_CONNECTION_HEADER);
+ String method = (String) requestProperties.get(METHOD);
+ if( (method == null) || !( method.equalsIgnoreCase(GET_METHOD) || method.equalsIgnoreCase(POST_METHOD) ) )
+ method = DEFAULT_METHOD;
+ Hashtable requestParams = (Hashtable) requestProperties.get(REQUEST_PARAMS);
+ if(requestParams == null)
+ requestParams = new Hashtable();
+ String[] cookies = (String[]) requestProperties.get(COOKIES);
+ if(cookies == null)
+ cookies = new String[0];
+ if( method.equalsIgnoreCase(GET_METHOD) )
+ return( doGetCall(url, headers, cookies, requestParams) );
+ else
+ return( doPostCall(url, headers, cookies, requestParams) );
+ }
/**
** Static protected method for performing GET HTTP request to the specified URL.<br>
@@ -293,7 +293,7 @@
** @throws IOException if an I/O exception occurs during the HTTP request
**/
protected static Hashtable doGetCall(String url, Hashtable headers, String[] cookies, Hashtable requestParams)
- throws MalformedURLException, IOException {
+ throws MalformedURLException, IOException {
// Set parameters
StringBuffer queryString = new StringBuffer();
@@ -301,25 +301,25 @@
String paramName = (String) keys.nextElement();
Object paramValues = requestParams.get(paramName);
if(paramValues instanceof String[]) {
- // Multiple parameter values
- String[] paramValueList = (String[]) paramValues;
- for(int i = 0; i < paramValueList.length; i++) {
- String paramValue = paramValueList[i];
- if(queryString.length() == 0)
- queryString.append("?");
- else
- queryString.append("&");
- queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
+ // Multiple parameter values
+ String[] paramValueList = (String[]) paramValues;
+ for(int i = 0; i < paramValueList.length; i++) {
+ String paramValue = paramValueList[i];
+ if(queryString.length() == 0)
+ queryString.append("?");
+ else
+ queryString.append("&");
+ queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
}
else {
- // Single parameter value
- String paramValue = (String) paramValues;
- if(queryString.length() == 0)
- queryString.append("?");
- else
- queryString.append("&");
- queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ // Single parameter value
+ String paramValue = (String) paramValues;
+ if(queryString.length() == 0)
+ queryString.append("?");
+ else
+ queryString.append("&");
+ queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
}
}
URL urlToCall = new URL( url + queryString.toString() );
@@ -332,16 +332,16 @@
String headerName = (String) keys.nextElement();
String headerValue = (String) headers.get(headerName);
if( headerName.equalsIgnoreCase("Cookie") )
- cookiesList.append(headerValue);
+ cookiesList.append(headerValue);
else
- urlConnection.setRequestProperty(headerName, headerValue);
+ urlConnection.setRequestProperty(headerName, headerValue);
}
// Set cookies
for(int i = 0; i < cookies.length; i++) {
- if(cookiesList.length() > 0)
- cookiesList.append("," + cookies[i]);
- else
- cookiesList.append(cookies[i]);
+ if(cookiesList.length() > 0)
+ cookiesList.append("," + cookies[i]);
+ else
+ cookiesList.append(cookies[i]);
}
urlConnection.setRequestProperty( "Cookie", cookiesList.toString() );
// Setting GET method
@@ -365,21 +365,21 @@
// Get response message
String responseMessage = urlConnection.getResponseMessage();
if(responseMessage != null)
- result.put(RESPONSE_MESSAGE, responseMessage);
+ result.put(RESPONSE_MESSAGE, responseMessage);
// Receive cookies
String returnedCookiesStr = urlConnection.getHeaderField("Set-Cookie");
if(returnedCookiesStr != null) {
- StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
- int tokens = commaTokenizer.countTokens();
- if(tokens > 0) {
- String[] returnedCookies = new String[tokens];
- int z = 0;
- while( commaTokenizer.hasMoreTokens() ) {
- returnedCookies[z] = commaTokenizer.nextToken();
- z++;
- }
- result.put(COOKIES, returnedCookies);
- }
+ StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
+ int tokens = commaTokenizer.countTokens();
+ if(tokens > 0) {
+ String[] returnedCookies = new String[tokens];
+ int z = 0;
+ while( commaTokenizer.hasMoreTokens() ) {
+ returnedCookies[z] = commaTokenizer.nextToken();
+ z++;
+ }
+ result.put(COOKIES, returnedCookies);
+ }
}
responseReader.close();
return(result);
@@ -398,7 +398,7 @@
** @throws IOException if an I/O exception occurs during the HTTP request
**/
protected static Hashtable doPostCall(String url, Hashtable headers, String[] cookies, Hashtable requestParams)
- throws MalformedURLException, IOException {
+ throws MalformedURLException, IOException {
URL urlToCall = new URL(url);
HttpURLConnection urlConnection = (HttpURLConnection) urlToCall.openConnection();
urlConnection.setInstanceFollowRedirects(true);
@@ -409,16 +409,16 @@
String headerName = (String) keys.nextElement();
String headerValue = (String) headers.get(headerName);
if( headerName.equalsIgnoreCase("Cookie") )
- cookiesList.append(headerValue);
+ cookiesList.append(headerValue);
else
- urlConnection.setRequestProperty(headerName, headerValue);
+ urlConnection.setRequestProperty(headerName, headerValue);
}
// Set cookies
for(int i = 0; i < cookies.length; i++) {
- if(cookiesList.length() > 0)
- cookiesList.append("," + cookies[i]);
- else
- cookiesList.append(cookies[i]);
+ if(cookiesList.length() > 0)
+ cookiesList.append("," + cookies[i]);
+ else
+ cookiesList.append(cookies[i]);
}
urlConnection.setRequestProperty( "Cookie", cookiesList.toString() );
// Setting POST method
@@ -433,29 +433,29 @@
String paramName = (String) keys.nextElement();
Object paramValues = requestParams.get(paramName);
if(paramValues instanceof String[]) {
- // Multiple parameter values
- String[] paramValueList = (String[]) paramValues;
- for(int i = 0; i < paramValueList.length; i++) {
- String paramValue = paramValueList[i];
- if(writtenParams > 0) {
- out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- else {
- out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- writtenParams++;
- }
+ // Multiple parameter values
+ String[] paramValueList = (String[]) paramValues;
+ for(int i = 0; i < paramValueList.length; i++) {
+ String paramValue = paramValueList[i];
+ if(writtenParams > 0) {
+ out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ else {
+ out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ writtenParams++;
+ }
}
else {
- // Single parameter value
- String paramValue = (String) paramValues;
- if(writtenParams > 0) {
- out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- else {
- out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- writtenParams++;
+ // Single parameter value
+ String paramValue = (String) paramValues;
+ if(writtenParams > 0) {
+ out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ else {
+ out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ writtenParams++;
}
}
out.close();
@@ -475,21 +475,21 @@
// Get response message
String responseMessage = urlConnection.getResponseMessage();
if(responseMessage != null)
- result.put(RESPONSE_MESSAGE, responseMessage);
+ result.put(RESPONSE_MESSAGE, responseMessage);
// Receive cookies
String returnedCookiesStr = urlConnection.getHeaderField("Set-Cookie");
if(returnedCookiesStr != null) {
- StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
- int tokens = commaTokenizer.countTokens();
- if(tokens > 0) {
- String[] returnedCookies = new String[tokens];
- int z = 0;
- while( commaTokenizer.hasMoreTokens() ) {
- returnedCookies[z] = commaTokenizer.nextToken();
- z++;
- }
- result.put(COOKIES, returnedCookies);
- }
+ StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
+ int tokens = commaTokenizer.countTokens();
+ if(tokens > 0) {
+ String[] returnedCookies = new String[tokens];
+ int z = 0;
+ while( commaTokenizer.hasMoreTokens() ) {
+ returnedCookies[z] = commaTokenizer.nextToken();
+ z++;
+ }
+ result.put(COOKIES, returnedCookies);
+ }
}
responseReader.close();
return(result);
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.properties b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.properties
index be1385b..d787639 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/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="web"/>
-<property name="appname" value="${module}-headerBufferSize"/>
+<property name="appname" value="${module}-headerBufferSize"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml
index 9976ae9..859fdad 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -73,7 +73,7 @@
value="configs.config.server-config.network-config.transports.transport.tcp.buffer-size-bytes="/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -88,10 +88,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/web/httpCompression/build.properties b/appserver/tests/appserv-tests/devtests/web/httpCompression/build.properties
index 46b120e..694cbb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpCompression/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpCompression/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-asadmin-deletes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java b/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java
index 6a06cff..32c722d 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java
@@ -43,7 +43,7 @@
public void run() {
try {
final int port = Integer.valueOf(antProp("http.port"));
- final String path = "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.compression=";
+ final String path = "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.compression=";
final String[] schemes = {"gzip", "lzma"};
for (String scheme : schemes) {
String header = scheme + "-";
@@ -66,7 +66,7 @@
get("localhost", port, false, "compressed-output-off-2", scheme);
}
} catch (Exception e) {
- report(e.getMessage(), false);
+ report(e.getMessage(), false);
throw new RuntimeException(e.getMessage(), e);
} finally {
stat.printSummary();
@@ -94,8 +94,8 @@
found |= line.toLowerCase().contains("content-encoding: " + compScheme);
if (zipped) {
chunked |= line.toLowerCase().contains("transfer-encoding: chunked");
- contentLength |= !line.toLowerCase().contains("content-length");
- }
+ contentLength |= !line.toLowerCase().contains("content-length");
+ }
}
} finally {
s.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties
index a52c5a4..c84471a 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-httpConnectorKeepAlive"/>
+<property name="appname" value="${module}-httpConnectorKeepAlive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-httpConnectorKeepAlive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml
index f636658..1269933 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml
@@ -36,13 +36,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="servlet"/>
</antcall>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -60,16 +60,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -77,7 +77,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -94,10 +94,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/web/httpListenerAdminReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/WebTest.java
index 520ca56..7b8e7f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("adminReconfig");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -55,7 +55,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
sock.setSoTimeout(5000);
OutputStream os = sock.getOutputStream();
@@ -64,7 +64,7 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties
index 176fc68..ab51658 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-adminReconfig"/>
+<property name="appname" value="${module}-adminReconfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-adminReconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml
index c1d9868..25b3505 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -63,7 +63,7 @@
value="configs.config.server-config.network-config.protocols.protocol.admin-listener.security-enabled=false"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -77,7 +77,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java
index 38597da..2f11380 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode == 200){
stat.addStatus("httpListenerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java
index b17a957..18743c5 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("httpListenerDynamicConfig-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties
index ad39ac2..399b7f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-httpListenerDynamicConfig"/>
+<property name="appname" value="${module}-httpListenerDynamicConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-httpListenerDynamicConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml
index bdf6df8..ec4194f 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml
@@ -50,7 +50,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -80,7 +80,7 @@
<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}"/>
@@ -92,7 +92,7 @@
</classpath>
</java>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -107,7 +107,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java
index 4e13ba7..82c14da 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1703");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -62,19 +62,19 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/TestServlet" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("Accept-Language: de\n".getBytes());
- // Send Accept-Language header with invalid locale code. Make sure
- // this locale is getting ignored
+ // Send Accept-Language header with invalid locale code. Make sure
+ // this locale is getting ignored
os.write("Accept-Language: 12\n".getBytes());
os.write("Accept-Language: FR\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties
index c788360..13c8811 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-http-request-ignore-invalid-accept-language-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml
index 4103311..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
index 0f21f56..7cbd4e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
@@ -43,7 +43,7 @@
boolean passed = false;
if (num == 2 && deLocaleSeen && frLocaleSeen) {
passed = true;
- }
+ }
res.getWriter().print(passed);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java
index e5ebb40..6e9aa89 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Http Request whitespace tolerance");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -63,7 +63,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.jsp HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties
index 135d57f..ee9c434 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-http-request-whitespace-tolerance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/httpResponseErrorMessage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/WebTest.java
index 7dfea7c..a143d2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for XSS HttpServletResponse.sendError");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -73,7 +73,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.jsp HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties
index 80e7c9c..31f3513 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-http-response-error-message"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/httpResponseServerHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/WebTest.java
index 2d4bdf4..57b4331 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6320750");
@@ -49,12 +49,12 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
private void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/" + "test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -62,12 +62,12 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
return;
- }
+ }
InputStream is = conn.getInputStream();
String serverHeader = conn.getHeaderField("Server");
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties
index cffa23c..685d688 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-http-response-server-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/httpServletDoPost/build.properties b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.properties
index a6adb7a..546668b 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-httpServletDoPost"/>
+<property name="appname" value="${module}-httpServletDoPost"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-httpServletDoPost"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml
index 8eed661..c7a084f 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -59,7 +59,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -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/web/httpServletDoPost/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/descriptor/web.xml
index 36e5965..c8e1c8c 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>servlet.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
index f31f884..b715ff1 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
@@ -28,7 +28,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@@ -36,7 +36,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java
index 7a67065..98ee9f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4968841");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -58,7 +58,7 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
System.out.println(("OPTIONS " + contextRoot + "/TestServlet"
@@ -66,7 +66,7 @@
os.write(("OPTIONS " + contextRoot + "/TestServlet"
+ " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties
index 235a0c8..d836344 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-http-servlet-get-all-declared-methods"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml
index 38d5f1e..3aa3b52 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/includeErrorPageAfterResponseCommit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/WebTest.java
index 3828aac..958bfca 100644
--- a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/WebTest.java
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for " + TEST_NAME);
WebTest webTest = new WebTest(args);
@@ -56,8 +56,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -75,7 +75,7 @@
}
private void invoke() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/sqlException.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties
index 843e072..0013f1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-error-page-after-response-commit"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml
index 00ae711..fd4ffdf 100644
--- a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class"/>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/index/WebTest.java b/appserver/tests/appserv-tests/devtests/web/index/WebTest.java
index b7be3f6..bb6eb08 100644
--- a/appserver/tests/appserv-tests/devtests/web/index/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/index/WebTest.java
@@ -26,8 +26,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -44,12 +44,12 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("index", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/index/build.properties b/appserver/tests/appserv-tests/devtests/web/index/build.properties
index 9b56204..0bd835a 100644
--- a/appserver/tests/appserv-tests/devtests/web/index/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/index/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-index"/>
+<property name="appname" value="${module}-index"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-index"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/index/build.xml b/appserver/tests/appserv-tests/devtests/web/index/build.xml
index d9e0234..fdaf8fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/index/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/index/build.xml
@@ -33,7 +33,7 @@
<target name="clean" depends="init-common">
</target>
-
+
<target name="compile" depends="clean">
</target>
@@ -42,11 +42,11 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -58,9 +58,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java
index 9eaab13..003eeae 100644
--- a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java
@@ -27,7 +27,7 @@
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
-
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -47,7 +47,7 @@
writeOneByte(urlConnection);
int responseCode= urlConnection.getResponseCode();
- System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
+ System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
if (urlConnection.getResponseCode() >= 400 && urlConnection.getResponseCode() < 500){
stat.addStatus("Test installationPathDisclosure", stat.PASS);
} else {
@@ -65,7 +65,7 @@
writeOneByte(urlConnection);
int responseCode= urlConnection.getResponseCode();
- System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
+ System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
if (urlConnection.getResponseCode() >= 400 && urlConnection.getResponseCode() < 500){
stat.addStatus("Test installationPathDisclosure-wrongUrl", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties
index f0db845..1e804bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-installationPathDisclosure"/>
+<property name="appname" value="${module}-installationPathDisclosure"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-installationPathDisclosure"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml
index d9e0234..fdaf8fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml
@@ -33,7 +33,7 @@
<target name="clean" depends="init-common">
</target>
-
+
<target name="compile" depends="clean">
</target>
@@ -42,11 +42,11 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -58,9 +58,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java
index 0cb8ba2..0e4cef0 100644
--- a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for:
*
* http://java.net/jira/browse/GLASSFISH-16013
- * ("RestartRequired: changing http port does not trigger restart required message
+ * ("RestartRequired: changing http port does not trigger restart required message
* for a standalone instance")
*/
public class WebTest {
@@ -47,7 +47,7 @@
location = args[3];
contextRoot = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 16013");
WebTest webTest = new WebTest(args);
@@ -55,8 +55,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -66,13 +66,13 @@
}
private void invoke() throws Exception {
-
- URL url = new URL("http://" + host + ":" + newPort + contextRoot);
+
+ URL url = new URL("http://" + host + ":" + newPort + contextRoot);
System.out.println("Connecting ... "+url);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties
index cb1bcfd..70a0e50 100644
--- a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-instance-http-port-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml
index 82568f5..dedd64e 100644
--- a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,15 +46,15 @@
</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="create-instance" depends="init-common">
<antcall target="create-instance-common"/>
@@ -79,13 +79,13 @@
value="--target ${instance.name} HTTP_LISTENER_PORT=${instance.http.port.2}"/>
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-instance"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -99,10 +99,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-instance"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java
index ee42b93..68fb006 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java
@@ -25,10 +25,10 @@
* disabled.
*
* This client attempts to connect to this URL:
- *
+ *
* http://<host>:<port>/web-invoker-servlet-disabled/servlet/TestServlet
*
- * which must result in a 404, because the test servlet is mapped to this
+ * which must result in a 404, because the test servlet is mapped to this
* url-pattern in web.xml: /TestServlet, instead of /servlet/TestServlet.
*
* The client will be able to connect successfully to the above URL only if the
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4944160");
WebTest webTest = new WebTest(args);
@@ -58,20 +58,20 @@
}
public void doTest() {
-
+
URL url = null;
HttpURLConnection conn = null;
int responseCode;
boolean fail = false;
- try {
+ try {
/*
* Connect to the wrong mapping.
*
* This will work only if the InvokerServlet in default-web.xml
* has been enabled, and therefore must fail (with a 404 response
* code) since the InvokerServlet should not have been enabled.
- */
+ */
url = new URL("http://" + host + ":" + port + contextRoot
+ "/servlet/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.properties
index b9dd83b..f5b21b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/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="web"/>
-<property name="appname" value="${module}-invoker-servlet-disabled"/>
+<property name="appname" value="${module}-invoker-servlet-disabled"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/invokerServletDisabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/descriptor/web.xml
index 28af79d..c9a0508 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/descriptor/web.xml
@@ -26,7 +26,7 @@
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
index 65ccb10..c534281 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
@@ -25,6 +25,6 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- getServletContext().log("This servlet should not have been invoked");
+ getServletContext().log("This servlet should not have been invoked");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
index 51f2b18..1ae659f 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4882996");
WebTest webTest = new WebTest(args);
@@ -61,14 +61,14 @@
}
public void doTest() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/junk.jsp HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties
index b7c1311..9330fbc 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-javax-servlet-error-request-uri-dynamic-resource"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/javaxServletErrorRequestUriStaticResource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
index 93a7384..c32e6f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4882996");
WebTest webTest = new WebTest(args);
@@ -68,7 +68,7 @@
}
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -111,8 +111,8 @@
if (line == null ||
(!line.equals("http://" + host + ":" + port +
contextRoot + "/404handler.jsp") &&
- !line.equals("http://" +
- InetAddress.getLocalHost().getHostName() +
+ !line.equals("http://" +
+ InetAddress.getLocalHost().getHostName() +
":" + port + contextRoot +
"/404handler.jsp"))) {
throw new Exception("Unexpected response");
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties
index 72340bc..ac08b9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-javax-servlet-error-request-uri-static-resource"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jmxUndeployEvent/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/WebTest.java
index 46b5a35..775e353d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/WebTest.java
@@ -26,8 +26,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -35,7 +35,7 @@
try{
stat.addDescription("JMX undeployment event test.");
-
+
url = new URL("http://" + host + ":" + port + contextRoot + "/ServletTest");
System.out.println("\n Invoking url: " + url.toString());
conn = url.openConnection();
@@ -43,13 +43,13 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
System.out.println("responseCode: " + responseCode);
-
+
if (urlConnection.getResponseCode() != 404){
stat.addStatus("jmxUndeployEvent", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties
index b79a75d..0fc6d9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jmxUndeployEvent"/>
+<property name="appname" value="${module}-jmxUndeployEvent"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-jmxUndeployEvent"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml
index 95c6bef..75d01aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jmxUndeployEvent/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/descriptor/web.xml
index 6be4073..3dcff7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/descriptor/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
index 750862b..43bc911 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
@@ -31,7 +31,7 @@
import java.sql.*;
public class ServletTest extends HttpServlet{
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -42,9 +42,9 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println("jmxUndeployEvent::FAIL");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties
index a136d01..1273c86 100644
--- a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jroute-id-in-cookie-or-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml
index 121358a..4b0660c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,26 +44,26 @@
</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="setup-policy" depends="init-common">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"/>
- <copy file="server.policy"
+ <copy file="server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,13 +83,13 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore-policy" depends="setup-policy">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java
index 8a5a692..cbae49e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 13129");
WebTest webTest = new WebTest(args);
@@ -64,7 +64,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
@@ -85,7 +85,7 @@
System.out.println("session id = " + id);
return id;
- } finally {
+ } finally {
if (bis != null) {
try {
bis.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties
index e2d15d5..0ae3241 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jsessionId-parameter"/>
+<property name="appname" value="${module}-jsessionId-parameter"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml
index f8053cd..b39d17c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml
@@ -36,9 +36,9 @@
<delete file="WebTest.class"/>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="build" depends="init-common">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -46,14 +46,14 @@
<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}"/>
@@ -65,10 +65,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/web/jsfWithBundledOneDotOneJarFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/WebTest.java
index 0a8e125..ab04d45 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 651");
@@ -59,11 +59,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -82,10 +82,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties
index e4b3e1e..e71997b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsf-with-bundled-one-dot-one-jar-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jsp-security/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jsp-security/WebTest.java
index abdd620..493eb94 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsp-security/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jsp-security/WebTest.java
@@ -24,12 +24,12 @@
* is not defined in web.xml
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private static final String TEST_NAME = "web-jsp-security";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -43,13 +43,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -84,18 +84,18 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -112,5 +112,5 @@
} catch (IOException ex) {}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties b/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties
index 5796737..aecfe60 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jsp-security"/>
+<property name="appname" value="${module}-jsp-security"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-jsp-security"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml b/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml
index 3a6c74f..f561c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,7 +53,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -64,11 +64,11 @@
<param name="groups" value="Admin"/>
</antcall>
</target>
-
+
<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}"/>
@@ -80,10 +80,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java
index f26a537..b912ca8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java
@@ -29,7 +29,7 @@
* Test accesses 403.jsp, which sets the response code to 403 and therefore
* causes a forward to the error403.jsp error page, which sets the response
* content type to text/xml;charset=Shift_JIS.
- *
+ *
* Test then accesses throwable.jsp, which throws a Throwable and therefore
* causes a forward to the errorThrowable.jsp error page, which sets the
* response content type to text/xml;charset=Shift_JIS.
@@ -57,7 +57,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 815");
WebTest webTest = new WebTest(args);
@@ -65,8 +65,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/403.jsp", "HTTP/1.1 403");
invoke("/throwable.jsp", "HTTP/1.1 500");
stat.addStatus(TEST_NAME, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties
index 1aa452e..7001b0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-allow-error-page-to-set-response-charset-if-no-output-written"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspAnonymousClass/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/WebTest.java
index 72a4ba7..eeafb99 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6202290");
@@ -51,11 +51,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties
index 1fa0c2a..1f36e32 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-anonymous-class"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspAttributeNameWithColonOrDot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/WebTest.java
index 74c5d73..5328aa7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/WebTest.java
@@ -41,25 +41,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 28380");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp//test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -72,7 +72,7 @@
while ((line = bis.readLine()) != null) {
lastLine = line;
}
-
+
if (EXPECTED.equals(lastLine)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties
index a9f52f9..f22cce3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/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="web"/>
<property name="appname" value="${module}-jsp-attribute-name-with-colon-or-dot"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspAttributeNameWithColonOrDot/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/descriptor/web.xml
index 17b952d..d4cbe81 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/descriptor/web.xml
@@ -24,9 +24,9 @@
<jsp-config>
<taglib>
- <taglib-uri>http://s1as/mytaglib</taglib-uri>
- <taglib-location>/WEB-INF/tlds/my-taglib.tld</taglib-location>
- </taglib>
+ <taglib-uri>http://s1as/mytaglib</taglib-uri>
+ <taglib-location>/WEB-INF/tlds/my-taglib.tld</taglib-location>
+ </taglib>
</jsp-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
index 82bc3e6..556f826 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
@@ -25,9 +25,9 @@
import jakarta.servlet.jsp.tagext.DynamicAttributes;
/**
- * SimpleTag handler that echoes all its attributes
+ * SimpleTag handler that echoes all its attributes
*/
-public class EchoAttributesTag
+public class EchoAttributesTag
extends TagSupport
implements DynamicAttributes
{
@@ -50,16 +50,16 @@
out.print(",");
}
}
- } catch (IOException ioe) {
- throw new JspException(ioe.toString(), ioe);
- }
-
+ } catch (IOException ioe) {
+ throw new JspException(ioe.toString(), ioe);
+ }
+
return EVAL_PAGE;
}
public void setDynamicAttribute(String uri, String localName,
- Object value)
+ Object value)
throws JspException
{
keys.add(localName);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java
index c5b74ce..ec224cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java
@@ -24,8 +24,8 @@
* Each of the JSP pages accessed by this test is preceded by a BOM from
* which the JSP container derives the page encoding:
*
- * Page Page Encoding Bytes
- * UTF-16BE.jsp UTF-16, big-endian FE FF
+ * Page Page Encoding Bytes
+ * UTF-16BE.jsp UTF-16, big-endian FE FF
* UTF-16LE.jsp UTF-16, little-endian FF FE
* UTF-8.jsp UTF-8 EF BB BF
*
@@ -58,7 +58,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM in JSP classic syntax");
@@ -86,14 +86,14 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
/*
* @return true if passed, false if failed
*/
public boolean doTest(String jspPage) throws Exception {
-
+
InputStream is = null;
BufferedReader input = null;
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java
index 03c4d10..c31bef8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java
@@ -23,7 +23,7 @@
*
* This test enforces that a translation error be reported if the page
* encoding identified by a BOM (in this case: UTF-16BE) does not match the
- * page encoding derived from jsp configuration element page-encoding
+ * page encoding derived from jsp configuration element page-encoding
* (in this case: UTF-8).
*/
public class WebTest {
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM encoding mismatch");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/UTF-16BE.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -68,7 +68,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties
index 19717b0..b1a888e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-bom-in-classic-syntax-encoding-mismatch-jspconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java
index 94daea7..b0a5a0a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM encoding mismatch");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/encodingMismatch.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -68,7 +68,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties
index 250b71c..d1deaae 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-bom-in-classic-syntax-encoding-mismatch-pagedir"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspCacheTaglibPrecompile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/WebTest.java
index 9516d35..b70f402 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/WebTest.java
@@ -25,7 +25,7 @@
* (SQE cache tests failed /w PWC6117: File "/jsp/caching/Sun ONE
* Application Server Tags" not found)
*
- * Make sure that during precompilation, the JSP compiler will not
+ * Make sure that during precompilation, the JSP compiler will not
* (erroneously) ignore any locally bundled appserv-tags.jar (and cause
* precompilation and therefore deployment to fail), even though this JAR
* file is not listed amongst the JAR files known to contain TLD resources
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1668");
WebTest webTest = new WebTest(args);
@@ -56,8 +56,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -67,7 +67,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/jsp/caching/basicCache.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties
index bbf9bfe..f8779fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-cache-taglib-precompile"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspCachingInstanceLevel/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/WebTest.java
index aca8632..200662c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 8397");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -63,7 +63,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/jsp/caching/basicCache.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties
index 823f04d..e45485c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-caching-instance-level"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml
index ed0bc55..4a988a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -76,10 +76,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java
index f7f5849..eddbfe0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
@@ -59,14 +59,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jspx");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties
index 35594cd..abbd728 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-calling-el-fuction-from-tagfile-within-same-taglib-infinite-recursion"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspCommentedOutPageDirective/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/WebTest.java
index 112d673..a98b977 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 29971");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -56,7 +56,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + "/" + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -73,6 +73,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.properties
index ec5b524..0a888f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/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="web"/>
-<property name="appname" value="${module}-jsp-commented-out-page-directive"/>
+<property name="appname" value="${module}-jsp-commented-out-page-directive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspCommentedOutPageDirective1/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/WebTest.java
index 771242b..b9cb011 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 29971");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -57,7 +57,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -74,6 +74,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.properties
index ec5b524..0a888f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/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="web"/>
-<property name="appname" value="${module}-jsp-commented-out-page-directive"/>
+<property name="appname" value="${module}-jsp-commented-out-page-directive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigBuffer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/WebTest.java
index 94cc534..1e6f833 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/WebTest.java
@@ -42,25 +42,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp:attribute with omit");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties
index 6332441..b6badf8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/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="web"/>
<property name="appname" value="${module}-jsp-config-buffer"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspConfigDefaultContentType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/WebTest.java
index dd001bb..09bf97e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/WebTest.java
@@ -42,25 +42,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp:attribute with omit");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties
index 8e5c7df..cec1b76 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/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="web"/>
<property name="appname" value="${module}-jsp-config-default-content-type"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspConfigGetServletPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/WebTest.java
index 96ed2c0..eab72e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27704");
WebTest webTest = new WebTest(args);
@@ -53,14 +53,14 @@
public void doTest() {
InputStream is = null;
BufferedReader input = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ SERVLET_PATH);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties
index ad578b0..6b6e1b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-get-servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigIncludeChain/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/WebTest.java
index 99d816d..620b583 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27704");
WebTest webTest = new WebTest(args);
@@ -52,14 +52,14 @@
public void doTest() {
InputStream is = null;
BufferedReader input = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/subdir/including.txt");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties
index f28d8c1..c5dc1a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-include-chain"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigJavacSource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/WebTest.java
index f7f5076..d303312 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/WebTest.java
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -64,7 +64,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties
index 8039f3a..bb57b40 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-javac-source"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigJavacSource/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/descriptor/sun-web.xml
index 94a3f8d..4df6cf7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="compilerSourceVM" value="1.4" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java
index e6280e7..43d97d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java
@@ -52,7 +52,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties
index 89aed08..1b4ea81 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-jsp-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigJspFile/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/descriptor/sun-web.xml
index a1f9bff..696b58e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="myParam" value="myValue" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java
index a9db115..08512cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java
@@ -23,7 +23,7 @@
* ignored").
*
* This test:
- *
+ *
* - accesses a JSP,
*
* - updates the JSP (through a servlet),
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for modificationTestInterval "
+ "jsp-config property");
@@ -61,8 +61,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -86,10 +86,10 @@
System.out.println("Updating JSP ...");
bodyLine = getBodyLine("UpdateJsp");
System.out.println(bodyLine);
-
+
/*
- * Access JSP. Must get original contents, because the
- * modificationTestInterval specified in sun-web.xml has not yet
+ * Access JSP. Must get original contents, because the
+ * modificationTestInterval specified in sun-web.xml has not yet
* expired, which means that we must not (yet) check for any
* modifications of the JSP
*/
@@ -154,5 +154,5 @@
if (bis != null) bis.close();
} catch (IOException ex) {}
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties
index 605dc87..490d4b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-modification-test-interval"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigModificationTestInterval/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/sun-web.xml
index 4c97974..273044f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="modificationTestInterval" value="60" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml
index 6211b59..e16e6b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>UpdateJsp</display-name>
<servlet-name>UpdateJsp</servlet-name>
<servlet-class>UpdateJsp</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>UpdateJsp</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
index ce4a5b0..51aa407 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
@@ -32,7 +32,7 @@
/*
* Manually update timestamp on JSP file to a value far into the
- * future, so that the corresponding servlet class file will be
+ * future, so that the corresponding servlet class file will be
* guaranteed to be out-of-date
*/
f.setLastModified(System.currentTimeMillis() + 9000000000L);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java
index 0983025..11adbea 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java
@@ -42,27 +42,27 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp:attribute with omit");
WebTest webTest = new WebTest(args);
webTest.doTest();
webTest.doTest2();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
// An error should be raised with undeclared tag
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties
index ba3f595..2f07966 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/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="web"/>
<property name="appname" value="${module}-jsp-config-undeclared-ns"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspConfigUsePrecompiled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/WebTest.java
index cfaf4cb..7de4317 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6181923");
WebTest webTest = new WebTest(args);
@@ -58,8 +58,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -117,5 +117,5 @@
if (bis != null) bis.close();
} catch (IOException ex) {}
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties
index ae36243..1cb6891 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-use-precompiled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigUsePrecompiled/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/descriptor/sun-web.xml
index e91b9d2..3c0b165 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="use-precompiled" value="true" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
index 6d94850..6fd29c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
@@ -47,7 +47,7 @@
_jspxFactory = JspFactory.getDefaultFactory();
response.setContentType("text/html");
pageContext = _jspxFactory.getPageContext(this, request, response,
- null, true, 8192, true);
+ null, true, 8192, true);
_jspx_page_context = pageContext;
application = pageContext.getServletContext();
config = pageContext.getServletConfig();
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java
index 39c5628..2791426 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java
@@ -69,7 +69,7 @@
System.err.println("Unexpected return code: " + code);
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
- try (InputStream is = conn.getInputStream(); BufferedReader input = new BufferedReader(new InputStreamReader(is))) {
+ try (InputStream is = conn.getInputStream(); BufferedReader input = new BufferedReader(new InputStreamReader(is))) {
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
System.err.println("Wrong response. " + "Expected: " + EXPECTED_RESPONSE + ", received: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties
index 224b0ae..83e8075 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-config-use-precompiled2"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspConfigWelcomeFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/WebTest.java
index 70cf4c9..0af233e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27664");
WebTest webTest = new WebTest(args);
@@ -48,7 +48,7 @@
ok = ok && webTest.doTest("http://" + webTest.host + ":" + webTest.port
+ webTest.contextRoot + "/TestServlet");
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
- stat.printSummary();
+ stat.printSummary();
}
public boolean doTest(String urlString) {
@@ -56,13 +56,13 @@
InputStream is = null;
BufferedReader input = null;
boolean status = false;
- try {
+ try {
URL url = new URL(urlString);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
status = false;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.properties
index c071dc8..da802cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/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="web"/>
-<property name="appname" value="${module}-jsp-config-welcome-files"/>
+<property name="appname" value="${module}-jsp-config-welcome-files"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${module}-jsp-config-welcome-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspCustomTagAttributeOfArrayType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/WebTest.java
index be24e06..b3591e5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
@@ -59,7 +59,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -74,7 +74,7 @@
}
if (!EXPECTED.equals(lastLine)) {
- System.err.println("Wrong response body. Expected: "
+ System.err.println("Wrong response body. Expected: "
+ EXPECTED + ", received: " + lastLine);
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties
index c9af765..816f232 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-custom-tag-attribute-of-array-type"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
index ae209ba..239d2a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
@@ -38,7 +38,7 @@
throw new JspException(ioe.toString(), ioe);
}
- return EVAL_PAGE;
+ return EVAL_PAGE;
}
public void setArray(String[] args) {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java
index c8fc588..45db300 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java
@@ -59,7 +59,7 @@
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
-
+
int responseCode = conn.getResponseCode();
if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200" + ", received: " + responseCode);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties
index b49d48e..d333977 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-custom-taglib-bundled-as-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java
index e430c4a..c529d30 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for
- *
+ *
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=590
* ("TLDs in EAR-bundled JARs not found")
*
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 590");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties
index ea5f300..5176338 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jsp-customi-taglib-jar-inside-ear-with-manifest-classpath"/>
+<property name="appname" value="${module}-jsp-customi-taglib-jar-inside-ear-with-manifest-classpath"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml
index 2e04658..cca122f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${mytaglib.jar}"/>
@@ -56,8 +56,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.jar, *.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -70,8 +70,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -83,7 +83,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java
index 19d508f..9405c9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 590");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties
index 8175c16..926ab5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-custom-taglib-jar-inside-ear-without-manifest-classpath"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml
index effbf79..0270cb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
<delete file="${assemble.dir}/lib/${mytaglib.jar}"/>
@@ -56,8 +56,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="lib/*.jar,*.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -70,8 +70,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -83,7 +83,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java
index c61b93d..7d7f9c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java
@@ -39,16 +39,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for enum support in EL");
WebTest webTest = new WebTest(args);
webTest.doTest("/enum.jsp", "jsp-el-enum-test");
- stat.printSummary();
+ stat.printSummary();
}
private boolean checkValue(BufferedReader input,
- String expectedValue)
+ String expectedValue)
throws Exception {
String line = input.readLine();
if (line == null)
@@ -64,7 +64,7 @@
+ expectedValue + ", received: " + line);
return true;
}
- return false;
+ return false;
}
public void doTest(String path, String testName) {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties
index 571cd1b..84a9932 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-el-enum"/>
+<property name="appname" value="${module}-el-enum"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspErrorPageClassCastException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
index 813439f..d958d6d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
@@ -44,12 +44,12 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 31171");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -64,7 +64,7 @@
System.out.println("GET " + requestUri + " HTTP/1.0");
os.write(("GET " + requestUri + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
is = s.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -74,7 +74,7 @@
break;
}
}
-
+
if (line != null) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties
index 6433011..7da363b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-error-page-class-cast-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspErrorPageServletErrorException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/WebTest.java
index 2e41717..0da24ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/WebTest.java
@@ -56,7 +56,7 @@
os.write("\n".getBytes());
try (InputStream is = s.getInputStream(); BufferedReader bis = new BufferedReader(new InputStreamReader(is))) {
-
+
String line = null;
int count = 0;
while ((line = bis.readLine()) != null) {
@@ -65,7 +65,7 @@
count++;
}
}
-
+
if (count == 2) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties
index b75ea5e..0201011 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-error-page-servlet-error-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspErrorPageStatusCode/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/WebTest.java
index b021007..1fe90d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 5018291");
try {
@@ -52,21 +52,21 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/foo.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
throw new Exception("Wrong response code. Expected: 500" +
", received: " + responseCode);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties
index bcd89fd..84b28cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-error-page-status-code"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java
index 6bc5159..7f29ae9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 16181");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.properties b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.properties
index 9b16620..87ff62d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/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="web"/>
-<property name="appname" value="${module}-jsp-exception-in-tag-body-restore-jsp-writer"/>
+<property name="appname" value="${module}-jsp-exception-in-tag-body-restore-jsp-writer"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspForwardNormalizePath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/WebTest.java
index ad3a144..b6db534 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Tomcat forward and getRequestDispatcher security issue");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties
index de3df14..0ee3276 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-forward-normalize-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java
index 6e7cac2..b0df59c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4875808");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties
index 96d2120..06024d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-forward-preserve-application-response-wrapper"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspForwardUnbuffered/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/WebTest.java
index 9f3e27f..099dfd7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 13499");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest1() throws Exception {
@@ -65,10 +65,10 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
- }
+ }
}
/*
@@ -83,7 +83,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
throw new Exception("Wrong response code. Expected: 500" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties
index 6d4fa46..418a874 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-forward-unbuffered"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspGetTagLibraryInfos/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/WebTest.java
index 19c9693..3229c62 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for TagLibraryInfo.getTagLibraryInfos()");
@@ -50,11 +50,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties
index 74cb308..28ce113 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-get-tag-library-infos"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
index e80bda2..97d2ffb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
@@ -31,7 +31,7 @@
vms[0] = new ValidationMessage(null, "Wrong number of tsglibs");
}
- return vms;
+ return vms;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties
index ee53f25..323236c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-in-webapp-with-bundled-xercesImpl"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspIncludeResourceNameWithPlusChar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/WebTest.java
index c512b67..ffc9bfd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4897017, 4789272");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties
index 59efc07..2691aca 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-include-resource-name-with-plus-char"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspIncludedWelcomePage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
index 4982bfd..a3a8e7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
@@ -24,7 +24,7 @@
* see http://issues.apache.org/bugzilla/show_bug.cgi?id=33223.
*
* This test case used to throw a java.lang.StringIndexOutOfBoundsException
- * when reconstructing the URI of a JSP that is the target of a
+ * when reconstructing the URI of a JSP that is the target of a
* RequestDispatcher.include() from the jakarta.servlet.include.XXX
* request attributes.
*/
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 33223");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.properties b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.properties
index a3c3da1..c91287d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/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="web"/>
-<property name="appname" value="${module}-jsp-included-welcome-page"/>
+<property name="appname" value="${module}-jsp-included-welcome-page"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspNestedScriptingTagExtraInfo/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/WebTest.java
index cba9597..badb89a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/WebTest.java
@@ -38,25 +38,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27665");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp//test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties
index 4bc277d..4738c46 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-nested-scripting-tag-extra-info"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
index ca1d351..394a9ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
@@ -21,7 +21,7 @@
public class MyTag extends TagSupport {
- private static int counter = 1;
+ private static int counter = 1;
private String name;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java
index 024a107..2453edb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java
@@ -37,18 +37,18 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27948");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties
index c75beda..67953cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jsp-null-fragment"/>
+<property name="appname" value="${module}-jsp-null-fragment"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspPoundSyntax/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/WebTest.java
index b040428..05cfabf 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit tests for pound syntax as literal");
WebTest webTest = new WebTest(args);
@@ -54,11 +54,11 @@
webTest.doTest4("/testjsp21z.jsp",
"pound-syntax-allowed-as-literal-true-test");
- stat.printSummary();
+ stat.printSummary();
}
private boolean checkValue(BufferedReader input,
- String key, String expectedValue)
+ String key, String expectedValue)
throws Exception {
String line = input.readLine();
while (line.equals(""))
@@ -75,7 +75,7 @@
+ key + ": " + expectedValue + ", received: " + line);
return true;
}
- return false;
+ return false;
}
public void doTest1(String path, String testName) {
@@ -130,14 +130,14 @@
public void doTest2(String path, String testName) {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ':' + port + '/' + contextRoot + path);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode == 200) {
+ if (responseCode == 200) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(testName, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties
index c9445c7..2882094 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-pound-literal"/>
+<property name="appname" value="${module}-pound-literal"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java
index c3610cd..3c2526f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6251872");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties
index 3f3dff0..4953d7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-precompile-consider-domain-lib-jarfiles-and-classes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml
index e77aef4..3070ed3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="myclasses"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspPrecompileDeployDashDashLibraries/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/WebTest.java
index d5667da..058b296 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4883");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties
index 62e6201..5ec38bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-precompile-deploy-dash-dash-libraries"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml
index 7e8c024..3c26aa2 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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-libraries"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/web/jspPrecompileIgnoreFragmentErrors/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/WebTest.java
index 03be013..1e69ade 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/WebTest.java
@@ -25,7 +25,7 @@
* precompilation (during deployment) as long as jsp-config property
* 'ignoreJspFragmentErrors' has been set to TRUE in sun-web.xml.
*
- * Otherwise, precompilation of this webapp's JSPs would have failed,
+ * Otherwise, precompilation of this webapp's JSPs would have failed,
* since the 'counter' variable is not declared in any of the included
* JSP segments.
*/
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6393940");
@@ -61,7 +61,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties
index b92c489..7971645 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-precompile-ignore-fragment-errors"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml
index 88fbebf..69eabb3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="ignoreJspFragmentErrors" value="true" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java
index d3e9ea7..954a3fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java
@@ -54,7 +54,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test to ensure that servlet that "
@@ -75,7 +75,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties
index 266558d..899ca69 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-reload-generated-servlet-if-updated"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml
index 6ceef6a..774e319 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runfirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -90,10 +90,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/web/jspReloadGeneratedServletIfUpdated/test_jsp.java b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
index 4cce1aa..e22bdd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
@@ -49,7 +49,7 @@
response.setContentType("text/html");
response.setHeader("X-Powered-By", "JSP/2.3");
pageContext = _jspxFactory.getPageContext(this, request, response,
- null, true, 8192, true);
+ null, true, 8192, true);
_jspx_page_context = pageContext;
application = pageContext.getServletContext();
config = pageContext.getServletConfig();
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java
index ba586fa..e715bb0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP "
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties
index 70fd52d..d140b95 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-resource-injection-context-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
index ee5b0f7..dfab8a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
@@ -49,7 +49,7 @@
public void contextInitialized(ServletContextEvent sce) {
ServletContext sc = sce.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java
index 1a13c3d..b096bfc 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,7 +56,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties
index f8fdb95..ca89588 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-resource-injection-simple-tag-handler"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
index 8fc6444..2f8de7d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
@@ -75,6 +75,6 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java
index 30b224b..34fcb29 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP tag handler");
@@ -55,7 +55,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml
index 635d89c..f603321 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml
@@ -57,9 +57,9 @@
<target name="build" depends="compile">
<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>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -91,7 +91,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties
index eee488b..12d669a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-resource-injection-tag-handler"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
index ce5a64b..98b2a33 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
@@ -76,7 +76,7 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
return SKIP_BODY;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java
index 54ec0cb..e0be9aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java
@@ -57,7 +57,7 @@
while ((line = input.readLine()) != null) {
lastLine = line;
}
-
+
Assert.assertEquals(lastLine, EXPECTED_RESPONSE);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml
index ca0a20b..4374ba9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
+
<suite name="web" >
<parameter name="host" value="localhost"/>
<parameter name="port" value="8080"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java
index 81a2e6b..46befc5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP tag handler");
@@ -57,7 +57,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties
index 7ea9a10..c35f027 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-resource-injection-tag-handler-pooling-disabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
index ce5a64b..98b2a33 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
@@ -76,7 +76,7 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
return SKIP_BODY;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java
index f0fddb3..5950ba9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6251872");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties
index b0b1777..0e05f64 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-runtime-compile-consider-domain-lib-jarfiles-and-classes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml
index 1aab6d2..c832488 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="myclasses"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspRuntimeDeployDashDashLibraries/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/WebTest.java
index e06054c..db90cca 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4883");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties
index adc7f16..3463342 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-runtime-deploy-dash-dash-libraries"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml
index 113bbe1..c001f02 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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-libraries"/>
</target>
@@ -72,10 +72,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/web/jspScriptlessTagBodyJspDocument/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/WebTest.java
index 728360f..2697dac 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
@@ -51,7 +51,7 @@
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties
index 9663d7e..5617c40 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-scriptless-tag-body-jsp-document"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspScriptletAfterScriptlessTag/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/WebTest.java
index 681cd1c..61e7a5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/WebTest.java
@@ -40,25 +40,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 30067");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jspx");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
stat.addStatus("Wrong response code. Expected: 200"
+ ", received: " + responseCode, stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties
index a3f3ab1..d8795c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jsp-scriptlet-after-scriptless-tag"/>
+<property name="appname" value="${module}-jsp-scriptlet-after-scriptless-tag"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspScriptletDeclNestedInCustomAction/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/WebTest.java
index 1c8bd8c..01b441e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4869146");
WebTest webTest = new WebTest(args);
@@ -61,7 +61,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
stat.addStatus("Wrong response code. Expected: 200"
+ ", received: " + responseCode, stat.FAIL);
} else {
@@ -76,7 +76,7 @@
}
if (!EXPECTED.equals(lastLine)) {
- stat.addStatus("Wrong response body. Expected: "
+ stat.addStatus("Wrong response body. Expected: "
+ EXPECTED + ", received: " + lastLine,
stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties
index e249dab..b76898d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-scriptlet-decl-nested-in-custom-action"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java
index 66f212c..2add95d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 5052205");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.properties
index 1fd9ca2..d0f9c4b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/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="web"/>
-<property name="appname" value="${module}-jsp-scriptlet-syntax-error-correct-error-message"/>
+<property name="appname" value="${module}-jsp-scriptlet-syntax-error-correct-error-message"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspSelfReferencingErrorPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/WebTest.java
index 25516d2..1a6fd09 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for detecting self-referencing error page");
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -57,7 +57,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -69,6 +69,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties
index c2cf851..a2330e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-self-referencing-error-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java
index 242f1a8..3f1378d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for detecting self-referencing error page");
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -58,7 +58,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -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/web/jspSelfReferencingErrorPageWithRelativePath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.properties
index b262fe8..5866f8e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-self-referencing-error-page-with-relative-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspServletOverride/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
index ac2bd6e..bfee083 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
@@ -69,13 +69,13 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
-
+
BufferedReader br = null;
- try {
+ try {
br = new BufferedReader(new InputStreamReader(
conn.getInputStream()));
String line = null;
@@ -84,7 +84,7 @@
break;
}
}
-
+
if (line != null) {
// Check <OBJECT> classid comment
System.out.println(line);
@@ -115,7 +115,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties
index 305ac06..f63dd04 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/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="web"/>
<property name="appname" value="${module}-jsp-servlet-override"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="precompilejsp" value="false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspSessionInvalidated/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/WebTest.java
index 403d5af..43be877 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/WebTest.java
@@ -23,23 +23,23 @@
* "Cannot find attribute when session invalidated"
*/
public class WebTest {
-
+
private static final String TEST_NAME = "jsp-session-invalidated";
private static final String EXPECTED_RESPONSE = "SUCCESS";
-
+
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
-
+
private String host;
private String port;
private String contextRoot;
-
+
public WebTest(String[] args) {
host = args[0];
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6362293");
WebTest webTest = new WebTest(args);
@@ -51,7 +51,7 @@
}
stat.printSummary();
}
-
+
/*
public void doTest() {
try {
@@ -60,7 +60,7 @@
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
-
+
int responseCode = conn.getResponseCode();
if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
@@ -85,7 +85,7 @@
}
}
*/
-
+
public void doTest() throws Exception {
BufferedReader input = null;
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties
index 3232b40..0b5cfaa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-session-invalidated"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspSimpleTagAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/WebTest.java
index fd1ea48..e653ff9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test BodyTag behavior when tag is reused");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus("BodyTag test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -87,7 +87,7 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
if (count == 6)
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties
index 217e2c8..58b8bad 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-simpletag-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
index 9e14b69..6d05eba 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
@@ -28,7 +28,7 @@
public class MySimpleTag extends SimpleTagSupport {
-
+
private boolean pConstructed = false;
private PageContext pageContext;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java
index 72ff365..2d646ed 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("jspStaticFileEncoding");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties
index 397a02b..1785fdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-staticFileEncoding"/>
+<property name="appname" value="${module}-staticFileEncoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-staticFileEncoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml
index bec8c2a..f6eca0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -60,7 +60,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -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/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java
index 7424cba..5c48cdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM encoding mismatch");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -68,7 +68,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties
index 480b85a..239c562 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-tagfile-bom-encoding-mismatch-tagdir"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspTagHandlerPostConstructAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/WebTest.java
index ff0e426..06fa267 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP tag handler");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties
index 0b99099..4b20acd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-resource-injection-tag-handler-post-construct"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
index 1f53065..c42d21e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
@@ -50,7 +50,7 @@
sb.append(",ds3-login-timeout=" + loginTimeout);
} catch (Exception ex) {
throw new RuntimeException(ex);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java
index 34dddd0..669f654 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for specifying post-construction requirements of a JSP tag
* handler using the <post-construct> deployment descriptor element.
*
- * This unit test is equivalent in functionality to the
+ * This unit test is equivalent in functionality to the
* jspResourceInjectionTagHandlerPostConstruct unit test, where the
* post-construction requirements are declared using the @PostConstruct
* annotation.
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for post-construct element on "
@@ -61,7 +61,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties
index efa98e7..0b20b43 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-tag-handler-post-construct-element"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
index 440be8d..2d36a60 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
@@ -49,7 +49,7 @@
sb.append(",ds3-login-timeout=" + loginTimeout);
} catch (Exception ex) {
throw new RuntimeException(ex);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java
index 1239047..9017eab 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java
@@ -41,7 +41,7 @@
contextRoot = args[2];
numRun = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @PreDestroy on JSP tag handler");
@@ -60,10 +60,10 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
- public void runFirst() throws Exception {
+ public void runFirst() throws Exception {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties
index 93bd54c..5d1e2f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-tag-handler-pre-destroy-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml
index 7e83f72..d129333 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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-first" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -86,10 +86,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/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java
index 44bb15e..39bce7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 659");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties
index 02950f3..297dab7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-tag-library-validator-xml-view-static-include"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
index 2168757..444f6c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
@@ -36,7 +36,7 @@
public ValidationMessage[] validate(String prefix, String uri,
PageData page) {
- /*
+ /*
StringBuffer sb = new StringBuffer();
sb.append("---------- Prefix=" + prefix + " URI=" + uri +
@@ -56,34 +56,34 @@
}
sb.append("-----------------------------------------------");
System.out.println(sb.toString());
- */
+ */
try {
- DefaultHandler h = new DefaultHandler();
+ DefaultHandler h = new DefaultHandler();
- // parse the page
- SAXParserFactory f = SAXParserFactory.newInstance();
- f.setValidating(false);
- f.setNamespaceAware(true);
- SAXParser p = f.newSAXParser();
- p.parse(page.getInputStream(), h);
+ // parse the page
+ SAXParserFactory f = SAXParserFactory.newInstance();
+ f.setValidating(false);
+ f.setNamespaceAware(true);
+ SAXParser p = f.newSAXParser();
+ p.parse(page.getInputStream(), h);
- } catch (SAXException ex) {
- return vmFromString(ex.toString());
- } catch (ParserConfigurationException ex) {
- return vmFromString(ex.toString());
- } catch (IOException ex) {
- return vmFromString(ex.toString());
- }
+ } catch (SAXException ex) {
+ return vmFromString(ex.toString());
+ } catch (ParserConfigurationException ex) {
+ return vmFromString(ex.toString());
+ } catch (IOException ex) {
+ return vmFromString(ex.toString());
+ }
return null;
}
// constructs a ValidationMessage[] from a single String and no ID
private static ValidationMessage[] vmFromString(String message) {
- return new ValidationMessage[] {
- new ValidationMessage(null, message)
- };
+ return new ValidationMessage[] {
+ new ValidationMessage(null, message)
+ };
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java
index db774e5..4de7d6f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties
index c8b15fa..6da9ec9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-tag-release-called-when-pooling-disabled"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml
index 75f0403..f86354a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="enablePooling" value="false" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java
index 84a3fad..93d63d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties
index 019dae0..591c80a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-tag-release-called-when-pooling-enabled"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml
index d0df8c6..1d7e33b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="enablePooling" value="true" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java
index 39d7e7b..3434421 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java
@@ -22,14 +22,14 @@
public class WebTest
{
-
+
private static boolean pass = false;
private static int bTag = 0;
private static int useBean = 0;
private static int scriptlet = 0;
private static int ELvalue1 = 0;
private static int ELvalue2 = 0;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -38,14 +38,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test tagdependent bodies are handled correctly in XML syntax");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jspx" );
if (bTag == 6 && useBean == 1 && scriptlet == 1 &&
@@ -109,7 +109,7 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties
index a940410..fe3a162 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jspTagdependentXml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspTagdependentXml/servlet/mypack/MyBody.java b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
index fb686e6..042e528 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
@@ -21,7 +21,7 @@
public class MyBody extends BodyTagSupport {
-
+
String echoStr;
String staticStr;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java
index 8d6fa76..10fb3ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for escaping EL expressions in template text");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.properties
index 09019fb..2f54209 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/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="web"/>
-<property name="appname" value="${module}-jsp-template-text-escaped-el"/>
+<property name="appname" value="${module}-jsp-template-text-escaped-el"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java
index f43c474..2443446 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java
@@ -53,18 +53,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/notfound.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode == 500) {
+ if (responseCode == 500) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
System.err.println("Wrong response code. Expected: 500"
diff --git a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties
index 4f629be..a8a7fe3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-throws-file-not-found-expect-500-response-code"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspTrimDirectiveWhitespaces/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/WebTest.java
index f6833fe..8c5195f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/WebTest.java
@@ -35,12 +35,12 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for enum support in EL");
WebTest webTest = new WebTest(args);
webTest.doTest("/trim.jsp", "jsp-trimDirectiveWhitespaces");
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String testName) {
@@ -69,7 +69,7 @@
// System.out.println("line3:" + line3);
String line4 = input.readLine();
// System.out.println("line4:" + line4);
-
+
if ("".equals(line1) &&
"xyz".equals(line2) &&
"".equals(line3) &&
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties
index 6bf5f74..5cdd52b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-trimDirectiveWhitespaces"/>
+<property name="appname" value="${module}-trimDirectiveWhitespaces"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspUrnJspTldWithoutUri/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/WebTest.java
index 2fee798..e26a109 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/WebTest.java
@@ -42,25 +42,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for urn:jsptld:<path>");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jspx");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
stat.addStatus("Wrong response code. Expected: 200"
+ ", received: " + responseCode, stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties
index 2631fa3..e7e7fd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-urn-jsp-tld-without-uri"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspUseBean/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspUseBean/WebTest.java
index fa45ef6..6977cac 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUseBean/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspUseBean/WebTest.java
@@ -21,11 +21,11 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final String TEST_NAME = "jsp-use-bean";
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,14 +34,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test useBean optimization behavior");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus(TEST_NAME, pass? stat.PASS: stat.FAIL);
@@ -78,10 +78,10 @@
int index = line.indexOf("PASS");
if (index >= 0) {
pass = true;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.properties b/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.properties
index ad6dc76..429689a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspUseBean/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="web"/>
-<property name="appname" value="${module}-jsp-use-bean"/>
+<property name="appname" value="${module}-jsp-use-bean"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml b/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java
index 51ffa0d..751b217 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6372570");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties
index 9dccba8..15a3351 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-welcome-page-without-any-servlet-mappings"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspXpoweredByDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/WebTest.java
index f2fb4eb..269d1fa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for disabling 'X-Powered-By: JSP/2.0' response header");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.properties
index 8ef9bec..8a1b52f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/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="web"/>
-<property name="appname" value="${module}-jsp-xpowered-by-disabled"/>
+<property name="appname" value="${module}-jsp-xpowered-by-disabled"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspXpoweredBySingleResponseHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/WebTest.java
index d4f464e..4da5968 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for https://glassfish.dev.java.net/issues/show_bug.cgi?id=1093
* ("x-powered-by header has redundant information"):
*
- * Make sure that if one JSP forwards to another, the response does not
+ * Make sure that if one JSP forwards to another, the response does not
* contain any duplicate 'X-Powered-By: JSP' header.
*/
public class WebTest {
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish issue 1093");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties
index b995abc..00a19fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jsp-xpowered-by-single-response-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspcConfigure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/WebTest.java
index b01c9b1..6a771eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4994790");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.properties b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.properties
index bcfabc8..220eb92 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/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="web"/>
-<property name="appname" value="${module}-jspc-configure"/>
+<property name="appname" value="${module}-jspc-configure"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jspconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspconfig/WebTest.java
index c9f444f..1317f4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspconfig/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -35,7 +35,7 @@
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, "JSP-CONFIG", contextRoot + "/test.jsp" );
goGet2(host, port, "ELIgnored", contextRoot + "/foo/test.jsp" );
@@ -81,7 +81,7 @@
if (!status.equalsIgnoreCase("PASS")){
throw new Exception("Wrong response");
}
- }
+ }
}
} finally {
try {
@@ -98,7 +98,7 @@
} catch (IOException ex) {}
}
}
-
+
private static void goGet2(String host, int port,
String result, String contextPath)
throws Exception
@@ -109,7 +109,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties
index 41d02c5..c4fd2a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-jsp-config"/>
+<property name="appname" value="${module}-jsp-config"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/jstlHtmlParamOutsideFmtMessage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/WebTest.java
index 945419e..faa07f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6361668");
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jspx");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties
index cabffb9..562ad69 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jstl-html-param-outside-fmt-message"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/jstlLocaleSupportAPI/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
index f5e0202..1a923e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 871");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
// Access test1.jsp
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
@@ -65,7 +65,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -90,7 +90,7 @@
String acceptLanguage = "Accept-Language: de\n";
os.write(acceptLanguage.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties
index a1800c5..6432da4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-jstl-locale-support-api"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/keepAlive/build.properties b/appserver/tests/appserv-tests/devtests/web/keepAlive/build.properties
index 9d9190a..790c28c 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAlive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/keepAlive/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-keepalive"/>
+<property name="appname" value="${module}-keepalive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-keepalive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml b/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/keepAliveTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeout/build.xml
index 53d6ede..fdb6d6e 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeout/build.xml
@@ -36,7 +36,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=10"/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=10"/>
</antcall>
</target>
@@ -44,7 +44,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds="/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds="/>
</antcall>
</target>
@@ -61,7 +61,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties
index 5b01a71..6c4141b 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-keepAliveTimeoutInSecondsZeroSSL"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml
index 4e15c50..771ff0e 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml
@@ -37,7 +37,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds=10"/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds=10"/>
</antcall>
<sleep seconds="10"/>
</target>
@@ -46,7 +46,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds="/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds="/>
</antcall>
</target>
@@ -64,7 +64,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java b/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java
index a2e8e56..a32de4e 100644
--- a/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6456553");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeWithLargeCookie();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties
index 7ac6001..6ee6aa5 100644
--- a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-large-cookie-error"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml
index 24d5370..ab6cf07 100644
--- a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,23 +43,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}"/>
@@ -71,10 +71,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/web/listenerDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/WebTest.java
index 2a6c82d..4a730e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/WebTest.java
@@ -33,7 +33,7 @@
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String args[]) throws Exception {
String host = args[0];
@@ -41,12 +41,12 @@
String contextRoot = args[2];
stat.addDescription("Ensure disabled HTTP listener gives ConnectException");
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/ServletTest");
System.out.println("Invoking url: " + url.toString());
- try {
+ try {
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.getResponseCode();
System.err.println("Expected java.net.ConnectException: "
@@ -56,6 +56,6 @@
stat.addStatus(TEST_NAME, stat.PASS);
}
- stat.printSummary();
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties
index 87de9f4..80d0d1d 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-listenerDisabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml
index e486e4d..fd44b68 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-http-listener" />
@@ -79,7 +79,7 @@
<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/web/listenerDisabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java
index 03c9b03..7075c6d 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -44,14 +44,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Unit test for IT 13555");
WebTest webTest = new WebTest(args);
int port = new Integer(webTest.portS).intValue();
String name;
-
+
try {
webTest.goGet(webTest.host, port,
webTest.contextRoot + "/test" );
@@ -81,7 +81,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
@@ -122,5 +122,5 @@
stat.addStatus(TEST_NAME + " FAILED", stat.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.properties b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.properties
index 0c3493c..b8957ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/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="web"/>
-<property name="appname" value="${module}-listenerFilterServletInit"/>
+<property name="appname" value="${module}-listenerFilterServletInit"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml
index 10c667d..ab6cf07 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,23 +43,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}"/>
@@ -71,10 +71,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/web/listenerFilterServletInit/servlet/test/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
index c004162..14210c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
@@ -30,14 +30,14 @@
System.out.println("[Filter.init]");
Record.addData("Fi");
}
-
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
System.out.println("[Filter.doFilter]");
filterChain.doFilter(request, response);
-
- }
-
+
+ }
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
index 81b588c..0515a0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
@@ -26,7 +26,7 @@
}
public void contextInitialized(ServletContextEvent sce) {
- System.out.println("[Listener.contextInitialized]");
+ System.out.println("[Listener.contextInitialized]");
Record.addData("Li");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java
index 9b92a1c..b48875c 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java
@@ -19,7 +19,7 @@
class Record {
private static String data = "";
-
+
static void addData(String a) {
data += a;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
index 91ba6bc..014808c 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
@@ -26,10 +26,10 @@
public ServletTest() {
Record.addData("S");
}
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
Record.addData("Si");
}
@@ -38,9 +38,9 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println(Record.getData());
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java
index fa9783d..5661ef4 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java
@@ -21,13 +21,13 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
private static String host;
private static String contextRoot;
private static String port;
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("load-balancer-mod-jk", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java
index eadc686..ee548b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java
@@ -21,13 +21,13 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
private static String host;
private static String contextRoot;
private static String port;
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("load-balancer-mod-jk", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties
index 8ffab01..a34481a 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-load-balance-mod-jk"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
index f2f2e41..4c936e1 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4657979");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -58,7 +58,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
@@ -76,7 +76,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
index 3f0d02f..b0ee2ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-load-classes-from-zip-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/localeEncodingMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.properties
index 937503a..e823abc 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/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="web"/>
-<property name="appname" value="${module}-locale-encoding-mapping"/>
+<property name="appname" value="${module}-locale-encoding-mapping"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml
index 8eed661..c7a084f 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -59,7 +59,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -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/web/localeEncodingMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/descriptor/web.xml
index 6f63673..0c66da9 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>servlet.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
index a39b525..57d879b 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
@@ -27,7 +27,7 @@
public class ServletTest extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
+
response.setContentType("text/html");
response.setLocale(Locale.JAPAN);
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java
index 135a9c3..f68c313 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for locally bundled log4j");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -77,10 +77,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties
index a57e022..c06ce4d 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-log4j-locally-bundled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml
index 554c651..46ecddb 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,17 +44,17 @@
</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="re-deploy" depends="init-common">
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/log4jXmlInEarFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/WebTest.java
index 00fb911..dd91455 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/WebTest.java
@@ -40,7 +40,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for log4j packaged in EAR file");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/mywar/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -75,10 +75,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties
index 860692a..b46d6d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-log4j-xml-in-ear-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml
index 817c17b..107bf5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${mywar.war}"/>
@@ -47,7 +47,7 @@
<fileset dir="${assemble.dir}" includes="*.war"/>
<fileset dir="." includes="lib/*.jar, lib/*.xml"/>
</ear>
- </target>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -61,8 +61,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,7 +73,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java
index 5698ba9..66af131 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -40,13 +40,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("malformedQueryString", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("malformedQueryString", stat.FAIL);
@@ -55,7 +55,7 @@
stat.printSummary("web/malformedQueryString---> expect 1 PASS");
}
- private static void goGet(String host,
+ private static void goGet(String host,
int port, String contextPath) throws Exception {
Socket s = new Socket(host, port);
OutputStream os = s.getOutputStream();
@@ -63,7 +63,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -75,19 +75,19 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-malformedQueryString", stat.PASS);
} else {
stat.addStatus("web-malformedQueryString", stat.FAIL); }
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties
index 99c2f7f..93a3e36 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-malformedQueryString"/>
+<property name="appname" value="${module}-malformedQueryString"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-malformedQueryString"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/malformedQueryString/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/descriptor/web.xml
index c790284..88c6c01 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/descriptor/web.xml
@@ -22,18 +22,18 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -42,7 +42,7 @@
<servlet-name>ServletTest2</servlet-name>
<url-pattern>/ServletTest2</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
index ad99f3c..131c2df 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,18 +34,18 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2?Quebec;libre");
if ( rd == null ){
out.println("TEST::FAIL");
out.flush();
- } else {
- rd.forward(request, response);
+ } else {
+ rd.forward(request, response);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
index 83fdbef..223e19d 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
@@ -24,10 +24,10 @@
public class ServletTest2 extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -36,12 +36,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java
index f6cf763..0d69cb8 100644
--- a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(TEST_NAME);
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -55,7 +55,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
sock.setSoTimeout(5000);
OutputStream os = sock.getOutputStream();
@@ -64,8 +64,8 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
- os.flush();
-
+ os.flush();
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,7 +83,7 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
- os.flush();
+ os.flush();
try{
while ((line = bis.readLine()) != null) {
}
@@ -102,7 +102,7 @@
try{
while ((line = bis.readLine()) != null) {
- found = false;
+ found = false;
System.out.println("line: " + line);
}
}catch (SocketTimeoutException t){
diff --git a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties
index e681c92..90ba0c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-maxKeepAliveRequests"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml
index 9a08738..2cdc86d 100644
--- a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml
@@ -62,7 +62,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java
index 1ff39d6..af683e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java
@@ -40,24 +40,24 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1607");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/foo.HTML");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -70,7 +70,7 @@
+ EXPECTED_CONTENT_TYPE
+ ", received: " + contentType);
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
}
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties
index 8253d0c..c2a22e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-mime-mapping-case-insensitive-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java
index fe803b0..8157ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Inherit MIME mapping from default-web.xml");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.properties b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.properties
index c60a51d..dfacbdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/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="web"/>
-<property name="appname" value="${module}-mime-mapping-inherited-from-default-web-xml"/>
+<property name="appname" value="${module}-mime-mapping-inherited-from-default-web-xml"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/monitorHttpService/WebTest.java b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/WebTest.java
index 695c006..da73746 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/WebTest.java
@@ -63,12 +63,12 @@
port = args[6];
contextRoot = args[7];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 9549");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -81,7 +81,7 @@
System.out.println("errorcount = " + errorcount);
invokeURL("http://" + host + ":" + port + contextRoot + "/statuscode?code=503");
-
+
int count503_2 = getCount("count503");
System.out.println("count503_2 = " + count503_2);
int count5xx_2 = getCount("count5xx");
@@ -101,7 +101,7 @@
}
private String invokeURL(String urlString) throws Exception {
-
+
StringBuilder sb = new StringBuilder();
URL url = new URL(urlString);
@@ -154,7 +154,7 @@
System.out.println("getCount: "+resultStr);
RestResponse response = RestUtil.get(url);
Map<String, Object> map = response.getResponse();
-
+
return ((Long)((Map)((Map)((Map)((Map)map.get("data")).get("extraProperties")).get(
"entity")).get(monitorPath)).get("count")).intValue();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties
index 1ba0e8d..a02c139 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-monitor-http-service"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml
index 59ef1ae..081b958 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,16 +43,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -63,7 +63,7 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -71,7 +71,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}:." fork="true">
<arg value="${admin.host}"/>
@@ -84,7 +84,7 @@
<arg value="${contextroot}"/>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -95,7 +95,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java
index 85911a0..c9a8da0 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java
@@ -63,12 +63,12 @@
contextRoot = args[6];
appName = args[7];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 9481");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -80,7 +80,7 @@
String testResult = invokeURL("http://" + host + ":" + port + contextRoot + "/test");
System.out.println(testResult);
-
+
long appReqCount2 = getValue("test/requestcount", "requestcount", "count");
System.out.println("app request count: " + appReqCount2);
long processTime2 = getValue("test/processingtime", "processingtime", "lastsampletime");
@@ -94,7 +94,7 @@
System.out.println("app error count: " + appErrorCount1);
invokeURL("http://" + host + ":" + port + contextRoot + "/badrequest");
-
+
long appErrorCount2 = getValue("badrequest/errorcount", "errorcount", "count");
System.out.println("app error count: " + appErrorCount2);
@@ -109,7 +109,7 @@
}
private String invokeURL(String urlString) throws Exception {
-
+
StringBuilder sb = new StringBuilder();
URL url = new URL(urlString);
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties
index 06a3517..bcaaf49 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="aname" value="${module}-monitor-servlet-instance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml
index 73a2cc8..bf6696b 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,16 +43,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -63,13 +63,13 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common">
<param name="as.props" value="${as.props} --name ${appname}-web"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}:." fork="true">
<arg value="${admin.host}"/>
@@ -82,7 +82,7 @@
<arg value="${appname}"/>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -93,7 +93,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java
index 28fcc2b..b4bf9b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java
@@ -64,12 +64,12 @@
port = args[6];
contextRoot = args[7];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 9309");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -81,7 +81,7 @@
String testResult = invokeURL("http://" + host + ":" + port + contextRoot + "/test");
System.out.println(testResult);
-
+
int webReqCount2 = getCount("web/request/requestcount", "requestcount");
System.out.println("web request count: " + webReqCount2);
int appReqCount2 = getCount("applications" + contextRoot + "-web/" + instanceName + "/requestcount", "requestcount");
@@ -98,7 +98,7 @@
System.out.println("app error count: " + appErrorCount1);
invokeURL("http://" + host + ":" + port + contextRoot + "/badrequest");
-
+
int webErrorCount2 = getCount("web/request/errorcount", "errorcount");
System.out.println("web error count: " + webErrorCount2);
int appErrorCount2 = getCount("applications" + contextRoot + "-web/" + instanceName + "/errorcount", "errorcount");
@@ -116,7 +116,7 @@
}
private String invokeURL(String urlString) throws Exception {
-
+
StringBuilder sb = new StringBuilder();
URL url = new URL(urlString);
@@ -172,5 +172,5 @@
return ((Long)((Map)((Map)((Map)((Map)map.get("data")).get("extraProperties")).get(
"entity")).get(countName)).get("count")).intValue();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties
index 66b8461..b155cc1 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-monitor-web-request"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml
index 7c9741b..df76d57 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,16 +43,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -63,7 +63,7 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -71,7 +71,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}:." fork="true">
<arg value="${admin.host}"/>
@@ -84,7 +84,7 @@
<arg value="${contextroot}"/>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -95,7 +95,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java
index 434d669..eded2d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java
@@ -18,7 +18,7 @@
import java.net.*;
import com.sun.ejte.ccl.reporter.*;
-/**
+/**
* Unit test for:
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=2339
@@ -42,7 +42,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2339");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/"
+ "%E3%81%A8%E7%B2%AEJot%E7%B2%AEEnterpriseApplication2%E7%B2%A4%E3%82%8D-war/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -79,10 +79,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties
index e7f1326..8e38c61 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-multi-byte-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml
index 23f2ac6..19da3de 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/multiByteContextRoot/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/descriptor/web.xml
index f6443cd..452644b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java
index 8b3c37d..9bd0a33 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java
@@ -20,7 +20,7 @@
import java.util.Map;
import com.sun.ejte.ccl.reporter.*;
-/**
+/**
* Unit test for:
*
* Multi-byte context root with session cookie
@@ -44,7 +44,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Multi-Byte Context Root with Session Cookie");
@@ -67,11 +67,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String doSetJsp() throws Exception {
-
+
String sessionId = null;
URL url = new URL("http://" + host + ":" + port + "/"
@@ -92,7 +92,7 @@
sessionId = getCookieField(cookies, JSESSIONID);
System.out.println("sessionId = " + sessionId);
- } else {
+ } else {
System.err.println("Unexpected return code: " + responseCode);
}
@@ -109,7 +109,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
//String cookie = sessionId + "; myid=123@456";
String cookie = "$Version=1; " + sessionId + "; myid=\"123@456\"";
- conn.setRequestProperty("Cookie", cookie);
+ conn.setRequestProperty("Cookie", cookie);
conn.connect();
int responseCode = conn.getResponseCode();
@@ -121,10 +121,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
expected = true;
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
- } else {
+ } else {
System.err.println("Unexpected return code: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties
index 3533b38..226951d 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-multi-byte-context-root-with-cookie"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml
index 23f2ac6..19da3de 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/multiByteContextRootWithCookie/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/descriptor/web.xml
index f6443cd..452644b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java
index 332bcc5..2b74efa 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -60,9 +60,9 @@
}
public void doTest() throws Exception {
-
+
Socket sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.properties
index a2880f1..f81fc98 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-default-charset"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-default-charset"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
index 3e53dcf..17482d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java
index 74d2e69..4bc871b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -70,9 +70,9 @@
}
public void doTest() throws Exception {
-
+
sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.properties
index cb2edd0..2fdc990 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-form-hint-field"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-form-hint-field"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/multiByteGETQueryParamFormHintField/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
index 3e53dcf..17482d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java
index 65fbf07..bacff80 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -60,9 +60,9 @@
}
public void doTest() throws Exception {
-
+
Socket sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.properties
index 2228b0f..2626ea8 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-locale-charset-map"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-locale-charset-map"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
index 3e53dcf..17482d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java
index b20549c..897c5ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -69,9 +69,9 @@
}
public void doTest() throws Exception {
-
+
sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.properties
index fb3d119..3aed262 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-set-char-encoding"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-set-char-encoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
index 07daebc..91dc358 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java
index bb2539f..86cf389 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java
@@ -57,7 +57,7 @@
size = Integer.parseInt(args[3]);
isAscii = Boolean.valueOf(args[4]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Multi-byte Http request buffer");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties
index e715079..cd4233a 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-multi-byte-http-request-buffer"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml
index d89725b..eb029df 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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" encoding="UTF-8"/>
- </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}"/>
@@ -73,10 +73,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/web/multiBytePOSTFormHintField/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/WebTest.java
index b4d9a30..48a8d7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for POST form data with form-hint-field");
WebTest webTest = new WebTest(args);
@@ -58,7 +58,7 @@
}
public void doTest() throws Exception {
-
+
// POST body
String body = "japaneseName="
+ URLEncoder.encode("\u3068\u4eba\u6587", "Shift_JIS")
@@ -67,7 +67,7 @@
// Create a socket to the host
Socket sock = new Socket(host, Integer.parseInt(port));
OutputStream os = sock.getOutputStream();
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream()));
@@ -75,7 +75,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.properties b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.properties
index 17c06ee..1113358 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/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="web"/>
-<property name="appname" value="${module}-multi-byte-post-form-hint-field"/>
+<property name="appname" value="${module}-multi-byte-post-form-hint-field"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/multiBytePOSTFormHintField/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
index 194af75..a7424f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doPost (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java
index 892027e..a21448a 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java
@@ -24,10 +24,10 @@
* Issue Issue 464: Multi-Processor configuration aren't applied
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -36,7 +36,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("multiProcessorConfig");
String host = args[0];
@@ -45,17 +45,17 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
System.out.println(t.getMessage());
- stat.addStatus("multiProcessorConfig", stat.PASS);
+ stat.addStatus("multiProcessorConfig", stat.PASS);
}
if (count != EXPECTED_COUNT){
stat.addStatus("multiProcessorConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> expect " + EXPECTED_COUNT);
}
@@ -71,7 +71,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,16 +83,16 @@
index = line.indexOf(result);
System.out.println(line);
if (index != -1) {
- stat.addStatus("multiProcessorConfig", stat.FAIL);
+ stat.addStatus("multiProcessorConfig", stat.FAIL);
break;
- }
+ }
}
if ( index == -1 ){
- stat.addStatus("multiProcessorConfig", stat.PASS);
+ stat.addStatus("multiProcessorConfig", stat.PASS);
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties
index 6e47818..072545b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-multiProcessorConfig"/>
+<property name="appname" value="${module}-multiProcessorConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-multiProcessorConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml
index a42cefb..d3102af 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -70,15 +70,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -86,7 +86,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -103,10 +103,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/web/multiProcessorConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java
index 5ff1f27..8e7a560 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Multi Servlet Requests");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "multiServletRequests", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-multiServletRequests", stat.FAIL);
- }
+ }
stat.printSummary("web/multiServletRequests---> expect " + EXPECTED_COUNT);
}
@@ -69,7 +69,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -84,19 +84,19 @@
if (index != -1) {
index = line.indexOf("::");
String status = line.substring(index+2);
-
+
System.out.println("=== status: " + status);
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-multiServletRequests: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-multiServletRequests: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-multiServletRequests: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
j++;
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties
index cfa4ab2..2554d97 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-multiServletRequests"/>
+<property name="appname" value="${module}-multiServletRequests"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-multiServletRequests"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml
index deec8a9..ac46190 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -59,7 +59,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -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/web/multiServletRequests/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/descriptor/web.xml
index ac3278e..7e1a009 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/descriptor/web.xml
@@ -22,23 +22,23 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -51,7 +51,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
index 0535fe4..be414b7 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
@@ -29,14 +29,14 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream dout =
+ DataOutputStream dout =
new DataOutputStream(urlConnection.getOutputStream());
dout.writeByte(1);
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
index 68d876a..e9745e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
@@ -29,14 +29,14 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("=========== In ServletTest2 ============");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
index a92dab0..c9e5c86 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
@@ -29,14 +29,14 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("================ In Servlet3 ===============");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java
index 5441cda..a459f60 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java
@@ -25,10 +25,10 @@
* forwarded to another servlet
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 2;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -41,13 +41,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
run(host, port, contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("multiByteValue POST", stat.FAIL);
- }
+ }
} catch (Throwable t) {
stat.addStatus("multiByteValue", stat.FAIL);
}
@@ -63,12 +63,12 @@
*/
Socket s = new Socket(host, port);
OutputStream os = s.getOutputStream();
- System.out.println(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ System.out.println(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ " HTTP/1.0\n"));
- os.write(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ os.write(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -79,16 +79,16 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
- stat.addStatus("web-multibyteValue GET: "
+ stat.addStatus("web-multibyteValue GET: "
+ line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-multibyteValue GET: "
- + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-multibyteValue GET: "
+ + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
@@ -98,11 +98,11 @@
// Construct body
String body = URLEncoder.encode("j_encoding", "UTF-8")
+ "=" + URLEncoder.encode("Shift_JIS", "UTF-8");
-
+
// Create a socket to the host
s = new Socket(host, port);
os = s.getOutputStream();
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
s.getOutputStream(), "UTF8"));
@@ -110,7 +110,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
@@ -126,18 +126,18 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
- stat.addStatus("web-multibyteValue POST: "
+ stat.addStatus("web-multibyteValue POST: "
+ line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-multibyteValue POST: "
- + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-multibyteValue POST: "
+ + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties b/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties
index 7417df8..6472a85 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-multibyteValue"/>
+<property name="appname" value="${module}-multibyteValue"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-multibyteValue"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml b/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/multibyteValue/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multibyteValue/descriptor/web.xml
index 9d4499f..0c17423 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/descriptor/web.xml
@@ -22,18 +22,18 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
index 8edb3c2..901727f 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
@@ -41,7 +41,7 @@
}
public void doGet (HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
+ throws ServletException, IOException {
doPost (req,res);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
index ae65275..14e1cef 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
@@ -30,9 +30,9 @@
import jakarta.servlet.http.HttpServletResponse;
public class ServletTest2 extends HttpServlet {
-
+
Collator japCollator = Collator.getInstance(Locale.JAPANESE);
-
+
public void doPost (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
@@ -51,7 +51,7 @@
}
public void doGet (HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
+ throws ServletException, IOException {
doPost (req,res);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java
index 0fad42c..00b6254 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode == 200){
stat.addStatus("networkListenerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java
index 31ddd3d..29e708d 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("networkListenerDynamicConfig-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties
index a96df55..1fe2a53 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-networkListenerDynamicConfig"/>
+<property name="appname" value="${module}-networkListenerDynamicConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml
index 0d22acd..c2a78e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml
@@ -50,7 +50,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -80,7 +80,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -92,7 +92,7 @@
</classpath>
</java>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -107,7 +107,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java
index 2d1ab03..d270865 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 404");
+ System.out.println("Response code: " + responseCode + " Expected code: 404");
if (responseCode == 200){
stat.addStatus("networkListenerDynamicConfigEnabled", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java
index b76f5b5..9505ce1 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("networkListenerDynamicConfigEnabled-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties
index ef29bf7..89112d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-networkListenerDynamicConfigEnabled"/>
+<property name="appname" value="${module}-networkListenerDynamicConfigEnabled"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml
index 41f2b87..2b78f1f 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml
@@ -58,7 +58,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -66,10 +66,10 @@
</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
@@ -77,10 +77,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -88,7 +88,7 @@
<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}"/>
@@ -100,7 +100,7 @@
</classpath>
</java>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -115,7 +115,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java
index d019dc0..3cfc4b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("networkListenerTarget", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties
index 1348c83..1136010 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-networkListenerTarget"/>
+<property name="appname" value="${module}-networkListenerTarget"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-networkListenerTarget"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml
index 5292206..ee35723 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-<!ENTITY eeCommonBuild SYSTEM "./../../../config/ee-common.xml">
+<!ENTITY eeCommonBuild SYSTEM "./../../../config/ee-common.xml">
<!ENTITY run SYSTEM "./../../../config/run.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
]>
@@ -124,7 +124,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -132,19 +132,19 @@
</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">
<echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -172,7 +172,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<echo message="Undeploying warfile ${appname}-web from
${assemble.dir}/${appname}-web.war from ${basedir}." level="verbose"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java
index e9b1021..b743d59 100644
--- a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for one session cookie header");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties
index 253c394..eed74dc 100644
--- a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-one-session-cookie-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml
index 3e53d7e..9083d5a 100644
--- a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml
@@ -38,7 +38,7 @@
</delete>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,23 +46,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}"/>
@@ -74,10 +74,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/web/osgiServlet/WebTest.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/WebTest.java
index cd98b1c..b2d7ce0 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/WebTest.java
@@ -29,7 +29,7 @@
private static final SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private String host;
private String port;
private String contextRoot;
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties
index e8cbd21..a12364c 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-osgi-servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml
index 34f31f3..7eeacf1 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,14 +46,14 @@
</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="deploy" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -70,7 +70,7 @@
value="osgi-servlet"/>
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="run" depends="init-common">
@@ -84,7 +84,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
index 890612a..782c3cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
@@ -30,43 +30,43 @@
public class Activator implements BundleActivator {
- private ServiceTracker httpServiceTracker;
-
- public void start(BundleContext context) throws Exception {
- httpServiceTracker = new HttpServiceTracker(context);
- httpServiceTracker.open();
- }
+ private ServiceTracker httpServiceTracker;
- public void stop(BundleContext context) throws Exception {
- httpServiceTracker.close();
- httpServiceTracker = null;
- }
+ public void start(BundleContext context) throws Exception {
+ httpServiceTracker = new HttpServiceTracker(context);
+ httpServiceTracker.open();
+ }
- private class HttpServiceTracker extends ServiceTracker {
+ public void stop(BundleContext context) throws Exception {
+ httpServiceTracker.close();
+ httpServiceTracker = null;
+ }
- public HttpServiceTracker(BundleContext context) throws Exception {
- super(context, context.createFilter("(&(objectClass=" +
- org.osgi.service.http.HttpService.class.getName() +
+ private class HttpServiceTracker extends ServiceTracker {
+
+ public HttpServiceTracker(BundleContext context) throws Exception {
+ super(context, context.createFilter("(&(objectClass=" +
+ org.osgi.service.http.HttpService.class.getName() +
")(VirtualServer=server))"), null);
- }
+ }
- public Object addingService(ServiceReference reference) {
- HttpService httpService = (HttpService) context.getService(reference);
- try {
- httpService.registerServlet("/aa/bb", new HelloWorldServlet1(), null, null);
- httpService.registerServlet("/aa", new HelloWorldServlet2(), null, null);
+ public Object addingService(ServiceReference reference) {
+ HttpService httpService = (HttpService) context.getService(reference);
+ try {
+ httpService.registerServlet("/aa/bb", new HelloWorldServlet1(), null, null);
+ httpService.registerServlet("/aa", new HelloWorldServlet2(), null, null);
System.out.println("Registered servlet1 with mapping /aa/bb and servlet2 with mapping /aa");
test();
httpService.unregister("/aa/bb");
System.out.println("Unregistered servlet1");
test();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- return httpService;
- }
- }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return httpService;
+ }
+ }
void test() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
index f6535e7..57cf4fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
@@ -26,10 +26,10 @@
import jakarta.servlet.http.HttpServletResponse;
public class HelloWorldServlet1 extends HttpServlet {
-
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- resp.setContentType("text/html");
- resp.getWriter().write("<html><body>Servlet 1 </body></html>");
- }
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ resp.setContentType("text/html");
+ resp.getWriter().write("<html><body>Servlet 1 </body></html>");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
index 55499f9..a8a61ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
@@ -27,9 +27,9 @@
public class HelloWorldServlet2 extends HttpServlet {
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setContentType("text/html");
resp.getWriter().write("<html><body>Servlet 2 </body></html>");
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java
index 20e6887..d19107d 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java
@@ -40,16 +40,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 8648");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties
index 29117d1..398440f 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-override-implicit-mapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/pipelineQueueFull/WebTest.java b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/WebTest.java
index 29391aa..cc5f5d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/WebTest.java
@@ -25,16 +25,16 @@
* ("NPE When stressing GlassFish and the Pipeline Queue is full")
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -55,7 +55,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 503");
+ System.out.println("Response code: " + responseCode + " Expected code: 503");
if (responseCode != 503){
stat.addStatus("pipelineQueueFull", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties
index df19e4e..db12469 100644
--- a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-pipelineQueueFull"/>
+<property name="appname" value="${module}-pipelineQueueFull"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-pipelineQueueFull"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml
index fb627be..1accc7f 100644
--- a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml
@@ -62,7 +62,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties b/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties
index ce040a9..45a519e 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-portunif"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml b/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml
index e79c2e1..00cd2bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml
@@ -30,7 +30,7 @@
&commonBuild;
&testproperties;
&run;
-
+
<import file="../reportbuilder.xml"/>
<target name="jar" depends="build">
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties
index bb1832a..1dd62fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-portunif-target"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml
index 3aa17be..3bcd052 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml
@@ -32,7 +32,7 @@
&eeCommonBuild;
&testproperties;
&run;
-
+
<import file="../reportbuilder.xml"/>
<target name="jar" depends="build">
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java
index 531e8e2..f82d2a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java
@@ -24,7 +24,7 @@
* regression on AS8")
*/
public class WebTest {
-
+
private static final String TEST_NAME = "programmatic-login";
private static final SimpleReporterAdapter stat =
@@ -47,11 +47,11 @@
public static void main(String[] args) {
stat.addDescription("Unit test for 4862098");
-
+
WebTest webTest = new WebTest(args);
-
+
try {
- webTest.invoke();
+ webTest.invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -77,5 +77,5 @@
", received: " + responseCode);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties
index a02fca8..6080739 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-programmatic-login"/>
+<property name="appname" value="${module}-programmatic-login"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/web-programmatic-login"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml
index 1ddb940..d31912c 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,7 +55,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -66,11 +66,11 @@
<param name="groups" value="testgroup1"/>
</antcall>
</target>
-
+
<target name="setup-policy" depends="init-common">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"/>
- <copy file="server.policy"
+ <copy file="server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
@@ -82,7 +82,7 @@
<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}"/>
@@ -96,19 +96,19 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="remove-user" depends="init-common">
<antcall target="delete-user-common">
<param name="user" value="testuser3"/>
</antcall>
- </target>
+ </target>
<target name="restore-policy" depends="setup-policy">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml
index d5f8b5e..2b01cad 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
index 8bb7b98..4359984 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
@@ -29,7 +29,7 @@
HttpServletResponse response)
throws ServletException, IOException {
String user = request.getParameter("user");
- String password = request.getParameter("password");
+ String password = request.getParameter("password");
System.out.println("[user] " + user + " [password] " + password);
ProgrammaticLogin login = new ProgrammaticLogin();
if (!login.login(user, password, request, response).booleanValue()) {
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java
index 02e86db..45f5a71 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java
@@ -66,7 +66,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6188932");
WebTest webTest = new WebTest(args);
@@ -75,8 +75,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties
index 4e0a803..ba9ac4e 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-proxy-auth-cert"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
index 0ad211e..0d97020 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6170450");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -60,7 +60,7 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
@@ -74,7 +74,7 @@
os.write(get.getBytes());
os.write("Proxy-keysize: 512\n".getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
index bc42e12..c39efd0 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-proxy-keysize"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java
index 95c18ec..37c88f8 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java
@@ -35,12 +35,12 @@
int port = new Integer(portS).intValue();
String name;
-
+
goGet(host, port, "TEST", contextRoot + "/ServletTest" );
stat.printSummary(TEST_NAME);
}
- private static void goGet(String host, int port,
+ private static void goGet(String host, int port,
String result, String contextPath) {
try{
@@ -48,13 +48,13 @@
Socket s = new Socket(host, port);
s.setSoTimeout(5000);
OutputStream os = s.getOutputStream();
-
+
contextPath += "?url=" + contextPath;
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -64,16 +64,16 @@
while ((line = bis.readLine()) != null) {
index = line.indexOf(result);
System.out.println("[Server response]" + line);
-
+
int pos = line.indexOf("Location");
if (pos != -1){
contextPath = line.substring(pos + "Location:".length()).trim();
bis.close();
is.close();
- break;
+ break;
}
}
-
+
s = new Socket(host, port);
os = s.getOutputStream();
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
@@ -85,21 +85,21 @@
while ((line = bis.readLine()) != null) {
index = line.indexOf(result);
System.out.println("[Redirect response]" + line);
-
+
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
stat.addStatus("TEST_NAME", stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/build.properties b/appserver/tests/appserv-tests/devtests/web/queryString/build.properties
index 7d2b4ff..17af4d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-queryString"/>
+<property name="appname" value="${module}-queryString"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-queryString"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/build.xml b/appserver/tests/appserv-tests/devtests/web/queryString/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/queryString/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/queryString/descriptor/web.xml
index 3dff9cb..4ec62fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/descriptor/web.xml
@@ -22,18 +22,18 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
index e49289f..074cd5e 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private static boolean isRedirected = false;
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,14 +39,14 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
System.out.println("requestUri: " + request.getRequestURI());
-
+
if (!isRedirected){
String url = request.getParameter("url") + "?TEST=PASS";
System.out.println("[URL] " + url);
@@ -56,7 +56,7 @@
out.flush();
return;
}
-
+
out.println("TEST:" + request.getParameter("TEST"));
out.flush();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java
index eaae206..81b275e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java
@@ -21,22 +21,22 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
/**
- * Fix for Bugzilla Bug 28959 IOException using CoyoteReader.readLine()
+ * Fix for Bugzilla Bug 28959 IOException using CoyoteReader.readLine()
* but not using .read()
*/
public static void main(String args[]) {
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone test for Bugzilla 28959");
String host = args[0];
@@ -45,13 +45,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "readline", contextRoot + "/ServletTest2" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("readLineIOException UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("readLineIOException UNPREDICTED-FAILURE", stat.FAIL);
@@ -70,7 +70,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -82,24 +82,24 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASSED")){
count++;
- }
- }
+ }
+ }
lineNum++;
}
if (count == 10){
- stat.addStatus("web-readLineIOException: readLine"
+ stat.addStatus("web-readLineIOException: readLine"
, stat.PASS);
} else {
- stat.addStatus("web-readLineIOException: readLine "
- , stat.FAIL);
+ stat.addStatus("web-readLineIOException: readLine "
+ , stat.FAIL);
}
count = 1;
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties b/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties
index 7a3f33c..89cadd4 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-readLineIOException"/>
+<property name="appname" value="${module}-readLineIOException"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-readLineIOException"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml b/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/readLineWithMaxLength/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/WebTest.java
index bd99d90..56707fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/WebTest.java
@@ -43,7 +43,7 @@
contextRoot = args[2];
length = Integer.parseInt(args[3]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for readLine with max length");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties
index 00b1b89..641fc2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-readLine-with-max-length"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml
index 8babcba..dd42097 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -72,10 +72,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/web/readerSelectorsConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/WebTest.java
index 3f0bfb1..7cc5775 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("http-listener reader-threads unit tests.");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-readerSelectorsConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> expect " + EXPECTED_COUNT);
}
@@ -69,7 +69,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,17 +83,17 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-readerSelectorsConfig: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-readerSelectorsConfig: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-readerSelectorsConfig: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties
index 11051cb..2eba8c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-readerSelectorsConfig"/>
+<property name="appname" value="${module}-readerSelectorsConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-readerSelectorsConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml
index 0a99726..3bdc712 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -60,10 +60,10 @@
</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
@@ -71,10 +71,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -82,7 +82,7 @@
<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}"/>
@@ -94,10 +94,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/web/readerSelectorsConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java
index 835d56e..e3c7c7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("http-listener reader-threads unit tests.");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-readerThreadsConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> expect " + EXPECTED_COUNT);
}
@@ -68,7 +68,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -82,17 +82,17 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java
index a904d00..770a52e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("http-listener reader-threads unit tests.");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-readerThreadsConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> expect " + EXPECTED_COUNT);
}
@@ -69,7 +69,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,17 +83,17 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties
index 3f8b786..9fc1e99 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-readerThreadsConfig"/>
+<property name="appname" value="${module}-readerThreadsConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-readerThreadsConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml
index 0a99726..3bdc712 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -60,10 +60,10 @@
</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
@@ -71,10 +71,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -82,7 +82,7 @@
<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}"/>
@@ -94,10 +94,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/web/readerThreadsConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java
index 7b8559c..d79adc1 100644
--- a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
diff --git a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties
index 42ad4dc..8b5fa2b 100644
--- a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-reconfigDefaultWebModule"/>
+<property name="appname" value="${module}-reconfigDefaultWebModule"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-reconfigDefaultWebModule"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml
index 0cc4b4e..7ea4493 100644
--- a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml
@@ -38,7 +38,7 @@
value="--listeneraddress ${http.address} --listenerport ${http.alternate.port} --defaultvs server3 http-listener-server"/>
</antcall>
</target>
-
+
<target name="create-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-virtual-server" />
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java
index 0f63b31..03abd8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java
@@ -41,7 +41,7 @@
contextRoot = args[2];
trustStorePath = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4946739");
WebTest webTest = new WebTest(args);
@@ -69,7 +69,7 @@
} else {
url = new URL(conn.getHeaderField("Location"));
System.out.println("Redirected to: " + url.toString());
- SSLContext ctx = SSLContext.getInstance("TLS");
+ SSLContext ctx = SSLContext.getInstance("TLS");
ctx.init(null, getTrustManagers(trustStorePath), null);
HttpsURLConnection httpsConn = (HttpsURLConnection) url.openConnection();
httpsConn.setSSLSocketFactory(ctx.getSocketFactory());
@@ -128,6 +128,6 @@
public boolean verify(String hostname, SSLSession session) {
return true;
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectPort/build.properties
index 2e1fbd0..2539a59 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPort/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="web"/>
-<property name="appname" value="${module}-redirect-port"/>
+<property name="appname" value="${module}-redirect-port"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml
index 8acc507..e0f541d 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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>
- </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,prepare-keystore-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -72,10 +72,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/web/redirectPortDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.properties
index 2c081c0..c1b9d6c 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/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="web"/>
-<property name="appname" value="${module}-redirect-port-dynamic-reconfig"/>
+<property name="appname" value="${module}-redirect-port-dynamic-reconfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml
index 60cd71a..4e1f409 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="setup" depends="init-common">
<antcall target="delete-network-listener-1" />
<antcall target="create-network-listener-1" />
@@ -93,7 +93,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -109,10 +109,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-network-listener-2"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java
index 62535b6..0083a50 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6419659");
WebTest webTest = new WebTest(args);
@@ -69,7 +69,7 @@
os.write(get.getBytes());
os.write("Host: loadbalancer:9999\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties
index f69ad2d..166ea6c 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-redirect-port-loadbalancer"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml
index 89fcd8e..60cdb8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java
index f824744..4000ac7 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java
@@ -41,7 +41,7 @@
contextRoot = args[2];
expected = "uri = " + contextRoot + "/, pathInfo = /";
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 5141");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.properties
index d88e26b..6d174dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/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="web"/>
-<property name="appname" value="${module}-redirect-with-root-wild-card-url-pattern"/>
+<property name="appname" value="${module}-redirect-with-root-wild-card-url-pattern"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml
index 854bf6f..bde979b 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,18 +42,18 @@
</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>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -68,10 +68,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/web/relativeRedirectAllowed/WebTest.java b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/WebTest.java
index 2740115..b4ccc5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/WebTest.java
@@ -20,9 +20,9 @@
/*
* This unit test expects only the relative path when redirect
- * as the following is specified in sun-web.xml.
+ * as the following is specified in sun-web.xml.
*
- * <property name="relativeRedirectAllowed" value="true"/>
+ * <property name="relativeRedirectAllowed" value="true"/>
*
*/
public class WebTest {
@@ -32,7 +32,7 @@
private static final String TEST_NAME = "web-relativeRedirectAllowed";
/*
- * The relative path that is expected.
+ * The relative path that is expected.
*/
private static final String PATH = "/web-relativeRedirectAllowed/jsp/test2.jsp";
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4642650");
WebTest webTest = new WebTest(args);
@@ -55,8 +55,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -71,14 +71,14 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test1.jsp" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -97,7 +97,7 @@
fail = false;
} else {
System.err.println("Wrong path: " + line
- + ", expected: " + PATH);
+ + ", expected: " + PATH);
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties
index 3961528..8e2f708 100644
--- a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-relativeRedirectAllowed"/>
+<property name="appname" value="${module}-relativeRedirectAllowed"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-relativeRedirectAllowed"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/replaceRootContext/WebTest.java b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/WebTest.java
index 5d19516..d73f4e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 5056726");
WebTest webTest = new WebTest(args);
@@ -46,15 +46,15 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "test.txt");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties
index e5d45e1..1282694 100644
--- a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-replace-root-context"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml
index 4edc9cc..4ab7865 100644
--- a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/requestDispatcherDirectoryTraversal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/WebTest.java
index 0501fde..b8c31fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/WebTest.java
@@ -49,7 +49,7 @@
appserverTestPath = args[3];
adminPort = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Security Vulnerability test for RequestDispatcher directory traversal");
WebTest webTest = new WebTest(args);
@@ -57,8 +57,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -109,7 +109,7 @@
} else {
System.err.println("Missing expected response: " + EXPECTED);
}
-
+
} finally {
try {
if (os != null) os.close();
@@ -125,9 +125,9 @@
} catch (IOException ex) {}
}
}
-
+
private void invokeValidationTestForDoubleDot() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
@@ -170,9 +170,9 @@
} catch (IOException ex) {}
}
}
-
+
private void invokeValidationTestForColon() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties
index dd28057..922a782 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-request-dispatcher-directory-traversal"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml
index 553d95e..1c7054b 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,39 +44,39 @@
</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}"/>
<arg value="${http.port}"/>
<arg value="${contextroot}"/>
- <arg value="${env.S1AS_HOME}"/>
- <arg value="${admin.port}"/>
+ <arg value="${env.S1AS_HOME}"/>
+ <arg value="${admin.port}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
<pathelement location="."/>
</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/web/requestDispatcherForwardCommitResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/WebTest.java
index 4992493..1b01b5e 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6374990");
WebTest webTest = new WebTest(args);
@@ -114,6 +114,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.properties
index 8a3bff9..7f68aa4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-forward-commit-response"/>
+<property name="appname" value="${module}-request-dispatcher-forward-commit-response"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/requestDispatcherForwardCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
index effdd97..427e461 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
try {
Thread.currentThread().sleep(10 * 1000);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
index fc0b994..4826851 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2210");
WebTest webTest = new WebTest(args);
@@ -116,6 +116,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties
index 6d954b2..c40c97a 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-request-dispatcher-forward-head-request"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/requestDispatcherForwardHEADRequest/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
index a73b2c0..7377608 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java
index 523525d..cae739c 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 10641");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties
index e9ad6f5..e1806e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-request-dispatcher-forward-non-http"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java
index 83dcb35..a18224d 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6374990");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.properties
index 610ebe7..a7bf9f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-forward-send-error-commit-response"/>
+<property name="appname" value="${module}-request-dispatcher-forward-send-error-commit-response"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
index effdd97..427e461 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
try {
Thread.currentThread().sleep(10 * 1000);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java
index 0615416..0734a82 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java
@@ -54,7 +54,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6374990");
WebTest webTest = new WebTest(args);
@@ -134,7 +134,7 @@
throw new Exception("Response was delayed by 10 seconds " +
"or more, which is how long the " +
"origin servlet of the RD.forward() " +
- "has been sleeping for. " +
+ "has been sleeping for. " +
"The response should have been " +
"committed immediately.");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.properties
index 26e7313..5951e9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-forward-set-status-commit-response"/>
+<property name="appname" value="${module}-request-dispatcher-forward-set-status-commit-response"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
index effdd97..427e461 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
try {
Thread.currentThread().sleep(10 * 1000);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java
index c7cbc56..b9fd2bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 10641");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties
index 5628cf6..b754235 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-request-dispatcher-include-non-http"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/requestDispatcherIncludeTargetNotFound/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/WebTest.java
index 8fa911c..5c0089b 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6182984");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/include.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -67,6 +67,6 @@
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.properties
index 5b6dff6..6a92d62 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-include-target-not-found"/>
+<property name="appname" value="${module}-request-dispatcher-include-target-not-found"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/requestDispatcherMaxDepth/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/WebTest.java
index 4074323..56af958 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/WebTest.java
@@ -24,7 +24,7 @@
* exception in server.log file").
*
* This test's build.xml configures <web-container> property named
- * dispatcher-max-depth in domain.xml and sets its value to 5 before
+ * dispatcher-max-depth in domain.xml and sets its value to 5 before
* restarting the server.
*/
public class WebTest {
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4703023");
@@ -57,18 +57,18 @@
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/foo.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties
index 37cea8e..56efda6 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-request-dispatcher-max-depth"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml
index 4b41d88..8e665a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -72,7 +72,7 @@
<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}"/>
@@ -84,10 +84,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java
index 54e556b..57d9113 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7034");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties
index d7ae3b3..b229454 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-request-dispatcher-multiple-forward"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/requestDispatcherPathWithParams/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/WebTest.java
index b6c68e4..6cf16b7 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4873423");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -67,7 +67,7 @@
}
private void invokeJsp() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/forwardFrom.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.properties
index bc76cf2..5d525ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-path-with-params"/>
+<property name="appname" value="${module}-request-dispatcher-path-with-params"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/responseErrorMessageEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/WebTest.java
index 5569963..684ce95 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4655010");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -55,14 +55,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/HelloJapan" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
// Decode error message using the same charset that it was encoded in
BufferedReader bis = new BufferedReader(
diff --git a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.properties
index d753f45..685e095 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-response-error-message-encoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/responseErrorMessageEncoding/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/descriptor/web.xml
index ec0bc4c..7848e43 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>HelloJapan</display-name>
<servlet-name>HelloJapan</servlet-name>
<servlet-class>test.HelloJapan</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>HelloJapan</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java
index 3ba0eb0..fef5dc2 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6254469");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -55,14 +55,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/HelloJapan" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
// Decode error message using the same charset that it was encoded in
BufferedReader bis = new BufferedReader(
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties
index 255aa97..16fa887 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-response-exception-message-encoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/responseExceptionMessageEncoding/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml
index ec0bc4c..7848e43 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>HelloJapan</display-name>
<servlet-name>HelloJapan</servlet-name>
<servlet-class>test.HelloJapan</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>HelloJapan</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java
index 08d0121..e42ee54 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4817642,4876454");
WebTest webTest = new WebTest(args);
@@ -62,7 +62,7 @@
os.write(get.getBytes());
os.write(("Cookie: JSESSIONID=" + JSESSION_ID + "\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,11 +87,11 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- } else {
+ } else {
System.err.println("Missing JSESSIONID");
stat.addStatus(TEST_NAME, stat.FAIL);
}
- } else {
+ } else {
System.err.println("Missing Set-Cookie response header");
stat.addStatus(TEST_NAME, stat.FAIL);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.properties b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.properties
index 7447069..f90e0bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/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="web"/>
-<property name="appname" value="${module}-reuse-sessionid"/>
+<property name="appname" value="${module}-reuse-sessionid"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/reuseSessionId/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/descriptor/web.xml
index 28af79d..c9a0508 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/descriptor/web.xml
@@ -26,7 +26,7 @@
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java
index 35723e8..629d39a 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "Security Constraint Mapping test";
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Unit test for 4903209");
String host = args[0];
@@ -41,7 +41,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
//Check if it strips out uri parameters (";.*") before mapping to webapps
goGet(host, port, contextRoot + "/ServletTest;test=aaa" );
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties
index 32ef054..b0d7a5d 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-securityConstraintMapping"/>
+<property name="appname" value="${module}-securityConstraintMapping"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-securityConstraintMapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/securityConstraintMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/descriptor/web.xml
index 22adcb4..ef83928 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/descriptor/web.xml
@@ -22,18 +22,18 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
index 52c3a37..d11c986 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,9 +39,9 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("This is Servlet Test");
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java
index fe166b6..a02273c 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for security constraints mapping");
WebTest webTest = new WebTest(args);
@@ -63,11 +63,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/application/redirect/xxx");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties
index d192e86..c582bec 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-security-constraint-wildcard-mapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/securityConstraintWildcardMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/descriptor/web.xml
index 4412abc..cb88ef6 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/descriptor/web.xml
@@ -28,7 +28,7 @@
<servlet-name>MyProtectedServlet</servlet-name>
<url-pattern>/application/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>MyProtectedServlet</servlet-name>
<url-pattern>/login</url-pattern>
@@ -38,18 +38,18 @@
<servlet-name>MyProtectedServlet</servlet-name>
<url-pattern>/redirect</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>
30
</session-timeout>
</session-config>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Protected Area</web-resource-name>
<url-pattern>/application/redirect/*</url-pattern>
- <url-pattern>/redirect</url-pattern>
+ <url-pattern>/redirect</url-pattern>
<url-pattern>/content.jsp</url-pattern>
<http-method>GET</http-method>
<http-method>POST</http-method>
@@ -58,12 +58,12 @@
<role-name>user</role-name>
</auth-constraint>
</security-constraint>
-
+
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>file</realm-name>
</login-config>
-
+
<security-role>
<role-name>user</role-name>
</security-role>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
index 2c332c3..1649de9 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
@@ -32,16 +32,16 @@
* @version
*/
public class MyProtectedServlet extends HttpServlet {
-
+
/** Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
-
+
System.out.println("MyProtectedServlet.processRequest " + request.getRequestURI() + " " + request.getQueryString());
-
+
String myUrl = request.getRequestURI();
if(myUrl.indexOf("login") >= 0) {
login(request, response);
@@ -50,7 +50,7 @@
redirect(request, response);
return;
}
-
+
if(request.getRemoteUser() == null) {
String callUrl = request.getRequestURI();
String query = request.getQueryString();
@@ -63,7 +63,7 @@
} else {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("<html>");
out.println("<head>");
out.println("<title>Servlet MyProtectedServlet</title>");
@@ -72,23 +72,23 @@
out.println("<h1>Servlet MyProtectedServlet at " + request.getContextPath() + "</h1>");
out.println("</body>");
out.println("</html>");
-
+
out.close();
}
}
-
+
private void redirect(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
-
+
response.sendRedirect(request.getParameter("nextencurl"));
}
-
+
protected void login(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
request.getRequestDispatcher("/login.jsp").forward(request, response);
- }
-
+ }
+
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/** Handles the HTTP <code>GET</code> method.
* @param request servlet request
@@ -98,7 +98,7 @@
throws ServletException, IOException {
processRequest(request, response);
}
-
+
/** Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -107,7 +107,7 @@
throws ServletException, IOException {
processRequest(request, response);
}
-
+
/** Returns a short description of the servlet.
*/
public String getServletInfo() {
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java
index afa7ef0..7d7b071 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6264656");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties
index a559b43..baa9586 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-security-constraint-without-any-auth-constraint"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/serverRedirectWithQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/WebTest.java
index df10b1c..72c1c95 100644
--- a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3085");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
}
private void invokeServlet() throws Exception {
-
+
String expectedRedirectLocation = "Location: http://" + host + ":"
+ port + contextRoot + "/?" + QUERY_STRING;
@@ -78,7 +78,7 @@
InputStream is = null;
BufferedReader bis = null;
String line = null;
- try {
+ try {
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
while ((line = bis.readLine()) != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties
index 3924736..24ebcec 100644
--- a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-server-redirect-with-query-string"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java
index d25179e..de6c8bc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for absolute-ordering-web-fragments");
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 + "/";
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
@@ -93,10 +93,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/web/servlet-3.0/absoluteOrderingWebFragments/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.properties
index 898af91..28c96ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-absolute-ordering-web-fragments"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml
index 668c779..8ff7bf9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -71,23 +71,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -99,10 +99,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/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml
index dee048c..7147286 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml
@@ -20,6 +20,6 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>B</name>
</web-fragment>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
index 1e4daee..27b57ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
@@ -41,7 +41,7 @@
} catch(SQLException ex) {
throw new ServletException(ex);
}
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
index d79b440..d3ed37b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
index 4f9f684..3cf6099 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
@@ -31,7 +31,7 @@
public class WFTestFilter2B implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2B.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
index 1972806..cf882a4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
@@ -40,7 +40,7 @@
} catch(SQLException ex) {
throw new ServletException(ex);
}
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java
index a472719..4d0784a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncContext#complete");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties
index 82bb7c9..2dfd3a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-complete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
index 6be4342..26f0523 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
@@ -45,6 +45,6 @@
}
}
},
- 5000);
+ 5000);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties
index 6a4e934..9c47160 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-create-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml
index 48e0a0a..e9b7607 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java
index a551ae1..db0a524 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for cross-context ASYNC dispatch.
*
* This unit test accesses servlet "dispatchFrom" in context "fromContext",
- * which initiates an ASYNC dispatch to servlet "dispatchTo" in context
+ * which initiates an ASYNC dispatch to servlet "dispatchTo" in context
* "toContext".
*/
public class WebTest {
@@ -41,7 +41,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for cross-context async dispatch");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
"/fromContext/dispatchFrom?myname=myvalue");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties
index bac0057..080983b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-servlet-3.0-async-context-dispatch-cross-context"/>
+<property name="appname" value="${module}-servlet-3.0-async-context-dispatch-cross-context"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="fromContext.war" value="fromContext.war"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml
index ccddcb4..b325544 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${fromContext.war}"/>
@@ -50,8 +50,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -64,8 +64,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -76,7 +76,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml
index dddaff5..63f6a82 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>DispatchFrom</servlet-name>
<servlet-class>test.DispatchFrom</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>DispatchFrom</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml
index 95d0c38..b7dabfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>DispatchTo</servlet-name>
<servlet-class>test.DispatchTo</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>DispatchTo</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
index 54f4eb0..cb78ba6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
@@ -44,6 +44,6 @@
ac.dispatch(toContext, "/dispatchTo");
}
},
- 5000);
+ 5000);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java
index 7bbe19c..a715e48 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for AsyncContext#dispatch");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet?target=DispatchTargetWithPath");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties
index 26292bc..4318543 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-dispatch-to-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml
index ce8cc1f..9edba11 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml
@@ -18,18 +18,18 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet>
<servlet-name>DispatchTarget</servlet-name>
<servlet-class>test.DispatchTarget</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
index e44ddca..469a42e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
@@ -43,6 +43,6 @@
ac.dispatch(target);
}
},
- 5000);
+ 5000);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java
index 6563cf4..8b0f8dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GLASSFISH-19364");
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");
@@ -64,7 +64,7 @@
if (EXPECTED_RESPONSE.equals(lastLine)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + lastLine);
stat.addStatus(TEST_NAME, stat.FAIL);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties
index dcb0d66..f4e4f68 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-dispatch-with-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml
index 9afb853..0f7afb8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/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/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java
index 99de2d5..2451246 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for AsyncContext#dispatch");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String target) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + target);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties
index b682b3c..191a636 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-zero-arg-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml
index bed60a1..cf5af96 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml
index b00b3d7..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java
index ef45e7c..94cc0b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncContext#hasOriginalRequestAndResponse");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String mode) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties
index 7fd6f0d..f0fcfac 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-has-original-request-and-response"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java
index 677e0a0..59409ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for repeated calls to AsyncContext#dispatch with one
+ * Unit test for repeated calls to AsyncContext#dispatch with one
* intervening ServletRequest#startAsync. This unit test also checks
* to make sure that the intervening ServletRequest#startAsync notifies
* the registered AsyncListener at its onStartAsync method, and provides
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for AsyncContext#dispatch");
@@ -59,11 +59,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
HttpURLConnection conn = getHttpURLConnection("/TestServlet");
conn.disconnect();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties
index adb53b2..a943482 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-multiple-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml
index b00b3d7..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
index b952906..39c839d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
@@ -36,7 +36,7 @@
if (!req.isAsyncSupported()) {
throw new ServletException("Async not supported when it should");
}
-
+
if (req.getDispatcherType() == DispatcherType.REQUEST) {
// Container-initiated dispatch
req.setAttribute("ABC", "DEF");
@@ -80,7 +80,7 @@
/*
* ServletRequest#startAsync clears the list of AsyncListener
* instances registered with the AsyncContext - after calling
- * each AsyncListener at its onStartAsync method, which is the
+ * each AsyncListener at its onStartAsync method, which is the
* method we're in.
* Register ourselves again, so we continue to get notified
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java
index 98904e0..3632d7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onTimeout");
@@ -53,15 +53,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties
index ec2accc..576aeca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-context-set-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml
index 550e169..7541f72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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>
- </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">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java
index 5e6a7f7..aa033de 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for delay in async dispatch and complete");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties
index 1fa196f..a4ab021 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-delay-dispatch-and-complete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
index b39a30e..9196029 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
@@ -31,7 +31,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java
index c902ad3..ad64dfd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onComplete");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String mode) throws Exception {
@@ -84,7 +84,7 @@
if (input != null) input.close();
} catch (IOException ex) {}
if (conn != null) conn.disconnect();
- }
+ }
}
private HttpURLConnection getHttpURLConnection(String path) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties
index 32e0cd2..be3a9af 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-listener-on-complete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java
index e44f818..dc1f438 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onError");
@@ -54,15 +54,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties
index c650f41..a0678af 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-listener-on-error"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml
index 550e169..7541f72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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>
- </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">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
index 04e4995..8b8fe12 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
@@ -29,7 +29,7 @@
if (!req.isAsyncSupported()) {
throw new ServletException("Async not supported when it should");
}
-
+
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
// Container-initiated dispatch
final AsyncContext ac = req.startAsync();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java
index b6f0d8e..184218e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onTimeout");
@@ -58,15 +58,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String mode, String expectedResponse) throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/AsyncListenerTimeoutServlet?" + mode);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties
index e2e9b5a..2ecd279 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-listener-on-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml
index aca85d6..2aabd64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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>
- </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">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar" debug="true"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml
index 2067e22..d80bd85 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>AsyncListenerTimeoutServlet</servlet-name>
<servlet-class>test.AsyncListenerTimeoutServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>AsyncListenerTimeoutServlet</servlet-name>
<url-pattern>/AsyncListenerTimeoutServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java
index 440466a..1f503bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11739");
@@ -57,15 +57,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String mode, String expectedResponse) throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/" + path + "?" + mode);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties
index 5a1a2e4..35d182b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-listener-on-timeout-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml
index 7a220db..fa4e308 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class"/>
<delete file="ReRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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>
- </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">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar" debug="true"
@@ -72,9 +72,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
index e42ebc4..c25aea5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
@@ -45,7 +45,7 @@
sb.append(", ");
sb.append(attrB);
}
- String output = sb.toString();
+ String output = sb.toString();
writer.write(output);
System.out.println(output);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java
index 91d8bb2..17f7d88 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for CR 6895187");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -98,7 +98,7 @@
if (!EXPECTED_RESPONSE.equals(line)) {
throw new Exception("Missing or unexpected response body, " +
- "expected: " + EXPECTED_RESPONSE +
+ "expected: " + EXPECTED_RESPONSE +
", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties
index f90c0f8..c867f95 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-start-outside-async-dispatch-scope"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml
index b00b3d7..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
index 8eec401..74cb7d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
@@ -56,7 +56,7 @@
}
}
},
- 5000);
+ 5000);
} else if (req.getDispatcherType() == DispatcherType.ASYNC) {
/*
* Sleep during the ASYNC dispatch, which is executed on a
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java
index 6d76fa7..fc79750 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async-supported");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties
index 61f2d73..1b9d824 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-supported-false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml
index ff1b4cf..5c1a74a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml
@@ -18,23 +18,23 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<filter>
<filter-name>TestFilter</filter-name>
<filter-class>test.TestFilter</filter-class>
- </filter>
+ </filter>
<filter-mapping>
<filter-name>TestFilter</filter-name>
<servlet-name>TestServlet</servlet-name>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java
index b07121a..d53b9d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async-supported");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties
index 89d167b..aa2d324 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-supported-true-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml
index a155e3e..b92835c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml
@@ -18,24 +18,24 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<filter>
<filter-name>TestFilter</filter-name>
<filter-class>test.TestFilter</filter-class>
<async-supported>true</async-supported>
- </filter>
+ </filter>
<filter-mapping>
<filter-name>TestFilter</filter-name>
<servlet-name>TestServlet</servlet-name>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java
index 6fe37ff..33f09d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async-supported");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/newServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties
index 17a69c0..03cb860 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-supported-true-programmatic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml
index 30027ff..f1fe51e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<listener>
<listener-class>test.MyListener</listener-class>
</listener>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
index fb8aeb5..c773ca1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
@@ -65,7 +65,7 @@
FilterRegistration.Dynamic fr = sc.addFilter(
"NewFilter", "test.NewFilter");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
fr.setAsyncSupported(true);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java
index 798c6ef..2cfe741 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java
@@ -21,7 +21,7 @@
/*
* Unit test for the spec requirement that if an async timeout occurs, and
* there are no AsyncListeners registered, the container MUST do an ERROR
- * dispatch with a status code equal to 500, which in this test case is
+ * dispatch with a status code equal to 500, which in this test case is
* mapped to error.jsp, which resets the status code to 200 and outputs
* the string "SUCCESS" to the response.
*/
@@ -34,7 +34,7 @@
private static final int EXPECTED_RESPONSE_CODE = 200;
private static final String EXPECTED_RESPONSE = "SUCCESS";
-
+
private String host;
private String port;
private String contextRoot;
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async timeout without " +
@@ -58,11 +58,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
InputStream is = null;
BufferedReader input = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties
index f52ff70..2f6911d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-async-timeout-no-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml
index 550e169..7541f72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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>
- </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">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml
index 4ca5c0b..2803400 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java
index 46de2cf..66eacd0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @ServletSecurity Inheritance");
@@ -50,7 +50,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -106,7 +106,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties
index 727e31a..eb53382 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-auth-annotation-inheritance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml
index 9f2d798..13d431d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java
index c813a93..349bd48 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @ServletSecurity");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public boolean run() throws Exception {
@@ -72,7 +72,7 @@
}
private boolean doWebMethod(String webMethod, String host, int port,
- String contextPath, boolean requireAuthenticate,
+ String contextPath, boolean requireAuthenticate,
int responseCode, String expected) throws Exception {
String urlStr = "http://" + host + ":" + port + contextPath;
@@ -102,7 +102,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties
index f7b0a8f..5e0311a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-auth-annotations"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml
index 75bd5b6..cf54f09 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
index 7e03bc6..5cdb5e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
@@ -47,14 +47,14 @@
writer.write("p:Hello, " + req.getRemoteUser() + "\n");
}
- public void doOptions(HttpServletRequest req, HttpServletResponse res)
+ public void doOptions(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
writer.write("o:Hello");
}
- protected void doPut(HttpServletRequest req, HttpServletResponse res)
+ protected void doPut(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java
index ffa8d16..0fba687 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for HttpOnly cookies");
WebTest webTest = new WebTest(args);
@@ -45,7 +45,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties
index f27b1ab..68ade99 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-cookie-http-only"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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}"/>
@@ -68,10 +68,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/web/servlet-3.0/defaultErrorPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/WebTest.java
index a393e4e..14bae69 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for default error page");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties
index d79b82a..8b18cf8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-default-error-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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}"/>
@@ -68,10 +68,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/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
index 4c12533..4a31812 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
res.sendError(404);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java
index 4ddb6a1..8c9964e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot =args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for dispatch forward async dispatch");
@@ -59,11 +59,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String expectedResponse) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + path);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties
index 727edac..f84c457 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-dispatch-forward-async-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml
index 4594a4f..f6cf71c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,23 +43,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}"/>
@@ -71,9 +71,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
index 7772f1e..d1a45f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
@@ -18,19 +18,19 @@
import java.io.IOException;
import java.io.PrintWriter;
-
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+
@WebServlet(urlPatterns={"/dispatchforward"}, asyncSupported=true)
public class DispatchForward extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
String forwardUrl = "/asyncdispatch";
String withargs = req.getParameter("withargs");
if (withargs != null) {
@@ -40,10 +40,10 @@
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
System.out.println("DF: forwarding " + forwardUrl);
req.getRequestDispatcher(forwardUrl).forward(req, res);
- } else {
+ } else {
System.out.println("DF: async dispatch type ...");
PrintWriter writer = res.getWriter();
writer.write("Hello from DispatchForward\n");
- }
- }
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
index 4daa3bb..f626feb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
@@ -18,28 +18,28 @@
import java.io.IOException;
import java.io.PrintWriter;
-
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+
@WebServlet(urlPatterns={"/dispatchforward0"}, asyncSupported=true)
public class DispatchForward0 extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
String forwardUrl = "/dispatchforward";
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
System.out.println("DF0: forwarding " + forwardUrl);
req.getRequestDispatcher(forwardUrl).forward(req, res);
- } else {
+ } else {
System.out.println("DF0: async dispatch type ...");
PrintWriter writer = res.getWriter();
writer.write("Hello from DispatchForward0\n");
- }
- }
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
index f7eead7..6dac6ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
@@ -18,27 +18,27 @@
import java.io.IOException;
import java.io.PrintWriter;
-
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+
@WebServlet(urlPatterns={"/nameddispatchforward0"}, asyncSupported=true)
public class NamedDispatchForward0 extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
String servletName = "test.DispatchForward";
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
System.out.println("DF0: named forwarding " + servletName);
getServletContext().getNamedDispatcher(servletName).forward(req, res);
- } else {
+ } else {
System.out.println("DF0: async dispatch type ...");
PrintWriter writer = res.getWriter();
writer.write("Hello from DispatchForward0\n");
- }
- }
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java
index 5b16dad..b76cf23 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Test for filter with empty url");
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
+ "/";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,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/web/servlet-3.0/filterWithEmptyUrl/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.properties
index 038748e..e83bc9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-filter-with-empty-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/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/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
index 863e187..c614495 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
index 347c16f..ffe115a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
@@ -29,7 +29,7 @@
*
* The main web.xml declares an absolute ordering of the two web fragments,
* with webFragment2 listed first, followed by webFragment1.
- *
+ *
* Either ServletContextListener checks for the presence and contents of the
* jakarta.servlet.context.orderedLibs ServletContext attribute and, if
* satisfied, registers a Servlet.
@@ -54,7 +54,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for " +
"jakarta.servlet.context.orderedLibs ServletContext attribute");
@@ -71,7 +71,7 @@
}
private void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot +
"/webFragment1Servlet";
HttpURLConnection conn = (HttpURLConnection)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties
index 22395a7..2ce772f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-javax-servlet-context-orderedLibs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml
index 5af256e..145109b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -68,23 +68,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -96,10 +96,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/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml
index 1680e0d..36350cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>webFragment1</name>
<listener>
<listener-class>webFragment1.WebFragmentServletContextListener</listener-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml
index a1458ab..8406907 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>webFragment2</name>
<listener>
<listener-class>webFragment2.WebFragmentServletContextListener</listener-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java
index 784450e..ad71b51 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java
@@ -24,11 +24,11 @@
* Test login change session id in Servlet 3.0
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.0-login-change-session-id";
private static final String JSESSIONID = "JSESSIONID";
private static final String EXPECTED_RESPONSE = "one";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -41,7 +41,7 @@
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
List<String> result = goGet(host, port, contextRoot + "/test?run=first",
null);
@@ -49,12 +49,12 @@
if (result.size() > 0) {
result2 = goGet(host, port, contextRoot + "/test?run=second",
result.get(0));
- }
-
+ }
+
stat.addStatus(TEST_NAME,
(result.size() > 1 && result2.size() > 1
&& !result.get(0).equals(result2.get(0))
- && EXPECTED_RESPONSE.equals(result2.get(1))) ?
+ && EXPECTED_RESPONSE.equals(result2.get(1))) ?
stat.PASS : stat.FAIL);
} catch (Throwable t) {
System.out.println(t.getMessage());
@@ -99,7 +99,7 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -138,5 +138,5 @@
return ret;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties
index 1580618..e6fea36 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-login-change-session-id"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml
index 9b455a0..f1086a9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml
@@ -62,7 +62,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -83,7 +83,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java
index 7596395..91e7afb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for login and logout");
@@ -50,7 +50,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -102,7 +102,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties
index abf1279..95b80c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-login-logout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml
index 8441852..e0362a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,10 +51,10 @@
</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
@@ -62,14 +62,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -84,7 +84,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml
index b231671..c169619 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml
@@ -19,7 +19,7 @@
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<security-role>
- <role-name>javaee</role-name>
+ <role-name>javaee</role-name>
</security-role>
<login-config>
<auth-method>BASIC</auth-method>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
index a4a0923..0daf0cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
@@ -42,6 +42,6 @@
b.append(req.isUserInRole("javaee") + "\n");
PrintWriter writer = res.getWriter();
writer.write(b.toString());
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java
index 4e55fad..276d968 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for multi web fragments");
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;
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
@@ -93,10 +93,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/web/servlet-3.0/multiWebFragments/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.properties
index 4907e63..99e1f99 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-multi-web-fragments"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml
index 7067a15..57d3cb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -63,23 +63,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest2"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
index d02ebdd..19d1787 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
index 2dbb989..ac9aee8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
index 5da6cf9..6d765ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
@@ -31,7 +31,7 @@
public class WFTestFilter3 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter3.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java
index 836efa5..380bf5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for multi web fragments resources");
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 + "/index.jsp";
System.out.println(url);
HttpURLConnection conn = (HttpURLConnection)
@@ -120,7 +120,7 @@
stat.addStatus(TEST_NAME,
((status1 && status2 && status3) ? stat.PASS : stat.FAIL));
- }
+ }
}
private Set<String> parseResult(String line, String prefix) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties
index b7d4f0d..ba5d605 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-multi-web-fragments-resources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml
index de83360..114850f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -62,7 +62,7 @@
includes="**/*.html"/>
<delete dir="${build.classes.dir}/META-INF"/>
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -70,14 +70,14 @@
<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}"/>
@@ -89,10 +89,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/web/servlet-3.0/multipart/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/WebTest.java
index b4dab55..9ee363d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -143,28 +143,28 @@
} finally {
try {
if (bis != null) {
- bis.close();
+ bis.close();
}
} catch(IOException ex) {
// ignore
}
try {
if (is != null) {
- is.close();
+ is.close();
}
} catch(IOException ex) {
// ignore
}
try {
if (os != null) {
- os.close();
+ os.close();
}
} catch(IOException ex) {
// ignore
}
try {
if (sock != null) {
- sock.close();
+ sock.close();
}
} catch(IOException ex) {
// ignore
@@ -175,7 +175,7 @@
static String[][] expected = {
{"1234567abcdefg"},
{"myFile", "36", "text/plain", "content-disposition content-type" },
- {"myFile2", "13812", "application/x-java-archive",
+ {"myFile2", "13812", "application/x-java-archive",
"content-disposition content-type" },
{"xyz", "14", "text/plain", "content-disposition content-type"}
};
@@ -185,5 +185,5 @@
return 0;
return 1;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties
index 12ff3c0..10e9d18 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-servlet-3.0-multipart"/>
+<property name="appname" value="${module}-servlet-3.0-multipart"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml
index fcd7781..a44c918 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -59,7 +59,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
debug="true"
@@ -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/web/servlet-3.0/multipart/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/descriptor/web.xml
index 0a3a39f..a3c578b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/descriptor/web.xml
@@ -28,7 +28,7 @@
<max-file-size>20000</max-file-size>
</multipart-config>
-->
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
index 4562bb7..a4c8b5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
@@ -27,7 +27,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@@ -35,7 +35,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java
index b61fc04..b599b32 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR: 7014654: Possible Duplicate session cookie when the session cookie name is configured.");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties
index 4fbf8d6..1eb93cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-non-duplicate-session-cookie-with-custom-cookie-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java
index 74ed5b4..d29f16c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for relative-ordering-web-fragments");
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 + "/";
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
@@ -93,10 +93,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/web/servlet-3.0/relativeOrderingWebFragments/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.properties
index 34104c5..6d147ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-relative-ordering-web-fragments"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml
index aebe021..3a2d5c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -85,23 +85,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -113,10 +113,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/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml
index f6d35e0..e972f16 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>A</name>
<ordering>
<before><name>NoSuchName</name><others/></before>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml
index abb30dd..4fda1fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>B</name>
<ordering>
<after><others/></after>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml
index 2158ed0..e0d2cf7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>C</name>
<ordering>
<before><name>A</name><name>B</name></before>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml
index b50a0d6..e95a940 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>D</name>
<ordering>
<after><name>C</name></after>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
index 3ab24b9..a5a1e90 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
index 771d8d1..376a2d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
index e2ee839..e065a23 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
@@ -31,7 +31,7 @@
public class WFTestFilter3 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter3.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
index 4ae2928..4cc6bfb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
@@ -31,7 +31,7 @@
public class WFTestFilter4 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter4.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
index 4535829..3d3020c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
@@ -31,7 +31,7 @@
public class WFTestFilter5 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter5.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java
index 328f355..8a2522c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource URL from JAR inside WEB-INF/lib");
new WebTest(args).doTest();
@@ -60,7 +60,7 @@
}
public void doTest() {
- try {
+ try {
invokeTestServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties
index e6607db..8e1a922 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-resource-url-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml
index 411df8c..d8b6995 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml
@@ -38,7 +38,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -54,21 +54,21 @@
includes="META-INF/**"/>
<delete dir="${build.classes.dir}/META-INF/resources"/>
- <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}"/>
@@ -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/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java
index 98b33ca..aaf2c4b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for serving JSP and static " +
"resources from JAR inside WEB-INF/lib");
@@ -62,7 +62,7 @@
}
public void doTest() {
- try {
+ try {
invokeJspServlet();
invokeDefaultServlet("/abc.txt", 200, EXPECTED_RESPONSE);
invokeDefaultServlet("/folder", new int[] { 301, 302 }, contextRoot + "/folder/");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties
index c6c7e51..cd754a1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-serve-jsp-and-static-resource-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml
index 2ad5749..41feb52 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml
@@ -38,7 +38,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,21 +56,21 @@
includes="META-INF/**"/>
<delete dir="${build.classes.dir}/META-INF/resources"/>
- <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}"/>
@@ -82,10 +82,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/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java
index 9292bc4..4017195 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for
+ * Unit test for
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=10992
* ("Unable to deploy JSF2 backing bean B 72, works in B71")
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 10992");
@@ -54,10 +54,10 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
- public void doTest() throws Exception {
+ public void doTest() throws Exception {
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/index.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties
index 054f9a5..48c9fb7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-jsf-managed-bean-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml
index 34b4cb3..b6e16a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,14 +56,14 @@
<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/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java
index d970d4d..ed4d6d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java
@@ -39,18 +39,18 @@
contextRoot = args[2];
testNumber = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for pluggability of sharedlib in EAR");
WebTest webTest = new WebTest(args);
- if("1".equals(args[3])) {
+ if("1".equals(args[3])) {
webTest.doTest("/mytest1");
stat.printSummary(TEST_NAME);
- }
+ }
}
public void doTest(String root) {
- try {
+ try {
invoke(root);
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke(String root) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ root;
System.out.println("Invoking " + url);
@@ -99,10 +99,10 @@
System.out.println("RESPONSE : " + line);
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE[(new Integer(testNumber)).intValue()] + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
index 5165f41..359a803 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
@@ -23,10 +23,10 @@
@HandlesTypes(WebServlet.class)
public class ServContInit implements ServletContainerInitializer {
public ServContInit() {
- System.out.println("TEST APP LIB CONST");
+ System.out.println("TEST APP LIB CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- System.out.println("TEST APP LIB onStartup");
- ctx.setAttribute("APPLIB-1", "CALLED EARAPPLIB-1");
+ System.out.println("TEST APP LIB onStartup");
+ ctx.setAttribute("APPLIB-1", "CALLED EARAPPLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties
index d21bf44..ed649b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-pluggability-sharedlib-ear"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml
index 0421ec2..60251fa 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml
@@ -38,40 +38,40 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="clean-lib" depends="init-common">
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
<antcall target="startDomain"/>
</target>
<target name="init-sharedlib" depends="init-common">
<antcall target="stopDomain"/>
- <javac srcdir="./sharedlib1"
- destdir="./sharedlib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
- <fileset dir="./sharedlib1"/>
- </jar>
- <javac srcdir="./sharedlib2"
- destdir="./sharedlib2"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
- <fileset dir="./sharedlib2"/>
- </jar>
- <javac srcdir="./sharedlib3"
- destdir="./sharedlib3"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
- <fileset dir="./sharedlib3"/>
- </jar>
+ <javac srcdir="./sharedlib1"
+ destdir="./sharedlib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
+ <fileset dir="./sharedlib1"/>
+ </jar>
+ <javac srcdir="./sharedlib2"
+ destdir="./sharedlib2"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
+ <fileset dir="./sharedlib2"/>
+ </jar>
+ <javac srcdir="./sharedlib3"
+ destdir="./sharedlib3"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
+ <fileset dir="./sharedlib3"/>
+ </jar>
<sleep seconds="15" />
<antcall target="startDomain"/>
</target>
@@ -83,27 +83,27 @@
</target>
<target name="build" depends="compile">
- <javac srcdir="./applib1"
- destdir="./applib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
+ <javac srcdir="./applib1"
+ destdir="./applib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
<mkdir dir="lib"/>
- <jar destfile="lib/AppSharedLib1.jar">
- <fileset dir="./applib1"/>
- </jar>
+ <jar destfile="lib/AppSharedLib1.jar">
+ <fileset dir="./applib1"/>
+ </jar>
<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>
- <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <jar destfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${env.APS_HOME}/build/module/archive"/>
- </jar>
+ <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <jar destfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${env.APS_HOME}/build/module/archive"/>
+ </jar>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<java classname="WebTest">
@@ -117,12 +117,12 @@
</classpath>
</java>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
index 86a4250..c664bcc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr);
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr);
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index a39597d..c51cfe1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebServlet.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
public SharedLib1ServContInit() {
- System.out.println("SHARED LIB 1 CONST");
+ System.out.println("SHARED LIB 1 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-1", "CALLED EARSHAREDLIB-1");
+ ctx.setAttribute("SHAREDLIB-1", "CALLED EARSHAREDLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
index 275c90a..63d2833 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
@@ -22,9 +22,9 @@
public class SharedLib2ServContInit implements ServletContainerInitializer {
public SharedLib2ServContInit() {
- System.out.println("SHARED LIB 2 CONST");
+ System.out.println("SHARED LIB 2 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-2", "CALLED EARSHAREDLIB-2");
+ ctx.setAttribute("SHAREDLIB-2", "CALLED EARSHAREDLIB-2");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
index 1d863d1..414a62b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebFilter.class)
public class SharedLib3ServContInit implements ServletContainerInitializer {
public SharedLib3ServContInit() {
- System.out.println("SHARED LIB 3 CONST");
+ System.out.println("SHARED LIB 3 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-3", "CALLED EARSHAREDLIB-3");
+ ctx.setAttribute("SHAREDLIB-3", "CALLED EARSHAREDLIB-3");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java
index c4b9a4e..ad0c05d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for pluggability of sharedlib with interrace implementation and extensions");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest(String root) {
- try {
+ try {
invoke(root);
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -57,7 +57,7 @@
}
private void invoke(String root) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ root;
HttpURLConnection conn = (HttpURLConnection)
@@ -93,7 +93,7 @@
}
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties
index cc0b470..1cb9eda 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-pluggability-sharedlib-interfaceimpl"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml
index 8b90c7a..43acd46 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml
@@ -36,33 +36,33 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="clean-lib" depends="init-common">
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
- <delete dir="./lib"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
+ <delete dir="./lib"/>
<antcall target="startDomain"/>
</target>
<target name="init-sharedlib" depends="init-common">
<antcall target="stopDomain"/>
<mkdir dir="lib"/>
- <javac srcdir="./interface"
- destdir="./interface"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="lib/CommonInterface.jar">
- <fileset dir="./interface"/>
- </jar>
- <javac srcdir="./sharedlib1"
- destdir="./sharedlib1"
- classpath="${s1astest.classpath};./interface"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
- <fileset dir="./sharedlib1"/>
- <fileset dir="./interface"/>
- </jar>
+ <javac srcdir="./interface"
+ destdir="./interface"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="lib/CommonInterface.jar">
+ <fileset dir="./interface"/>
+ </jar>
+ <javac srcdir="./sharedlib1"
+ destdir="./sharedlib1"
+ classpath="${s1astest.classpath};./interface"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
+ <fileset dir="./sharedlib1"/>
+ <fileset dir="./interface"/>
+ </jar>
<sleep seconds="15" />
<antcall target="startDomain"/>
</target>
@@ -79,16 +79,16 @@
<target name="build" depends="compile">
<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>
- <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <jar destfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${env.APS_HOME}/build/module/archive"/>
- </jar>
+ <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <jar destfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${env.APS_HOME}/build/module/archive"/>
+ </jar>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<java classname="WebTest">
@@ -101,12 +101,12 @@
</classpath>
</java>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java
index 3f25247..a8a9639 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java
@@ -17,5 +17,5 @@
package com.sun.devtests.web.common;
public interface CommonInterface {
- public String sayDummyIntfHello();
+ public String sayDummyIntfHello();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java
index cee2a68..27da794 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java
@@ -19,7 +19,7 @@
import com.sun.devtests.web.common.CommonInterface;
public class CommonInterfaceImpl implements CommonInterface {
- public String sayDummyIntfHello() {
+ public String sayDummyIntfHello() {
return "HEELLLLOOOO";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java
index b591cc6..cfdbb1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java
@@ -19,7 +19,7 @@
import com.sun.devtests.web.common.CommonInterface;
public class AnotherCommonInterfaceImpl implements CommonInterface {
- public String sayDummyIntfHello() {
+ public String sayDummyIntfHello() {
return "HEELLLLOOOO";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java
index 8e305f8..8c1666d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java
@@ -19,7 +19,7 @@
import com.sun.devtests.web.common.CommonInterfaceImpl;
public class CommonInterfaceImplExtn extends CommonInterfaceImpl {
- public String myOwnMethod() {
+ public String myOwnMethod() {
return "HEELLLLOOOO";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
index 74eea7d..b5f32f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr +";");
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index 30d4787..d7b19da 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -24,9 +24,9 @@
@HandlesTypes(CommonInterface.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
public SharedLib1ServContInit() {
- System.out.println("SHARED LIB 1 CONST");
+ System.out.println("SHARED LIB 1 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-1", c.size()+"CALLED INTFIMPL-SHAREDLIB-1");
+ ctx.setAttribute("SHAREDLIB-1", c.size()+"CALLED INTFIMPL-SHAREDLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java
index 040737e..61bce39 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java
@@ -39,22 +39,22 @@
contextRoot = args[2];
testNumber = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for pluggable shared libraries in WAR");
WebTest webTest = new WebTest(args);
- if("1".equals(args[3])) {
+ if("1".equals(args[3])) {
webTest.doTest("/mytest1");
stat.printSummary(TEST_NAME);
- }
- if("2".equals(args[3])) {
+ }
+ if("2".equals(args[3])) {
webTest.doTest("/mytest2");
stat.printSummary(TEST_NAME);
- }
+ }
}
public void doTest(String root) {
- try {
+ try {
invoke(root);
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -64,7 +64,7 @@
}
private void invoke(String root) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ root;
System.out.println("Invoking " + url);
@@ -103,10 +103,10 @@
System.out.println("RESPONSE : " + line);
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE[(new Integer(testNumber)).intValue()] + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml
index 03dae39..75e4c01 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml
@@ -32,66 +32,66 @@
<target name="all" depends="init-sharedlib,build,run,undeploy,stopDomain,clean-lib"/>
<target name="clean" depends="init-common">
- <ant dir="webapp1" target="clean"/>
- <ant dir="webapp2" target="clean"/>
+ <ant dir="webapp1" target="clean"/>
+ <ant dir="webapp2" target="clean"/>
<antcall target="clean-common"/>
<delete>
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="clean-lib" depends="init-common">
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib4.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib4.jar"/>
<antcall target="startDomain"/>
</target>
<target name="init-sharedlib" depends="init-common">
<antcall target="stopDomain"/>
- <javac srcdir="./sharedlib1"
- destdir="./sharedlib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
- <fileset dir="./sharedlib1"/>
- </jar>
- <javac srcdir="./sharedlib2"
- destdir="./sharedlib2"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
- <fileset dir="./sharedlib2"/>
- </jar>
- <javac srcdir="./sharedlib3"
- destdir="./sharedlib3"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
- <fileset dir="./sharedlib3"/>
- </jar>
- <javac srcdir="./sharedlib4"
- destdir="./sharedlib4"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib4.jar">
- <fileset dir="./sharedlib4"/>
- </jar>
+ <javac srcdir="./sharedlib1"
+ destdir="./sharedlib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
+ <fileset dir="./sharedlib1"/>
+ </jar>
+ <javac srcdir="./sharedlib2"
+ destdir="./sharedlib2"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
+ <fileset dir="./sharedlib2"/>
+ </jar>
+ <javac srcdir="./sharedlib3"
+ destdir="./sharedlib3"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
+ <fileset dir="./sharedlib3"/>
+ </jar>
+ <javac srcdir="./sharedlib4"
+ destdir="./sharedlib4"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib4.jar">
+ <fileset dir="./sharedlib4"/>
+ </jar>
<sleep seconds="15" />
<antcall target="startDomain"/>
</target>
<target name="build">
- <ant dir="webapp1" target="deploy"/>
- <ant dir="webapp2" target="deploy"/>
+ <ant dir="webapp1" target="deploy"/>
+ <ant dir="webapp2" target="deploy"/>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<java classname="WebTest">
@@ -115,10 +115,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- <ant dir="webapp1" target="undeploy"/>
- <ant dir="webapp2" target="undeploy"/>
- </target>
+ <ant dir="webapp1" target="undeploy"/>
+ <ant dir="webapp2" target="undeploy"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index 0fc60c9..55181d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebServlet.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
public SharedLib1ServContInit() {
- System.out.println("SHARED LIB 1 CONST");
+ System.out.println("SHARED LIB 1 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-1", "CALLED SHAREDLIB-1");
+ ctx.setAttribute("SHAREDLIB-1", "CALLED SHAREDLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
index 9157c83..db2b894 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
@@ -22,9 +22,9 @@
public class SharedLib2ServContInit implements ServletContainerInitializer {
public SharedLib2ServContInit() {
- System.out.println("SHARED LIB 2 CONST");
+ System.out.println("SHARED LIB 2 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-2", "CALLED SHAREDLIB-2");
+ ctx.setAttribute("SHAREDLIB-2", "CALLED SHAREDLIB-2");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
index e3a4541..c52e3ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebFilter.class)
public class SharedLib3ServContInit implements ServletContainerInitializer {
public SharedLib3ServContInit() {
- System.out.println("SHARED LIB 3 CONST");
+ System.out.println("SHARED LIB 3 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-3", "CALLED SHAREDLIB-3");
+ ctx.setAttribute("SHAREDLIB-3", "CALLED SHAREDLIB-3");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
index a3523f5..f1f3322 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(jakarta.jws.WebService.class)
public class SharedLib4ServContInit implements ServletContainerInitializer {
public SharedLib4ServContInit() {
- System.out.println("SHARED LIB 4 CONST");
+ System.out.println("SHARED LIB 4 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-4", "CALLED SHAREDLIB-4");
+ ctx.setAttribute("SHAREDLIB-4", "CALLED SHAREDLIB-4");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
index 783e1a1..0c4335e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
@@ -23,10 +23,10 @@
@HandlesTypes(WebServlet.class)
public class ServContInit implements ServletContainerInitializer {
public ServContInit() {
- System.out.println("TEST APP LIB CONST");
+ System.out.println("TEST APP LIB CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- System.out.println("TEST APP LIB onStartup");
- ctx.setAttribute("APPLIB-1", "CALLED APPLIB-1");
+ System.out.println("TEST APP LIB onStartup");
+ ctx.setAttribute("APPLIB-1", "CALLED APPLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties
index 24f30ee..d0e5ac2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-pluggability-1"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml
index d5a4a37..0672167 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,30 +45,30 @@
</target>
<target name="build" depends="compile">
- <javac srcdir="./applib1"
- destdir="./applib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
+ <javac srcdir="./applib1"
+ destdir="./applib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
<mkdir dir="lib"/>
- <jar destfile="lib/AppSharedLib1.jar">
- <fileset dir="./applib1"/>
- </jar>
- <property name="hasWebclient" value="yes"/>
+ <jar destfile="lib/AppSharedLib1.jar">
+ <fileset dir="./applib1"/>
+ </jar>
+ <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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="build">
<antcall target="deploy-war-common"/>
<antcall target="clean"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
index 591a548..0429b3b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr);
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr);
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
index 4beae3e..0d90ca6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebFilter.class)
public class ServCont2Init implements ServletContainerInitializer {
public ServCont2Init() {
- System.out.println("APP LIB 2 CONST");
+ System.out.println("APP LIB 2 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("APPLIB-2", "CALLED APPLIB-2");
+ ctx.setAttribute("APPLIB-2", "CALLED APPLIB-2");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties
index 719f4c9..8e68af3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-pluggability-2"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml
index 20102b4..911a109 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,30 +45,30 @@
</target>
<target name="build" depends="compile">
- <javac srcdir="./applib2"
- destdir="./applib2"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
+ <javac srcdir="./applib2"
+ destdir="./applib2"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
<mkdir dir="lib"/>
- <jar destfile="lib/AppSharedLib2.jar">
- <fileset dir="./applib2"/>
- </jar>
- <property name="hasWebclient" value="yes"/>
+ <jar destfile="lib/AppSharedLib2.jar">
+ <fileset dir="./applib2"/>
+ </jar>
+ <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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="build">
<antcall target="deploy-war-common"/>
<antcall target="clean"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
index fbd7903..93f2d52 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr);
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr);
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
index b4e473f..513ef03 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java
index 60a2294..19dd8fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 8565");
@@ -71,7 +71,7 @@
}
private void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/test";
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties
index 7545b68..119147f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-container-initializer-add-restricted-servlet-context-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml
index abf4a58..8c6a037 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -66,19 +66,19 @@
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -90,10 +90,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/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java
index 9f2174b..36da2d6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addListener");
@@ -55,7 +55,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties
index bb0b5c9..642b3f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-add-listener-by-class-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml
index 48e0a0a..e9b7607 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java
index 68ab862..ed9a6f7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addServlet and " +
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties
index bd52fdf..d839433 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-add-servlet-and-filter-by-class"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
index cf19216..445f56f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
@@ -67,6 +67,6 @@
"test.NewFilter"));
fr.setInitParameter("filterInitParamName", "filterInitParamValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java
index 4c527c1..dfadeba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addServlet and " +
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties
index 0722d33..827c94f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-add-servlet-and-filter-by-class-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
index fe890bd..6396185 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
@@ -44,7 +44,7 @@
FilterRegistration fr = sc.addFilter("NewFilter", "test.NewFilter");
fr.setInitParameter("filterInitName", "filterInitValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java
index 909f76d..bd12d90 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addServlet and " +
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties
index fe2f4fe..46dd8ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-add-servlet-and-filter-by-instance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
index daed16f..d0e7bd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
@@ -87,7 +87,7 @@
FilterRegistration fr = sc.addFilter("NewFilter", filter);
fr.setInitParameter("filterInitParamName", "filterInitParamValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
/*
* Make sure that if we register a different filter instance
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java
index 432aea0..b122b5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 9181");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties
index 9e80779..b66bb64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-add-servlet-override-default-and-jsp-servlet-mappings"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java
index dbab589..832a650 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 9199");
@@ -56,7 +56,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties
index 82f0bdb..54c714f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-complete-preliminary-filter-registration"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
index c79c625..75a21fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
@@ -34,7 +34,7 @@
ServletContext sc = sce.getServletContext();
FilterRegistration frPrelim = sc.getFilterRegistration("MyFilter");
if (frPrelim == null) {
- throw new RuntimeException("Missing FilterRegistration for " +
+ throw new RuntimeException("Missing FilterRegistration for " +
"MyFilter");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java
index 1a2b71f..6c5fd42 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 9199");
@@ -56,7 +56,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties
index f1429b2..fdb7f1a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-complete-preliminary-servlet-registration"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
index 9dcb272..70ec642 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
@@ -34,7 +34,7 @@
ServletContext sc = sce.getServletContext();
ServletRegistration srPrelim = sc.getServletRegistration("MyServlet");
if (srPrelim == null) {
- throw new RuntimeException("Missing ServletRegistration for " +
+ throw new RuntimeException("Missing ServletRegistration for " +
"MyServlet");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java
index 4799283..500a9eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for ServletContext#create[Servlet|Filter]");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties
index 424e977..5ad6fd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-create-servlet-and-filter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml
index 04999ca..c1b962d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
index c885d23..1f7ed6b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
@@ -72,6 +72,6 @@
FilterRegistration fr = sc.addFilter("NewFilter", filter);
fr.setInitParameter("filterInitParamName", "filterInitParamValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
index 6aa405f..8d4607e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
@@ -51,7 +51,7 @@
initParamValue = config.getInitParameter("filterInitParamName");
ServletContext sc = config.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
sc.log("ds1-login-timeout=" + loginTimeout);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java
index 51fa794..efa01f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for setServletSecurity");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public boolean run() throws Exception {
@@ -74,7 +74,7 @@
}
private boolean doWebMethod(String webMethod, String host, int port,
- String contextPath, boolean requireAuthenticate,
+ String contextPath, boolean requireAuthenticate,
int responseCode, String expected) throws Exception {
String urlStr = "http://" + host + ":" + port + contextPath;
@@ -104,7 +104,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties
index e2aaa4e..6c794e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-create-servlet-with-servlet-security"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml
index 486d888..0b75244 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java
index 979a5be..ad78203 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for ServletContext#getRealPath, where the requested
+ * Unit test for ServletContext#getRealPath, where the requested
* resource is stored in the META-INF/resources directory of the
* application's bundled WEB-INF/lib/nested.jar.
*/
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#getRealPath");
new WebTest(args).doTest();
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties
index 7d7bc18..4e3c58f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-get-real-path-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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}"/>
@@ -68,10 +68,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/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
index 3ae8453..e9e7a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
@@ -23,7 +23,7 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String path = getServletContext().getRealPath("/abc.txt");
- if (path == null ||
+ if (path == null ||
path.indexOf("/META-INF/resources") == -1) {
throw new ServletException("Wrong resource path");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java
index ec7f2b4..0838fcc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#getResource");
new WebTest(args).doTest();
@@ -53,7 +53,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties
index 229c25d..031f7cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-get-resource-in-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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}"/>
@@ -68,10 +68,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/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java
index 0f9260e..1ef6a76 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#getResourcePaths");
new WebTest(args).doTest();
@@ -48,7 +48,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties
index a391e86..b6e13bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-get-resource-paths-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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}"/>
@@ -68,10 +68,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/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
index 9af101b..41eb108 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
@@ -31,7 +31,7 @@
if (resPaths == null) {
throw new ServletException("No resource paths");
}
-
+
if (!resPaths.contains(CATALOG_OFFERS)) {
throw new ServletException(CATALOG_OFFERS +
" missing from resource paths");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java
index 25206c7..df76792 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#setInitParameter");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties
index 76235d4..ba08630 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-context-set-init-parameter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
index dc11f03..bc516b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
@@ -27,7 +27,7 @@
* @param sce The servlet context event
*/
public void contextInitialized(ServletContextEvent sce) {
- sce.getServletContext().setInitParameter("aaa", "bbb");
+ sce.getServletContext().setInitParameter("aaa", "bbb");
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java
index ea51b73..1f113e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for empty string URL pattern");
@@ -61,7 +61,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String expectedResponse) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties
index 4302d1d..63c45be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-mapping-empty-string"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servlet-3.0/servletRequestDispatcherType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/WebTest.java
index ca96068..57b60f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletRequest#getDispatcherType");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties
index 747ed18..fdb9c4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-request-dispatcher-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java
index aeea105..04be264 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6057385");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties
index d40e5cf..7a8afdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-request-listener-invocation-order"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml
index dbf8002..f1a6574 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml
index f763631..7e8ff18 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml
@@ -34,7 +34,7 @@
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java
index 52f12ca..37f24aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Servlet[Request|Response]Wrapper#isWrapperFor");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties
index c544522..431066c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-request-response-wrapper-is-wrapper-for"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
index 6b8edf4..8b10268 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
@@ -28,7 +28,7 @@
ServletRequestWrapper reqWrapper1 = new SubFirstLevelRequestWrapper(req);
ServletRequestWrapper reqWrapper2 = new SecondLevelRequestWrapper(reqWrapper1);
ServletRequestWrapper reqWrapper3 = new ThirdLevelRequestWrapper(reqWrapper2);
-
+
if (!reqWrapper3.isWrapperFor(reqWrapper1) ||
!reqWrapper3.isWrapperFor(FirstLevelRequestWrapper.class)) {
throw new ServletException("Unexpected result");
@@ -44,7 +44,7 @@
ServletResponseWrapper resWrapper1 = new SubFirstLevelResponseWrapper(res);
ServletResponseWrapper resWrapper2 = new SecondLevelResponseWrapper(resWrapper1);
ServletResponseWrapper resWrapper3 = new ThirdLevelResponseWrapper(resWrapper2);
-
+
if (!resWrapper3.isWrapperFor(resWrapper1) ||
!resWrapper3.isWrapperFor(FirstLevelResponseWrapper.class)) {
throw new ServletException("Unexpected result");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java
index aac7052..b04d372 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * This unit test expects the following Set-Cookie response header, based on
+ * This unit test expects the following Set-Cookie response header, based on
* the cookie-properties specified using ServletContext.setSessionCookieConfig
*
* Set-Cookie: JSESSIONID=[...]; Domain=.iplanet.com; Path=/
@@ -64,7 +64,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext SessionCookieConfig");
WebTest webTest = new WebTest(args);
@@ -100,7 +100,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
- } else {
+ } else {
System.err.println("Missing cookie domain");
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
@@ -115,7 +115,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
- } else {
+ } else {
System.err.println("Missing cookie path");
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
@@ -130,7 +130,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
- } else {
+ } else {
System.err.println("Missing cookie comment");
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
@@ -157,7 +157,7 @@
}
return;
-
+
}
private String getCookieField(String cookie, String field) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.properties
index a73f932..e8b7154 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/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="web"/>
-<property name="appname" value="${module}-servlet-3.0-session-cookie-config"/>
+<property name="appname" value="${module}-servlet-3.0-session-cookie-config"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
index d868fa1..ea0de12 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java
index 58d118d..1548ebc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing complete list of " +
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties
index 956dec3..5f58100 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-cookie-config-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
index 67b4f0c..a0fe69c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
@@ -40,32 +40,32 @@
// comment
if (sessionCookie.indexOf("Comment=myComment") == -1) {
throw new ServletException("Missing cookie comment");
- }
+ }
// domain
if (sessionCookie.indexOf("Domain=mydomain") == -1) {
throw new ServletException("Missing cookie domain");
- }
+ }
// path
if (sessionCookie.indexOf("Path=/myPath") == -1) {
throw new ServletException("Missing cookie path");
- }
+ }
// secure
if (sessionCookie.indexOf("Secure") == -1) {
throw new ServletException("Missing Secure attribute");
- }
+ }
// http-only
if (sessionCookie.indexOf("HttpOnly") == -1) {
throw new ServletException("Missing HttpOnly attribute");
- }
+ }
// max-age
if (sessionCookie.indexOf("Max-Age=123") == -1) {
throw new ServletException("Missing max-age");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java
index c70ce2d..77c8ed2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing complete list of " +
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties
index fd7c4b1..ddbe012 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-cookie-config-programmatic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
index de51e35..81d5d65 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
@@ -40,31 +40,31 @@
// comment
if (sessionCookie.indexOf("Comment=myComment") == -1) {
throw new ServletException("Missing cookie comment");
- }
+ }
// domain
if (sessionCookie.indexOf("Domain=mydomain") == -1) {
throw new ServletException("Missing cookie domain");
- }
+ }
// path
if (sessionCookie.indexOf("Path=/myPath") == -1) {
throw new ServletException("Missing cookie path");
- }
+ }
// secure
if (sessionCookie.indexOf("Secure") == -1) {
throw new ServletException("Missing Secure attribute");
- }
+ }
// http-only
if (sessionCookie.indexOf("HttpOnly") == -1) {
throw new ServletException("Missing HttpOnly attribute");
- }
+ }
// max-age
if (sessionCookie.indexOf("Max-Age=123") == -1) {
throw new ServletException("Missing max-age");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java
index 947897e..115adda 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing name of session " +
@@ -58,7 +58,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String firstRun() throws Exception {
@@ -76,7 +76,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
// Get the MYJSESSIONID from the response
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -145,7 +145,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties
index b7dd641..370c533 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-cookie-custom-name-programmatic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml
index 73af7f8..9fa6aae 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml
@@ -46,5 +46,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java
index 2463901..b4cf2f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing name of session " +
@@ -62,7 +62,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String firstRun() throws Exception {
@@ -80,7 +80,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
// Get the MYJSESSIONID from the response
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -149,7 +149,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties
index 93b2375..56fc865 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-cookie-custom-name-sun-web-xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml
index 6f11a4a..89e7a5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml
@@ -42,5 +42,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java
index 12d17da..c918263 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing name of session " +
@@ -58,7 +58,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String firstRun() throws Exception {
@@ -76,7 +76,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
// Get the MYJSESSIONID from the response
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -121,7 +121,7 @@
if (line == null) {
throw new Exception("Missing Set-Cookie response header");
}
-
+
if (!line.contains("HttpOnly")) {
throw new Exception("Missing HttpOnly in cookie header");
}
@@ -149,7 +149,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties
index 93b2375..56fc865 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-cookie-custom-name-sun-web-xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml
index e4885d9..16dd90a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml
@@ -38,7 +38,7 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
<session-config>
<cookie-config>
<name>ABC</name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java
index 3196c54..d9cac2f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with session id");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -104,7 +104,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties
index 3ec0ff5..ea4bf15 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-id-url-rewrite-session-tracking-mode"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java
index c8553a5..7d08e14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with custom cookie name");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -108,7 +108,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties
index 29b5486..1867928 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-id-url-rewrite-session-tracking-mode-custom-cookie-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
index 7fa0d6c..e2d6819 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for URL session tracking mode configured via web.xml");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -104,7 +104,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
index e37ce8f..64c343f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-session-id-url-rewrite-session-tracking-mode-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
index f826b5e..2067d88 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,22 +42,22 @@
</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}"/>
@@ -69,10 +69,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/web/servlet-3.0/transportProtectedAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/WebTest.java
index 3c0afb1..599fad5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "servlet-3.0-transportProtectedAnnotation";
-
+
public static void main(String args[]) throws Exception{
String host = args[0];
String httpPort = args[1];
@@ -48,7 +48,7 @@
null, true, "mfr:Hello:javaee:false");
ok = ok && testURL("GET", "https://" + host + ":" + httpsPort + "/" + contextRoot + "/myurl3",
ssf, true, "g:Hello:javaee:true");
-
+
ok = ok && testURL("TRACE", "http://" + host + ":" + httpPort + "/" + contextRoot + "/myurl3",
null, true, "t:Hello:javaee:false");
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
@@ -96,7 +96,7 @@
return true;
}
});
-
+
connection = conn;
} else {
connection = (HttpURLConnection) url.openConnection();
@@ -113,7 +113,7 @@
throws Exception{
int responseCode = connection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
return (connection.getResponseCode() == 200);
}
@@ -125,7 +125,7 @@
try {
in = new BufferedReader(
new InputStreamReader(connection.getInputStream()));
-
+
String line = "";
while ((line = in.readLine()) != null) {
System.out.println(line);
@@ -138,7 +138,7 @@
try {
if (in != null) {
in.close();
- }
+ }
} catch(IOException ioe) {
// ignore
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties
index ff1a9fe..34869b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-transport-protected-annotation"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/transport-protected-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml
index 86cafd4..c165c74 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,7 +55,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -71,13 +71,13 @@
</antcall>
</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,prepare-keystore-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="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java
index b088170..d2e0821 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebFilter");
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
+ "/mytest";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,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/web/servlet-3.0/webFilterAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.properties
index d07c887..2634033 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-filter-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/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/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
index 642c75d..045f131 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
index 45dc3c2..2042594 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter2.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java
index 3374e41..467f813 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web fragment");
WebTest webTest = new WebTest(args);
@@ -110,7 +110,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties
index 99c3c59..2876c2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-fragment"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -86,10 +86,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/web/servlet-3.0/webFragment/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/descriptor/web-fragment.xml
index 1eba1c7..742ebdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/descriptor/web-fragment.xml
@@ -20,7 +20,7 @@
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<display-name>wftest</display-name>
<distributable></distributable>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
index 9bd6c72..b8aa488 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java
index f5f97a9..3ef36b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web fragment with ejb lite");
WebTest webTest = new WebTest(args);
@@ -98,7 +98,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties
index 723859a..02537cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-fragment-with-ejb-lite"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -86,10 +86,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/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
index ffd0eb1..8666974 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
@@ -20,7 +20,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -57,23 +57,23 @@
OutputStream os = null;
InputStream is = null;
BufferedReader br = null;
-
+
String get = "GET " + contextRoot + urlPattern + " HTTP/1.0\r\n" + "Connection: keep-alive\r\n";
System.out.println(get);
-
+
try {
sock = new Socket(host, port);
os = sock.getOutputStream();
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
int i = 0;
String line = null;
String viewId = null;
String sessionId = null;
-
+
//get session id and JSF view id
while ((line = br.readLine()) != null) {
if(line.startsWith("Set-Cookie")) {
@@ -86,7 +86,7 @@
break;
}
}
-
+
// Write header for the uploaded text file
ByteArrayOutputStream ba = new ByteArrayOutputStream();
ba.write("--AaB03x\r\n".getBytes());
@@ -95,14 +95,14 @@
ba.write("--AaB03x\r\n".getBytes());
ba.write("Content-Disposition: form-data; name=\"form:file\"; filename=\"test.txt\"\r\n".getBytes());
ba.write("Content-Type: application/octet-stream\r\n\r\n".getBytes());
-
+
// Write content of the uploaded text file
is = new FileInputStream (dir + "test.txt");
int c;
while ((c = is.read()) != -1) {
ba.write(c);
}
-
+
ba.write("\r\n--AaB03x\r\n".getBytes());
ba.write("Content-Disposition: form-data; name=\"form:j_idt4\"\r\n\r\n".getBytes());
ba.write("upload\r\n".getBytes());
@@ -115,7 +115,7 @@
ba.write("--AaB03x--\r\n".getBytes());
byte[] data = ba.toByteArray();
System.out.println(ba.toString());
-
+
// Compose the post request header
StringBuilder postHeader = new StringBuilder();
postHeader.append("POST " + contextRoot + urlPattern + " HTTP/1.1\r\n");
@@ -125,17 +125,17 @@
postHeader.append("Content-Length: " + data.length + "\r\n");
postHeader.append("Cookie: JSESSIONID=" + sessionId + "\r\n\r\n");
System.out.println(postHeader);
-
+
os.write(postHeader.toString().getBytes());
os.write(data);
-
+
while ((line = br.readLine()) != null) {
if (line.contains(EXPECTED_RESPONSE)) {
stat.addStatus(TEST_NAME, stat.PASS);
return;
}
}
-
+
System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -163,12 +163,12 @@
}
try {
if (sock != null) {
- sock.close();
+ sock.close();
}
} catch(IOException ex) {
// ignore
}
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties
index d6c1c41..55be470 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-fragment-with-file-upload"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml
index 7df036f..cf2abec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -59,23 +59,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/fileupload"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -87,10 +87,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/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
index 7d8733d..5c65310 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
@@ -19,19 +19,19 @@
<web-fragment version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<display-name>File upload test</display-name>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <!-- Map these files with JSF -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.xhtml</url-pattern>
- </servlet-mapping>
-
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Map these files with JSF -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </servlet-mapping>
+
</web-fragment>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml
index c4e2cf3..f117477 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml
@@ -21,11 +21,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
-
+
<welcome-file-list>
<welcome-file>
single.xhtml
</welcome-file>
-
+
</welcome-file-list>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java
index c8bd368..5b48bc6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java
@@ -50,7 +50,7 @@
expected = "success with " + adminUser;
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web-fragment with login-config");
@@ -64,7 +64,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -91,7 +91,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -139,7 +139,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -185,7 +185,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties
index 9dd0ebd..f8fbdfc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-fragment-with-login-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml
index 3374112..5d6dfdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -73,23 +73,23 @@
excludes="**/*.jsp"/>
<delete dir="${build.classes.dir}/META-INF"/>
- <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}"/>
@@ -103,10 +103,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml
index 43343a1..a4cb520 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml
@@ -23,12 +23,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java
index 2d28d79..7e7d676 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java
@@ -50,7 +50,7 @@
expected = "success with " + adminUser;
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web-fragment with login-config overrided by web.xml");
@@ -64,7 +64,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -91,7 +91,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -138,7 +138,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -184,7 +184,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties
index da250ac..5f066d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-fragment-with-login-config-overrided"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml
index 3374112..5d6dfdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -73,23 +73,23 @@
excludes="**/*.jsp"/>
<delete dir="${build.classes.dir}/META-INF"/>
- <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}"/>
@@ -103,10 +103,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml
index fe75cb6..52cceb0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml
@@ -23,12 +23,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java
index fc4d3df..4a57a35 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebContextListener");
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
+ "/mytest";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,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/web/servlet-3.0/webListenerAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.properties
index a29c5cb..f611da2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-web-listener-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/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/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
index 78205ce..be9d0dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
@@ -24,7 +24,7 @@
System.out.println(">>> contextInitialized");
ServletContext context = sce.getServletContext();
context.setAttribute("myattr", "myservletcontextlistener");
- }
+ }
public void contextDestroyed(ServletContextEvent sce) {
System.out.println(">>> contextDestroyed");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java
index e6d55b4..7cc5971 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/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";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,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/web/servlet-3.0/webServletAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.properties
index 3daeeb5..1e70c35 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-servlet-3.0-web-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/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/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java
index ea592fc..81958a4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for xml override annotation");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
boolean ok = invoke("/mytest2", 200, EXPECTED_RESPONSE);
ok = ok && invoke("/mytest", 404, null);
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
@@ -59,7 +59,7 @@
private boolean invoke(String urlPattern,
int expectedCode, String expectedResponse) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ urlPattern;
System.out.println("Accessing " + url);
@@ -102,10 +102,10 @@
if (expectedResponse.equals(line)) {
return true;
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
return false;
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties
index b8684ba..9f0a54d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-xml-override-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/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/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
index ccb5be0..fa94d5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
@@ -32,7 +32,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
index 46b0a28..33b6ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java
index 69ea5fd..d4b4590 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 9816");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
boolean ok = invoke("/mytest2", 200, EXPECTED_RESPONSE);
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
} catch (Exception ex) {
@@ -58,7 +58,7 @@
private boolean invoke(String urlPattern,
int expectedCode, String expectedResponse) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ urlPattern;
System.out.println("Accessing " + url);
@@ -101,10 +101,10 @@
if (expectedResponse.equals(line)) {
return true;
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
return false;
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties
index 3271d25..8c5580d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-xml-override-annotation-with-web-fragment"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -86,10 +86,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/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
index 9299fa7..78674dc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
@@ -32,7 +32,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
index 46b0a28..33b6ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
index a5d6833..c022269 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java
index 54ed114..db4ec2c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test that web.xml overrides @ServletSecurity");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public boolean run() throws Exception {
@@ -101,7 +101,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties
index 3ed79d4..d5374d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-xml-override-auth-annotations"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml
index 31afbda..b77a3cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml
index 423016a..4e72178 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml
@@ -44,7 +44,7 @@
<auth-constraint/>
</security-constraint>
<security-role>
- <role-name>javaee</role-name>
+ <role-name>javaee</role-name>
</security-role>
<login-config>
<auth-method>BASIC</auth-method>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java
index 8471cff..9af222b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 11750");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
boolean ok = invoke("/mytest", 404, null);
ok = invoke("/mytest2", 200, EXPECTED_RESPONSE) && ok;
ok = invoke("/mytest3", 200, EXPECTED_RESPONSE_2) && ok;
@@ -61,7 +61,7 @@
private boolean invoke(String urlPattern,
int expectedCode, String expectedResponse) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ urlPattern;
System.out.println("Accessing " + url);
@@ -104,10 +104,10 @@
if (expectedResponse.equals(line)) {
return true;
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
return false;
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties
index 344ebf0..f31819f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.0-xml-override-url-pattern-with-web-fragment"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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}"/>
@@ -86,10 +86,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/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
index da86db7..4ec660c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
@@ -30,7 +30,7 @@
public class TestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
index 46b0a28..33b6ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
index e40cb0a..f40c3c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
index b5fc608..f61415d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> wfFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java
index 4821939..cd37e85 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for deny-uncovered-http-methods");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
private boolean run(boolean auth,
@@ -89,7 +89,7 @@
ok = ok && EXPECTED_RESPONSE.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties
index 967d677..a7e5404 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-any-authenticated-user"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml
index f9b3b45..1d81b1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,10 +51,10 @@
</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
@@ -62,14 +62,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java
index 879f9a7..41aa573 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java
@@ -24,11 +24,11 @@
* Test change session id in Servlet 3.1
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.1-change-session-id";
private static final String JSESSIONID = "JSESSIONID";
private static final String EXPECTED_RESPONSE = "two";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -41,7 +41,7 @@
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
List<String> result = goGet(host, port, contextRoot + "/test?run=first",
null);
@@ -49,12 +49,12 @@
if (result.size() > 0) {
result2 = goGet(host, port, contextRoot + "/test?run=second",
result.get(0));
- }
-
+ }
+
stat.addStatus(TEST_NAME,
(result.size() > 1 && result2.size() > 1
&& !result.get(0).equals(result2.get(0))
- && EXPECTED_RESPONSE.equals(result2.get(1))) ?
+ && EXPECTED_RESPONSE.equals(result2.get(1))) ?
stat.PASS : stat.FAIL);
} catch (Throwable t) {
System.out.println(t.getMessage());
@@ -99,7 +99,7 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -138,5 +138,5 @@
return ret;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties
index 5e7e360..a919236 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-change-session-id"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml
index b253495..6e91146 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml
@@ -54,7 +54,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java
index 5dc49a5..1be8e5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for deny-uncovered-http-methods");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
private boolean run(String method, boolean auth,
@@ -88,7 +88,7 @@
ok = ok && EXPECTED_RESPONSE.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties
index b115b3b..1c716f1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-deny-uncovered-http-methods"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml
index f9b3b45..1d81b1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,10 +51,10 @@
</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
@@ -62,14 +62,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties
index 4e5d40b..a2a79fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-network-path-reference"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml
index 5316e6d..e93d0d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="build" depends="clean">
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
@@ -52,7 +52,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -74,7 +74,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java
index 653d5d8..2091164 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java
@@ -93,7 +93,7 @@
} catch(Exception ex) {
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties
index 1a41e29..417a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-non-blocking-input"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
index e368d0f..3bc2098 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
@@ -77,7 +77,7 @@
System.out.println("--> onDataAvailable");
int len = -1;
byte b[] = new byte[1024];
- while (input.isReady()
+ while (input.isReady()
&& (len = input.read(b)) != -1) {
String data = new String(b, 0, len);
System.out.println("--> " + data);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java
index f36a7ba..91d6f8e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java
@@ -90,7 +90,7 @@
} catch(Exception ex) {
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties
index 1a41e29..417a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-non-blocking-input"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
index b90ba03..b74708c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
@@ -83,7 +83,7 @@
System.out.println("--> onDataAvailable");
int len = -1;
byte b[] = new byte[1024];
- while (input.isReady()
+ while (input.isReady()
&& (len = input.read(b)) != -1) {
String data = new String(b, 0, len);
System.out.println("--> " + data);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java
index 42d2521..e522953 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java
@@ -91,7 +91,7 @@
} catch(Exception ex) {
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties
index 8b41314..1ddd482 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-non-blocking-input-with-async-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
index 495366e..a7d7029 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
@@ -57,7 +57,7 @@
System.out.println("--> onDataAvailable");
int len = -1;
byte b[] = new byte[1024];
- while (input.isReady()
+ while (input.isReady()
&& (len = input.read(b)) != -1) {
String data = new String(b, 0, len);
System.out.println("--> " + data);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java
index 9691d5a..6a4cec4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java
@@ -72,7 +72,7 @@
System.out.println();
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties
index ee15197..7dd15a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-non-blocking-output"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml
index 72a7394..2546573 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/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"/>
@@ -73,7 +73,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -94,7 +94,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
index 918b5b4..f642f00 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
@@ -58,7 +58,7 @@
long startTime = System.currentTimeMillis();
while (output.isReady()) {
writeData(output);
- count++;
+ count++;
if (System.currentTimeMillis() - startTime > MAX_TIME_MILLIS
|| count > 10) {
throw new IOException("Cannot fill the write buffer");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java
index 35ea1d9..1065198 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java
@@ -23,7 +23,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -141,7 +141,7 @@
static String[][] expected = {
{"1234567abcdefg"},
{"myFile", "test.txt", "36", "text/plain", "content-disposition content-type" },
- {"myFile2", "test2.txt", "37", "text/plain",
+ {"myFile2", "test2.txt", "37", "text/plain",
"content-disposition content-type" },
{"xyz", "null", "14", "text/plain", "content-disposition content-type"}
};
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.properties
index 30e00f4..8d20ce0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/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="web"/>
-<property name="appname" value="${module}-servlet-3.1-part-submitted-file-name"/>
+<property name="appname" value="${module}-servlet-3.1-part-submitted-file-name"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml
index 3cf9a71..68cd907 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -59,7 +59,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
debug="true"
@@ -78,10 +78,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/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
index 667f510..2f99404 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
@@ -28,7 +28,7 @@
@MultipartConfig(maxFileSize=200)
public class ServletTest extends HttpServlet {
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java
index 87b85d1..6a13d19 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java
@@ -24,11 +24,11 @@
* Test HttpServletResponse#reset and #setCharacterEncoding.
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.1-reset-character-encoding";
private static final String EXPECTED_CONTENT_TYPE = "Content-Type: text/plain;charset=Big5";
private static final String EXPECTED_RESPONSE="Done";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -55,7 +55,7 @@
private static boolean goGet(String host, int port, String contextPath,
String expectedContentType) throws Exception {
-
+
boolean result = false;
boolean hasExpectedContentType = (expectedContentType == null);
boolean hasDone = false;
@@ -88,7 +88,7 @@
}
lineNum++;
}
-
+
result = hasExpectedContentType && hasDone;
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties
index 04c843f..033dc04 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-reset-character-encoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml
index b253495..6e91146 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml
@@ -54,7 +54,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java
index 4581e9b..4f3cb78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java
@@ -50,7 +50,7 @@
serverLog = args[4];
appName = args[5];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @RunAs with init and destroy");
@@ -65,7 +65,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
@Override
@@ -103,7 +103,7 @@
ok = ok && EXPECTED_RESPONSE.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties
index d8dbcc3..c23b285 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-run-as-init-destroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml
index 36ea839..9653714 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -61,10 +61,10 @@
</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
@@ -72,14 +72,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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="runAndUndeploy" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java
index 77fd9f4..d99ba9b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java
@@ -24,9 +24,9 @@
* Test HttpServletResponse#reset and #setCharacterEncoding.
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.1-servlet-context-get-virtual-server-name";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -53,7 +53,7 @@
private static boolean goGet(String host, int port, String contextPath,
String expectedResult) throws Exception {
-
+
boolean result = false;
try (Socket sock = new Socket(host, port);
@@ -76,8 +76,8 @@
break;
}
}
-
- }
+
+ }
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties
index a6fd392..86b9309 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-servlet-context-get-virtual-server-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml
index a512f8a..6c28c05 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml
@@ -54,7 +54,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -76,7 +76,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java
index 4981885..b45507c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java
@@ -22,7 +22,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for upgrade echo
+ * Unit test for upgrade echo
*/
public class WebTest {
@@ -84,7 +84,7 @@
System.out.format("Sleeping %d sec\n", sleepInSeconds);
Thread.sleep(sleepInSeconds * 1000);
writeChunk(output, "World");
-
+
// read data without using readLine
long startTime = System.currentTimeMillis();
System.out.println("Consuming results");
@@ -95,7 +95,7 @@
boolean hasError = sb.toString().contains("WrongClassLoader");
if (hasInfo || hasError || System.currentTimeMillis() - startTime > 20 * 1000) {
break;
- }
+ }
}
System.out.println(sb.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties
index ca97a80..5bc3722 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-upgrade-simple"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
index 00ca28e..54fbc1d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
@@ -78,7 +78,7 @@
System.out.println("Correct ClassLoader");
} else {
System.out.println("ERROR Wrong ClassLoader!!!");
- sb.append("WrongClassLoader");
+ sb.append("WrongClassLoader");
}
int len = -1;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties
index 4869b81..5c8ed84 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-3.1-upgrade-with-cdi"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
index dd876e9..95926be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
@@ -73,7 +73,7 @@
int sum = 0;
for (int i = 0; i < 10; i++) {
sum += (10 - i) * is[i];
- }
+ }
return (sum % 11 == 0);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
index b9fade1..2fac21a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
@@ -101,7 +101,7 @@
public void onError(final Throwable t) {
System.out.println("--> onError: " + t);
t.printStackTrace();
-
+
try {
wc.close();
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java
index f4f0ad8..614781f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.addJspFile");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties
index f924757..2084051 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-servlet-4.0-add-jsp-file"/>
+<property name="appname" value="${module}-servlet-4.0-add-jsp-file"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml
index 84b8d6d..9b7fbd9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/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,10 +47,10 @@
</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="." includes="WebTest.java">
@@ -59,10 +59,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -70,7 +70,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -86,10 +86,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/web/servlet-4.0/compositeTrailerSupplier/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/WebTest.java
index bc5078a..eddbd15 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/WebTest.java
@@ -42,7 +42,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for composite trailer supplier");
WebTest webTest = new WebTest(args);
@@ -85,7 +85,7 @@
}
String contentType = httpResponse.getHeader("Content-Type");
System.out.println("--> headers = " + httpResponse.getHeaders());
-
+
String result = new StringBuilder(httpResponse.getBody().trim())
.append('|')
.append(httpResponse.getTrailerFields().get("bar1")) // trailer field
@@ -96,7 +96,7 @@
System.out.println("--> result = " + result);
if (!EXPECTED_RESPONSE.equals(result)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + result);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties
index 8753341..6e21a0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-servlet-4.0-composite-trailer-supplier"/>
+<property name="appname" value="${module}-servlet-4.0-composite-trailer-supplier"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/web/servlet-4.0/contextCharEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/WebTest.java
index 36728f0..957390c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/WebTest.java
@@ -44,7 +44,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#setRequest/ResponseCharacterEncoding");
WebTest webTest = new WebTest(args);
@@ -90,7 +90,7 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.properties
index c4a4215..cb6e37d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-context-char-encoding"/>
+<property name="appname" value="${module}-servlet-4.0-context-char-encoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/web/servlet-4.0/defaultContextPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/WebTest.java
index 3a6fc72..6ba7e4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/WebTest.java
@@ -36,7 +36,7 @@
host = args[0];
port = Integer.parseInt(args[1]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for default-context-path setting in web.xml");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties
index 629caf9..b9404b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-default-context-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml
index ca48582..fc5ba8c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/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,10 +47,10 @@
</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="." includes="WebTest.java">
@@ -59,14 +59,14 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -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/web/servlet-4.0/defaultContextPathEar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/WebTest.java
index 3ac3190..95bd169 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/WebTest.java
@@ -36,7 +36,7 @@
host = args[0];
port = Integer.parseInt(args[1]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for default-context-path setting in web.xml in an ear file");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties
index dbbe7d4..b1eb3c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-default-context-path-ear"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml
index 17a54c6..24180b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/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"/>
@@ -65,12 +65,12 @@
<jar destfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}" includes="*.war"/>
</jar>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -85,10 +85,10 @@
</classpath>
</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/web/servlet-4.0/mappingDiscovery/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java
index 54cf040..0d27c90 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java
@@ -42,9 +42,9 @@
contextRoot = args[2];
appName = args[3];
serverLog = args[4];
-
+
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for mapping discovery");
@@ -57,12 +57,12 @@
boolean extensionMatch = webTest.run("GET", 200, false, "/foo.Issue73", ".*ServletC.MappingImpl\\{matchValue=foo.*pattern=\\*\\.Issue73.*servletName=ServletC.*mappingMatch=EXTENSION\\}.*FORWARD_MAPPING: null.*INCLUDE_MAPPING: null.*ASYNC_MAPPING: null.*");
boolean pathMatch = webTest.run("GET", 200, false, "/path/foo", ".*ServletC.MappingImpl\\{matchValue=foo.*pattern=/path/\\*.*servletName=ServletC.*mappingMatch=PATH\\}.*FORWARD_MAPPING: null.*INCLUDE_MAPPING: null.*ASYNC_MAPPING: null.*");
- stat.addStatus(TEST_NAME + "-simple", ((contextRootMatch &&
+ stat.addStatus(TEST_NAME + "-simple", ((contextRootMatch &&
defaultMatch &&
- exactMatch &&
+ exactMatch &&
extensionMatch &&
pathMatch)? stat.PASS : stat.FAIL));
-
+
boolean asyncMatch1 = webTest.run("GET", 200, false, "/AAsyncDispatchToC", ".*ServletC.MappingImpl\\{matchValue=AAsyncDispatchToC.*pattern=/AAsyncDispatchToC.*servletName=AAsyncDispatchToC,.*mappingMatch=EXACT\\}.*FORWARD_MAPPING: null.*INCLUDE_MAPPING: null.*ASYNC_MAPPING:.*MappingImpl\\{matchValue=AAsyncDispatchToC.*pattern=/AAsyncDispatchToC.*servletName=AAsyncDispatchToC.*mappingMatch=EXACT}.*");
boolean asyncMatch2 = webTest.run("GET", 200, false, "/BIncludeDispatchServletNamedDispatcher", ".*In.ServletC.MappingImpl\\{matchValue=BIncludeDispatchServletNamedDispatcher,.pattern=/BIncludeDispatchServletNamedDispatcher,.servletName=BIncludeDispatchServletNamedDispatcher,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.null.*ASYNC_MAPPING:.MappingImpl\\{matchValue=BIncludeDispatchServletNamedDispatcher,.pattern=/BIncludeDispatchServletNamedDispatcher,.servletName=BIncludeDispatchServletNamedDispatcher,.mappingMatch=EXACT\\}.*");
@@ -70,18 +70,18 @@
stat.addStatus(TEST_NAME + "-async",
asyncMatch1 &&
asyncMatch2 ? stat.PASS : stat.FAIL);
-
+
boolean forwardMatch1 = webTest.run("GET", 200, false, "/AForwardToB", ".*ServletC.MappingImpl\\{matchValue=ServletC,.*pattern=/ServletC,.*servletName=ServletC,.*mappingMatch=EXACT\\}.*FORWARD_MAPPING:.MappingImpl\\{matchValue=AForwardToB,.pattern=/AForwardToB,.servletName=AForwardToB,.mappingMatch=EXACT\\}.*INCLUDE_MAPPING:.null.*ASYNC_MAPPING:.null.*");
boolean forwardMatch2 = webTest.run("GET", 200, false, "/BForwardToC", ".*ServletC.MappingImpl\\{matchValue=ServletC,.*pattern=/ServletC,.*servletName=ServletC,.*mappingMatch=EXACT\\}.*FORWARD_MAPPING:.MappingImpl\\{matchValue=BForwardToC,.pattern=/BForwardToC,.servletName=BForwardToC,.mappingMatch=EXACT\\}.*INCLUDE_MAPPING:.null.*ASYNC_MAPPING:.null.*");
stat.addStatus(TEST_NAME + "-forward", ((forwardMatch1 &&
forwardMatch2)? stat.PASS : stat.FAIL));
-
+
boolean includeMatch1 = webTest.run("GET", 200, false, "/AIncludesB", ".*AIncludesB.MappingImpl\\{matchValue=AIncludesB,.pattern=/AIncludesB,.servletName=AIncludesB,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.null.*In.BIncludesC.MappingImpl\\{matchValue=AIncludesB,.pattern=/AIncludesB,.servletName=AIncludesB,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.MappingImpl\\{matchValue=BIncludesC,.pattern=/BIncludesC,.servletName=BIncludesC,.mappingMatch=EXACT\\}.*In.ServletC.MappingImpl\\{matchValue=AIncludesB,.pattern=/AIncludesB,.servletName=AIncludesB,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.MappingImpl\\{matchValue=ServletC,.pattern=/ServletC,.servletName=ServletC,.mappingMatch=EXACT\\}.*ASYNC_MAPPING:.null.*");
boolean includeMatch2 = webTest.run("GET", 200, false, "/BIncludesC", ".*In.BIncludesC.MappingImpl\\{matchValue=BIncludesC,.pattern=/BIncludesC,.servletName=BIncludesC,.mappingMatch=EXACT\\}.*.FORWARD_MAPPING:.null.*.INCLUDE_MAPPING:.null.*In.ServletC.MappingImpl\\{matchValue=BIncludesC,.pattern=/BIncludesC,.servletName=BIncludesC,.mappingMatch=EXACT\\}.*.FORWARD_MAPPING:.null.*.INCLUDE_MAPPING:.MappingImpl\\{matchValue=ServletC,.pattern=/ServletC,.servletName=ServletC,.mappingMatch=EXACT\\}.*.ASYNC_MAPPING:.null.*");
stat.addStatus(TEST_NAME + "-include", ((includeMatch1 &&
includeMatch2)? stat.PASS : stat.FAIL));
-
+
boolean boundsMatch1 = webTest.run("GET", 200, false, "/a/foo", ".*");
boolean boundsMatch2 = webTest.run("GET", 200, false, "/f", ".*");
stat.addStatus(TEST_NAME + "-bounds", ((boundsMatch1 && boundsMatch2)? stat.PASS : stat.FAIL));
@@ -91,14 +91,14 @@
boolean namedDispatchMatch2 = webTest.run("GET", 200, false, "/BIncludeCNamedDispatcher", ".*In.ServletC.MappingImpl\\{matchValue=BIncludeCNamedDispatcher,.pattern=/BIncludeCNamedDispatcher,.servletName=BIncludeCNamedDispatcher,.mappingMatch=EXACT\\}</p><p>.FORWARD_MAPPING:.null</p><p>.INCLUDE_MAPPING:.null</p><p>.ASYNC_MAPPING:.null.*");
stat.addStatus(TEST_NAME + "-namedDispatch", ((namedDispatchMatch1 && namedDispatchMatch2)? stat.PASS : stat.FAIL));
-
-
+
+
} catch( Exception ex) {
ex.printStackTrace();
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
private boolean run(String method,
@@ -108,7 +108,7 @@
host(host).port(port).build()) {
httpClient.request().path(path).method(method).build().send();
HttpResponse httpResponse = httpClient.getHttpResponse();
-
+
int code = httpResponse.getStatus();
boolean ok = (code == status);
if (checkOKStatusOnly) {
@@ -116,7 +116,7 @@
}
BufferedReader bis = null;
String line = null;
-
+
try {
bis = new BufferedReader(new StringReader(httpResponse.getBody()));
line = bis.readLine();
@@ -124,7 +124,7 @@
ok = line.matches(matchRegex);
System.out.println("matches: " + ok);
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -135,9 +135,9 @@
// ignore
}
}
-
+
return ok;
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties
index aaaa42f..0d13d07 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-mapping-discovery"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml
index fef7251..04f26a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,10 +46,10 @@
</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="." includes="WebTest.java">
@@ -59,14 +59,14 @@
</classpath>
</javac>
- </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" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml
index 4e33b33..50c693a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml
@@ -56,7 +56,7 @@
<servlet-name>BIncludesC</servlet-name>
<url-pattern>/BIncludesC</url-pattern>
</servlet-mapping>
-
+
<!-- async cases -->
<servlet>
<servlet-name>AAsyncDispatchToC</servlet-name>
@@ -112,5 +112,5 @@
<url-pattern>/a/*</url-pattern>
<url-pattern>//*</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
index 9770aa2..03ea566 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
@@ -37,17 +37,17 @@
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
AsyncContext asyncContext = request.startAsync();
-
- request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+
+ request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
asyncContext.dispatch("/ServletC");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
index f87be65..90ae2c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getRequestDispatcher("/BForwardToC");
rd.forward(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
index 13d4a9f..c3219ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
@@ -44,17 +44,17 @@
out.print("<!DOCTYPE html>");
out.print("<html>");
out.print("<head>");
- out.print("<title>Servlet AIncludesB</title>");
+ out.print("<title>Servlet AIncludesB</title>");
out.print("</head>");
out.print("<body>");
out.print("<h1>Servlet AIncludesB at " + request.getContextPath() + "</h1>");
- request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
out.print("<p> In " + this.getClass().getSimpleName() + " " + request.getHttpServletMapping() + "</p>");
out.print("<p> FORWARD_MAPPING: " + forwardMapping + "</p>");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
index c934db6..2adf4ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getRequestDispatcher("/ServletC");
rd.forward(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
index 7371975..71a5b4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getServletContext().getNamedDispatcher("ServletC");
rd.forward(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
index 4579c0d..c65712f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getServletContext().getNamedDispatcher("ServletC");
rd.include(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
index 0ff75b5..787f75d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getServletContext().getNamedDispatcher("fa5raP");
rd.include(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
index 9abc7ca..2075eab 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
@@ -41,13 +41,13 @@
PrintWriter out = response.getWriter();
try {
/* TODO output your page here. You may use following sample code. */
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
out.print("<p> In " + this.getClass().getSimpleName() + " " + request.getHttpServletMapping() + "</p>");
out.print("<p> FORWARD_MAPPING: " + forwardMapping + "</p>");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
index be850ad..43ec1a1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
@@ -27,18 +27,18 @@
public class DispatchServlet extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException{
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
-
+
AsyncContext asyncContext = request.startAsync();
asyncContext.setTimeout(0);
asyncContext.dispatch("/ServletC");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
index 23aad83..b1ab795 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
@@ -41,16 +41,16 @@
PrintWriter out = response.getWriter();
try {
/* TODO output your page here. You may use following sample code. */
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
out.print("<p> In " + this.getClass().getSimpleName() + " " + request.getHttpServletMapping() + "</p>");
out.print("<p> FORWARD_MAPPING: " + forwardMapping + "</p>");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java
index 87f7f21..332f601 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push arbitrary method");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties
index 9445c10..10f358d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-push-arbitrary-method"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml
index 6d8561d..ea74b2c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
index cd1a6c8..67da9f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
@@ -32,7 +32,7 @@
@WebServlet(urlPatterns="/foo/*")
public class FooMethodServlet extends HttpServlet {
-
+
@Override
protected void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -53,6 +53,6 @@
}
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
index 35a38e4..ff7473c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
@@ -58,7 +58,7 @@
* cookie: [375 bytes were stripped]
* referer: https://localhost:8181/web-servlet-4.0-push-arbitrary-method/test
*/
-
+
PushBuilder pushBuilder = req.newPushBuilder().
method("FOO").
path("foo/my.css");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java
index e00c99e..c461755 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java
@@ -45,7 +45,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push static file");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties
index 140b97a..6085e62 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-push-authorization"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml
index e2cdfc0..972c0d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml
@@ -53,7 +53,7 @@
<param name="user" value="${testuser}"/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -71,7 +71,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -96,7 +96,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java
index 17b7354..4aa3c9e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push cacheable");
WebTest webTest = new WebTest(args);
@@ -52,7 +52,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties
index d113ace..8e728b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-push-cacheable"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml
index 831745f..7f4fa1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java
index 49c0c22..919edc3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push dynamic file");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties
index d3bdba9..9c285ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-push-dynamic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml
index 6d8561d..ea74b2c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
index f069065..c8e4c64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
@@ -56,7 +56,7 @@
req.getServletContext().log("Should have ln parameter. Does not.");
res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
-
+
}
}
res.getWriter().println("foo: bar");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
index 26dfd7b..7305f62 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
@@ -46,7 +46,7 @@
pushBuilder = req.newPushBuilder().
path("/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/parameterMapFailure.js?ln=resources");
pushBuilder.push();
-
+
res.getWriter().println("<html><head><title>HTTP2 Test</title><link rel=\"stylesheet\" href=\"/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/style.css\"><script type=\"text/javascript\" src=\"/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/jsf.js?ln=javax.faces\"></script><script type=\"text/javascript\" src=\"/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/parameterMapFailure.js?ln=resources\"></script></head><body>Hello</body></html>");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java
index 839f97d..66224e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push query string");
WebTest webTest = new WebTest(args);
@@ -52,7 +52,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties
index 8a90eaf..22143d6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-push-query-string"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml
index 831745f..7f4fa1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java
index 213690d..6d44f31 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push static file");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties
index 7c1192b..f19ec38 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-push-static"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml
index 831745f..7f4fa1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/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"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java
index 869ac98..8fccc06 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java
@@ -44,7 +44,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for request-character-encoding, response-character-encoding in web.xml");
WebTest webTest = new WebTest(args);
@@ -90,7 +90,7 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.properties
index 2aea8fd..dc8f68f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-req-res-encoding"/>
+<property name="appname" value="${module}-servlet-4.0-req-res-encoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java
index b2decec..5bb8ef5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java
@@ -46,7 +46,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for request-character-encoding, response-character-encoding in web.xml and parameter-encoding in glassfish-web.xml");
WebTest webTest = new WebTest(args);
@@ -91,12 +91,12 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!JCHARSET_RESPONSE.equals(charset)) {
- throw new Exception("Wrong Content-Type charset. Expected: " +
+ throw new Exception("Wrong Content-Type charset. Expected: " +
JCHARSET_RESPONSE + ", received: " + charset);
}
-
+
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
@@ -124,12 +124,12 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!JCHARSET_RESPONSE.equals(charset)) {
- throw new Exception("Wrong Content-Type charset. Expected: " +
+ throw new Exception("Wrong Content-Type charset. Expected: " +
JCHARSET_RESPONSE + ", received: " + charset);
}
-
+
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties
index 312914c..5009847 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties
@@ -16,10 +16,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-servlet-4.0-req-res-encoding-gfwebxml"/>
+<property name="appname" value="${module}-servlet-4.0-req-res-encoding-gfwebxml"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml
index d8fffcf..39bb534 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml
@@ -38,7 +38,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,10 +46,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -57,10 +57,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -68,7 +68,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<jvmarg value="-Djava.endorsed.dirs=${env.S1AS_HOME}/modules/endorsed"/>
@@ -85,10 +85,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/web/servlet-4.0/setSessionTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/WebTest.java
index a29bcaf..77798be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.setSessionTimeout()");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -83,7 +83,7 @@
String line = httpResponse.getBody().trim();
System.out.println("--> line = " + line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties
index d9669ce..c8dcbd6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-4.0-set-session-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml
index 229d336..75668c2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
@@ -58,10 +58,10 @@
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -69,7 +69,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -85,10 +85,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/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
index b7eaf9a..99cb835 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
@@ -26,18 +26,18 @@
* Notifies the object that it is being bound to a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
@Override
public void valueBound(HttpSessionBindingEvent event) {
// do nothing
}
-
+
/*
* Notifies the object that it is being unbound from a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
@Override
public void valueUnbound(HttpSessionBindingEvent event) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java
index 0c78f9b..503b16e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java
@@ -42,7 +42,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for trailer");
WebTest webTest = new WebTest(args);
@@ -85,7 +85,7 @@
}
String contentType = httpResponse.getHeader("Content-Type");
System.out.println("--> headers = " + httpResponse.getHeaders());
-
+
String result = new StringBuilder(httpResponse.getBody().trim())
.append('|')
.append(httpResponse.getTrailerFields().get("bar1")) // trailer field
@@ -96,7 +96,7 @@
System.out.println("--> result = " + result);
if (!EXPECTED_RESPONSE.equals(result)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + result);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties
index 67e297d..c98b183 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-servlet-4.0-trailer"/>
+<property name="appname" value="${module}-servlet-4.0-trailer"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/web/servletAnnotationPreDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/WebTest.java
index d3a0c8d..1aadac0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/WebTest.java
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6535898");
@@ -62,7 +62,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -75,7 +75,7 @@
if ("SUCCESS".equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties
index 052e444..9666302 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-annotation-predestroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml
index 6a81528..63b5d4d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/servletChainedException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
index a34c114..5b7e1b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for servlet chained exception");
@@ -53,18 +53,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties b/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties
index 0867c51..5c6ae54 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-chained-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml b/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletChainedException/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
index 6025751..1c17007 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
@@ -37,7 +37,7 @@
Throwable t = new Throwable("test");
ServletException se1 = new ServletException("test", t);
- ServletException se2 = new ServletException(t);
+ ServletException se2 = new ServletException(t);
if (se1.getCause() == t && se2.getCause() == t) {
passed = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java
index 04f620a..03bdfd7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java
@@ -20,13 +20,13 @@
import com.sun.ejte.ccl.reporter.*;
/**
- * Bugzilla 33463
+ * Bugzilla 33463
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -35,7 +35,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Remove Attribute on destroy");
String host = args[0];
@@ -44,7 +44,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "DESTROY", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -53,7 +53,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("attributeListenerClear", stat.FAIL);
- }
+ }
stat.printSummary("web/attributeListenerClear---> expect " + EXPECTED_COUNT);
}
@@ -68,7 +68,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,18 +83,18 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-attributeListenerClear: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-attributeListenerClear: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-attributeListenerClear: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties
index 1ca409c..9177253 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servletContextAttributeEventAttributeRemoved"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml
index 2717575..65e952f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,16 +48,16 @@
classpath="${s1as.classpath}"
destdir="./shared" includes="*.java"/>
<jar destfile="shared.jar" basedir="shared"/>
- <copy file="shared.jar"
+ <copy file="shared.jar"
todir="${env.S1AS_HOME}/lib"/>
<antcall target="restart-server-instance-common"/>
</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
@@ -65,14 +65,14 @@
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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -82,7 +82,7 @@
<delete file="${env.S1AS_HOME}/lib/shared.jar"/>
<antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -94,10 +94,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/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml
index 1a8960e..ac2559b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml
@@ -27,14 +27,14 @@
test.StaticListener
</listener-class>
</listener>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
<load-on-startup>0</load-on-startup>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
index fc1266e..c4e1136 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- ServletContext ctx = config.getServletContext();
- ctx.setAttribute("Attribut", "une valeur");
+ ServletContext ctx = config.getServletContext();
+ ctx.setAttribute("Attribut", "une valeur");
}
-
+
public void destroy(){
System.out.println("########### destroy #############");
}
@@ -41,14 +41,14 @@
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
- System.out.println("########## StaticListener.removeAttribute: " +
+
+ System.out.println("########## StaticListener.removeAttribute: " +
StaticListener.removeAttribute);
- out.println("DESTROY:"
+ out.println("DESTROY:"
+ (StaticListener.removeAttribute == true ? "PASS" : "FAIL"));
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
index c5c44be..f3e7de4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
@@ -23,21 +23,21 @@
public static boolean removeAttribute = false;
- public void attributeAdded(ServletContextAttributeEvent evt) {
- System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeAdded(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
- public void attributeRemoved(ServletContextAttributeEvent evt) {
- System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ public void attributeRemoved(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
System.out.println("removeAttribute: " + removeAttribute);
removeAttribute = true;
- }
+ }
- public void attributeReplaced(ServletContextAttributeEvent evt) {
- System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeReplaced(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
index c5c44be..f3e7de4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
@@ -23,21 +23,21 @@
public static boolean removeAttribute = false;
- public void attributeAdded(ServletContextAttributeEvent evt) {
- System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeAdded(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
- public void attributeRemoved(ServletContextAttributeEvent evt) {
- System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ public void attributeRemoved(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
System.out.println("removeAttribute: " + removeAttribute);
removeAttribute = true;
- }
+ }
- public void attributeReplaced(ServletContextAttributeEvent evt) {
- System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeReplaced(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java
index 3c39247..4e9ffed 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6391");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -66,7 +66,7 @@
if ("SUCCESS".equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties
index d66bf68..f35e56a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-context-attribute-listener-annotation-predestroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml
index 90abef1..7240790 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/servletContextDestroyedEventAttributesAvailable/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/WebTest.java
index 0772a31..e3ca54b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/WebTest.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 6442");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
/**
@@ -72,7 +72,7 @@
* at its contextDestroyed() method and will attempt to access the
* ServletContext attribute that was added by the servlet.
* If the attribute is present, the ServletContextListener will write
- * the word "SUCCESS" to /tmp/mytest. Otherwise, it will write FAIL to
+ * the word "SUCCESS" to /tmp/mytest. Otherwise, it will write FAIL to
* that file.
*/
public void firstRun() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties
index 97ece0e..ed9af78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-context-destroyed-event-attributes-available"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml
index ee65da6..0a7d198 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,21 +44,21 @@
</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="firstRun" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -84,10 +84,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/web/servletContextGetContextPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/WebTest.java
index f7d86d8..438bc13 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.getContextPath()");
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -71,8 +71,8 @@
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!contextRoot.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
contextRoot + ", received: " + line);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties
index 49c3e21..44868ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-context-get-context-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletContextGetEmptyContextPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/WebTest.java
index b0cabe5..e85ae37 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/WebTest.java
@@ -25,7 +25,7 @@
* The empty context path is specified in the sun-web.xml, as follows:
*
* <sun-web-app>
- * <context-root></context-root>
+ * <context-root></context-root>
* </sun-web-app>
*
* and there is no contextroot specified in build.properties.
@@ -47,7 +47,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.getContextPath()");
@@ -60,11 +60,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -80,10 +80,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties
index 1c4f0ec..6233c03 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-context-get-empty-context-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml
index 6c9683f..968deb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml
index 656c52c..12921d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml
@@ -20,5 +20,5 @@
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-1.dtd">
<sun-web-app>
- <context-root>/</context-root>
+ <context-root>/</context-root>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java
index c210868..7fdc495 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 6391");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -85,10 +85,10 @@
// ignore
}
}
-
+
if ("SUCCESS".equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties
index 3bdaccd..37d8690 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-context-listener-annotation-predestroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml
index e55219d..5bf4b36 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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}"/>
@@ -72,10 +72,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/web/servletContextNullPathArgument/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/WebTest.java
index e1f521a..021cf73 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6265066");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties
index aef39d2..abb6a05 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-context-null-path-argument"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletEmptyLoadOnStartup/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/WebTest.java
index bffbecd..b8d8139 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6172006");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -62,7 +62,7 @@
}
public void run() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
@@ -84,6 +84,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties
index c8353b0..48d6f0d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-empty-load-on-startup"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletEmptyLoadOnStartup/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/descriptor/web.xml
index f5c4d3b..ae5b958 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/descriptor/web.xml
@@ -24,7 +24,7 @@
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
<load-on-startup/>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java
index 67ae488..6ddaa51 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for
+ * Unit test for
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=6943
* ("Grails sample app failed with Servlet gsp NPE")
@@ -29,7 +29,7 @@
private static final String TEST_NAME = "servlet-filter-default-invocation-order";
private static final String EXPECTED_RESPONSE = "true";
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 6943");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -76,9 +76,9 @@
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties
index f8628f1..ddbf2a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-filter-default-invocation-order"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servletFilterDefaultInvocationOrder/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/descriptor/web.xml
index bec2390..be5c1e9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/descriptor/web.xml
@@ -18,17 +18,17 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
+
<filter>
<filter-name>Filter_A</filter-name>
<filter-class>Filter_A</filter-class>
- </filter>
+ </filter>
<filter>
<filter-name>Filter_B</filter-name>
<filter-class>Filter_B</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>Filter_A</filter-name>
<url-pattern>/*</url-pattern>
@@ -38,12 +38,12 @@
<filter-name>Filter_B</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java
index b3384f2..3a699c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java
@@ -28,7 +28,7 @@
"servlet-filter-mapping-with-servletname-and-urlpattern";
private static final String EXPECTED_RESPONSE = "true";
-
+
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for filter-mapping with both "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -80,7 +80,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -98,6 +98,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties
index 93bb1df..32a17cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-filter-mapping-with-servletname-and-urlpattern"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml
index 15219c5..3698331 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml
@@ -18,24 +18,24 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
+
<filter>
<filter-name>TestFilter</filter-name>
<filter-class>test.TestFilter</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>TestFilter</filter-name>
<url-pattern>/TestServlet</url-pattern>
<servlet-name>TestServlet</servlet-name>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
index 65aae70..833637f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
@@ -26,7 +26,7 @@
private AtomicInteger count;
public void init(FilterConfig filterConfig) throws ServletException {
- count = new AtomicInteger();
+ count = new AtomicInteger();
}
public void doFilter (ServletRequest request,
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
index e510f63..c745127 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
@@ -27,7 +27,7 @@
throws IOException, ServletException {
boolean success = false;
-
+
AtomicInteger count = (AtomicInteger) req.getAttribute("filterCount");
if (count != null && count.intValue() == 2) {
success = true;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java
index e1db611..fe7d656 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6356813");
WebTest webTest = new WebTest(args);
@@ -77,6 +77,6 @@
+ ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.properties b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.properties
index 267f521..887aeae 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/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="web"/>
-<property name="appname" value="${module}-servlet-get-server-port"/>
+<property name="appname" value="${module}-servlet-get-server-port"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,15 +42,15 @@
</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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/web/servletGetServerPort/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
index 86836c3..c4d9646 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java
index dc4f59d..56acc97 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 17216");
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";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,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/web/servletInitBeforeGetServletConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.properties
index abe9692..8f7a4b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-init-before-get-servlet-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml
index 86f51ed..7aab77a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/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,19 +47,19 @@
</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>
@@ -74,10 +74,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/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
index c0f337e..20ddacf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
@@ -27,7 +27,7 @@
public class TestServlet extends HttpServlet {
private volatile Integer i = null;
private volatile Boolean initBeforeGetConfig = null;
-
+
public void init() {
i = new Integer(1);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java
index b1abeb5..43dd5cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 8557");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties
index ebf82d2..dd007b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-load-on-startup-multiple-init"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml
index 8d2adf9..bcfb19f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletMappingWithMultipleURLPatterns/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/WebTest.java
index 1851301..b597b3d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for servlet-mapping with "
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
boolean fail = false;
URL url = null;
HttpURLConnection conn = null;
@@ -88,6 +88,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties
index f5d521b..ca57f7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-mapping-with-multiple-url-patterns"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletRelativeContextURLsEquals/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/WebTest.java
index 927a63f..06f9c3b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6318494");
@@ -52,18 +52,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties
index 3ff66f2..42c1bc2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-relative-context-urls-equals"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
index b6a71d0..73c3164 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
@@ -34,8 +34,8 @@
throws IOException, ServletException {
boolean passed = false;
-
- try {
+
+ try {
URL main = context.getResource("/test/res1.jsp");
URL sub = new URL(main, "res2.jsp");
URL sub1 = context.getResource("/test/res2.jsp");
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java
index 5a3af0d..e7b7b57 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish issue 3505");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet/http://www.sun.com/");
System.out.println("Connecting to: " + url.toString());
@@ -77,10 +77,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties
index fd4415f..2143d20 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-request-get-path-info-collapse-contiguous-slashes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml
index 6b61a09..3e10e16 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java
index 3d2b0d5..0d71272 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java
@@ -61,8 +61,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -92,7 +92,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
@@ -143,7 +143,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
fail = true;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties
index ba34d35..b4b49d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-request-getPathInfo-getPathTranslated"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml
index ebdcf2f..5a3b223 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -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/web/servletRequestLongUri/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/WebTest.java
index acc6e6d..eac4a22 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for testing very long request URI");
@@ -58,7 +58,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String pathInfo, String expected) throws Exception {
@@ -68,7 +68,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties
index 6f2c607..664df3c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-request-long-uri"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servletRequestParamsPreserveOrder/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/WebTest.java
index 785d888..add6099 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6057385");
@@ -57,7 +57,7 @@
}
public void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet?param1=value1¶m2=value2¶m3=value3";
HttpURLConnection conn = (HttpURLConnection)
@@ -66,7 +66,7 @@
int code = conn.getResponseCode();
if (code != 200) {
throw new Exception("Unexpected return code: " + code);
- }
+ }
InputStream is = null;
BufferedReader input = null;
@@ -93,6 +93,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties
index 0bd0177..2276394 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-request-params-preserve-order"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,17 +42,17 @@
</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="re-deploy" depends="init-common">
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletRequestParamsPreserveOrder/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/descriptor/web.xml
index 4d9d4a0..98d1684 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java
index 0593cf4..be0adbe 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java
@@ -58,7 +58,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4936855");
@@ -71,18 +71,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties
index 7ad1d3c..b2c1b65 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-request-setcharencoding-illegal-state-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletRequestURIMultipleSemicolons/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/WebTest.java
index 885340e..742e43a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/WebTest.java
@@ -49,7 +49,7 @@
expectedResponse = contextRoot + "/test.jsp;jsessionwhatever=456";
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -63,11 +63,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp;jsessionid=12;jsessionwhatever=456");
System.out.println("Connecting to: " + url.toString());
@@ -87,7 +87,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!expectedResponse.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
}
} finally {
@@ -105,6 +105,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties
index 05aa72b..9fe3ad2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-request-uri-multiple-semicolons"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionContextAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/WebTest.java
index 1ab490e..d5a1427 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties
index 52eac49..144c2ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-context-attribute-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
index e2751a1..cf19313 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
@@ -49,7 +49,7 @@
public void attributeAdded(ServletContextAttributeEvent scae) {
ServletContext sc = scae.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java
index 33b3c72..b700c66 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties
index 9cdfa09..91efe80 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-context-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionContextListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
index 57d6466..118e726 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
@@ -49,7 +49,7 @@
public void contextInitialized(ServletContextEvent sce) {
ServletContext sc = sce.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java
index c0fa7b6..fbd57e5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -51,18 +51,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties
index f1ec168..362f50e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-filter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
index 214c30a..67a4f7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
@@ -40,7 +40,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
ServletContext sc = filterConfig.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
index 0161bd6..b96fba4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -79,7 +79,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -97,6 +97,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties
index 674399e..9cfe85a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-http-session-attribute-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
index 976aa13..0ff22e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
@@ -51,7 +51,7 @@
HttpSession session = hsbe.getSession();
ServletContext sc = session.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
index 9c7ba9a..4b0eb8a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -79,7 +79,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -97,6 +97,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties
index 72e501c..c09cca2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-http-session-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
index 82c13ed..13e4652 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
@@ -50,7 +50,7 @@
HttpSession session = hse.getSession();
ServletContext sc = session.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java
index 6bbf958..f6d1b78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties
index 6753392..3b004a9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-request-attribute-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
index 9b255d5..362aead 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
@@ -50,7 +50,7 @@
ServletRequest sr = srae.getServletRequest();
ServletContext sc = srae.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java
index aab7a6c..8d59943 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties
index 940444b..9a0265a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-request-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
index d6af67b..b6dd55d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
@@ -51,7 +51,7 @@
ServletRequest sr = sre.getServletRequest();
ServletContext sc = sre.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java
index 56abc77..891a70b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,9 +78,9 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
- }
+ }
} finally {
try {
if (is != null) {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties
index 2b53dac..a5b81d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-servlet-instance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java
index 463dc3e..e8d3441 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -79,10 +79,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties
index c94a47a..4fb6007 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-resource-injection-servlet-instance-load-on-startup"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletResponseQuotedContentTypeImbalance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/WebTest.java
index 99f5481..db200d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6316254");
@@ -50,18 +50,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties
index f253827..2b3f9d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-response-quoted-content-type-imbalance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/servletSSLRequestAttributes/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
index 124badc..9b7df80 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
@@ -22,7 +22,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test related to
+ * Unit test related to
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=562
* ("HttpServletRequest does not return any attribute in JAX-WS web service"):
*
@@ -64,7 +64,7 @@
String contextRoot = args[2];
String keyStorePath = args[3];
String trustStorePath = args[4];
-
+
try {
SSLSocketFactory ssf = getSSLSocketFactory(keyStorePath,
trustStorePath);
@@ -72,9 +72,9 @@
+ port + contextRoot
+ "/TestServlet",
ssf);
-
+
parseResponse(connection);
-
+
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
t.printStackTrace();
@@ -117,7 +117,7 @@
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = "changeit".toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -133,7 +133,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties
index 3d22a6b..8fc607f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-servlet-ssl-request-attributes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml
index a7eab9d..656dddc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -77,10 +77,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml
index c2a768e..f55cb9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
index a04aa9a..b45f952 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
@@ -28,7 +28,7 @@
Enumeration<String> e = req.getAttributeNames();
while (e.hasMoreElements()) {
attrs.append(e.nextElement() + ";");
- }
+ }
res.getWriter().print(attrs);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java
index 4ef2656..e2fe2d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4924326");
WebTest webTest = new WebTest(args);
@@ -53,7 +53,7 @@
}
public void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot;
int code = invokeServlet(url + "/TestServlet1");
if (code != 200) {
@@ -67,7 +67,7 @@
}
private int invokeServlet(String url) throws Exception {
-
+
System.out.println("Invoking servlet at: " + url);
HttpURLConnection conn = (HttpURLConnection)
diff --git a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.properties
index 5e530df..ca80b81 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/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="web"/>
-<property name="appname" value="${module}-servlet-to-jsp-file-mapping"/>
+<property name="appname" value="${module}-servlet-to-jsp-file-mapping"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml
index 4edc9cc..4ab7865 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/sessionDestroyed/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/WebTest.java
index 01a5921..d0afdec 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/WebTest.java
@@ -24,7 +24,7 @@
* too late according to Servlet Spec").
*/
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "session-destroyed";
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties
index 8cfd8d4..875cfae 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties
@@ -15,11 +15,11 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-destroyed"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml
index 02e27d7..c14cf33 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
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}"/>
@@ -74,10 +74,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/web/sessionDestroyed/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/descriptor/web.xml
index 7eb5ec0..42f4929 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,14 +31,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
index b7c9637..7029616 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
@@ -22,10 +22,10 @@
import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet implements HttpSessionListener {
-
+
public void doGet(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
request.getSession().setAttribute("response", response);
request.getSession().invalidate();
}
@@ -33,7 +33,7 @@
public void sessionCreated(HttpSessionEvent httpSessionEvent) {
// Do nothing
}
-
+
public void sessionDestroyed(HttpSessionEvent httpSessionEvent) {
// Make sure IllegalStateException is not thrown
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java
index f42c552..6bb3f37 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java
@@ -19,8 +19,8 @@
import com.sun.ejte.ccl.reporter.*;
/*
- *
- *
+ *
+ *
*/
public class WebTest {
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for classloader in"
+ "HttpSessionListener.sessionDestroyed()");
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String baseUrl = "http://" + host + ":" + port + contextRoot + "/test";
HttpURLConnection conn = (HttpURLConnection)(new URL(baseUrl + "?timeout=1")).openConnection();
@@ -89,7 +89,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -109,7 +109,7 @@
}
}
}
-
+
private String getSessionId(HttpURLConnection conn) {
String sessionId = null;
String cookieString = conn.getHeaderField("Set-Cookie");
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties
index 8fca3c2..02e10e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-expired"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/sessionDestroyedClassLoader/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/descriptor/web.xml
index 8880429..4a33498 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.MyHttpSessionListener</listener-class>
</listener>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java
index adbd24a..cdc5a5d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java
@@ -52,7 +52,7 @@
adminPassword = args[4];
run = args[5];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 834");
@@ -69,7 +69,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -128,7 +128,7 @@
responseCode + ", expected: " +
HttpURLConnection.HTTP_OK);
}
-
+
String cookie = conn.getHeaderField("set-cookie");
if (cookie == null) {
throw new Exception("Missing Set-Cookie response header");
@@ -160,7 +160,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -208,7 +208,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -260,7 +260,7 @@
String cookie = "Cookie: " + jsessionIdSSO + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -277,7 +277,7 @@
*/
String line = null;
String redirectUrl = "Location: http://" + host + ":" + port
- + contextRoot + "/login.jsp";
+ + contextRoot + "/login.jsp";
while ((line = br.readLine()) != null) {
System.out.println(line);
if (line.equals(redirectUrl)
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties
index 2436933..41149b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-destroyed-during-undeploy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml
index 0bca0af..501545a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -55,10 +55,10 @@
</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
@@ -66,10 +66,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -77,7 +77,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runFirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -107,14 +107,14 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="undeploy-again" depends="init-common">
<antcall target="undeploy"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java
index df18aa7..8137f5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Make sure HttpSessionListener's sessionDestroyed(), and
+ * Make sure HttpSessionListener's sessionDestroyed(), and
* HttpSessionBindingListener's valueUnbound() methods are called when
* session expires.
*
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for "
+ "HttpSessionListener.sessionDestroyed()");
@@ -55,7 +55,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -66,7 +66,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,7 +93,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties
index d09b66a..cd6da55 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-expired"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/sessionExpired/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionExpired/descriptor/web.xml
index a4eec27..6aa8b7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.MyHttpSessionListener</listener-class>
</listener>
@@ -46,7 +46,7 @@
<servlet-name>CheckResult</servlet-name>
<url-pattern>/CheckResult</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
index fd0610c..f6f32ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
@@ -27,17 +27,17 @@
* Notifies the object that it is being bound to a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueBound(HttpSessionBindingEvent event) {
// do nothing
}
-
+
/*
* Notifies the object that it is being unbound from a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueUnbound(HttpSessionBindingEvent event) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java
index ebc0faf..d4e6455 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6275709");
WebTest webTest = new WebTest(args);
@@ -58,8 +58,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeServlet();
} catch (Exception ex) {
ex.printStackTrace();
@@ -76,14 +76,14 @@
}
private void invokeServlet() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/createSession");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties
index 1e8d33f..b086f5a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-id-custom-generator"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml
index 314cbd5..a3aa8db 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -76,10 +76,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="copy-jar" depends="init-common">
<copy file="uuidGeneratorImpl.jar" todir="${env.S1AS_HOME}/domains/domain1/lib"
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java
index 7c26050..4611335 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 4394");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
runTest();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -72,7 +72,7 @@
}
private void runTest() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/createSession" + " HTTP/1.0\n";
@@ -84,7 +84,7 @@
BufferedReader bis = null;
String locationHeader = null;
String cookieHeader = null;
- try {
+ try {
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -116,7 +116,7 @@
if (cookieHeader == null) {
throw new Exception("Missing Set-Cookie response header");
}
-
+
if (locationHeader == null) {
throw new Exception("Missing Location response header");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties
index 84e7866..44efe12 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-id-present-in-both-rewritten-url-and-cookie-by-default"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java
index 766d281..e005dc3 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 4394");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
runTest();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -63,14 +63,14 @@
}
private void runTest() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/createSession" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -88,7 +88,7 @@
if (cookieHeader == null) {
throw new Exception("Missing Set-Cookie response header");
}
-
+
if (locationHeader == null) {
throw new Exception("Missing Location response header");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties
index 78f8c58..2f9a81a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-id-present-only-in-cookie-if-url-rewriting-disabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/sessionIdUrlRewrite/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/WebTest.java
index 91dd8b6..f2d61ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/WebTest.java
@@ -41,15 +41,15 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with session id");
new WebTest(args).doTest();
}
public void doTest() {
-
- try {
+
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -61,14 +61,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -88,7 +88,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -105,7 +105,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties
index a702087..12e3e1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties
@@ -16,7 +16,7 @@
<property name="module" value="web"/>
-<property name="appname" value="${module}-session-id-url-rewrite"/>
+<property name="appname" value="${module}-session-id-url-rewrite"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml
index 1dd1a6a..5c4cd34 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml
@@ -80,7 +80,7 @@
<delete dir="test-report"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -90,16 +90,16 @@
<target name="build" depends="compile">
<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>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.properties
index 78f220f..90acd9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/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="web"/>
-<property name="appname" value="${module}-session-id-url-rewrite"/>
+<property name="appname" value="${module}-session-id-url-rewrite"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/sessionIdUrlRewrite/test/WebTestNG.java b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/WebTestNG.java
index f5ee9d4..13980d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/WebTestNG.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/WebTestNG.java
@@ -40,7 +40,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -63,7 +63,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- assert responseCode == 200;
+ assert responseCode == 200;
bis = new BufferedReader(new InputStreamReader(conn.getInputStream()));
while ((line = bis.readLine()) != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml
index 8a7df52..415d25a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
+
<suite name="web" >
<parameter name="host" value="localhost"/>
<parameter name="port" value="8080"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java
index 6582d5b..77beccb 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 896");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
}
public void doTest() {
-
- try {
+
+ try {
run();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -72,7 +72,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -91,7 +91,7 @@
System.err.println("Wrong number of cookie response headers. ");
System.err.println("Expected 1, got " + cookieCount);
stat.addStatus(TEST_NAME, stat.FAIL);
- } else if (!EXPECTED_COOKIE_HEADER.equals(cookieHeader)) {
+ } else if (!EXPECTED_COOKIE_HEADER.equals(cookieHeader)) {
System.err.println("Wrong cookie response header. ");
System.err.println("Expected: " + EXPECTED_COOKIE_HEADER
+ ", got: " + cookieHeader);
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties
index 532a5d1..63802a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-invalidate-no-cookie-in-response"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/sessionJvmRoute/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/WebTest.java
index ab84cff..38a53eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/WebTest.java
@@ -58,7 +58,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3796");
new WebTest(args).doTest();
@@ -66,7 +66,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -88,7 +88,7 @@
/*
* Create session
- */
+ */
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
System.out.println("Connecting to: " + url);
@@ -109,19 +109,19 @@
throw new Exception("Session cookie does not have any JVMROUTE");
}
- String clientCookie = sessionCookieHeader.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
+ String clientCookie = sessionCookieHeader.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
/*
* Resume session
- */
+ */
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String getRequestLine = "GET " + contextRoot + "/CheckSession" +
" HTTP/1.0\n";
- System.out.println("\nConnecting to: " + getRequestLine);
+ System.out.println("\nConnecting to: " + getRequestLine);
os.write(getRequestLine.getBytes());
os.write(("Cookie: " + clientCookie + "\n").getBytes());
os.write("\n".getBytes());
-
+
sessionCookieHeader = null;
InputStream is = null;
BufferedReader bis = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties
index c128703..b6dd224 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-jvm-route"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml
index e90661e..3173bdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,21 +44,21 @@
</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}"/>
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java
index 8bb40de..c851994 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java
@@ -53,7 +53,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for (de)serialization of "
@@ -73,7 +73,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -84,7 +84,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -129,7 +129,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties
index 48c2178..4ed1d90 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-memory-persist"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml
index 9d30387..d3e4691 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runfirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -84,10 +84,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/web/sessionMemoryPersist/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
index 21fb832..997fc25 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
@@ -32,7 +32,7 @@
InitialContext ic = (InitialContext)
session.getAttribute("JNDIInitialContext");
- boolean passed = false;
+ boolean passed = false;
if ("value1".equals(map.get("name1"))
&& "value2".equals(map.get("name2"))
&& (ic != null)) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java
index 15b0e52..ce0480a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java
@@ -44,7 +44,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6716503");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -74,7 +74,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -118,7 +118,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties
index f2ebd32..4016e14 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-memory-persist-primitive-class"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml
index 9d30387..d3e4691 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runfirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -84,10 +84,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/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml
index e0409f2..fe853f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml
@@ -34,5 +34,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java
index e067e45..a3b236c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java
@@ -46,7 +46,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 6005");
@@ -66,7 +66,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -77,7 +77,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -120,7 +120,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties
index 75e11bf..5e62771 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-preserve-across-redeploy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml
index aaa2d79..6b3b7d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -67,7 +67,7 @@
<param name="operand.props" value="--properties keepSessions=true --name=${appname}-web ${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="redeployKeepState" depends="init-common">
<echo message="Redeploying keepState ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -94,7 +94,7 @@
<param name="run.name" value="third"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -110,7 +110,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
index f6d8fab..73455ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
@@ -32,7 +32,7 @@
InitialContext ic = (InitialContext)
session.getAttribute("JNDIInitialContext");
- boolean passed = false;
+ boolean passed = false;
if ("value1".equals(map.get("name1"))
&& "value2".equals(map.get("name2"))
&& (ic != null)) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java
index 3bbbaeb..ca4139f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java
@@ -44,7 +44,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for keepSessions in session-config/session-properties");
@@ -70,7 +70,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -81,7 +81,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -124,7 +124,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties
index 57fceed..f514187 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-preserve-across-redeploy-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml
index 380e6d8..9e11af6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml
@@ -39,7 +39,7 @@
<delete file="RepRunConf.txt" failonerror="false"/>
<delete file="JSESSIONID" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,16 +47,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -70,7 +70,7 @@
<param name="operand.props" value="--name=${appname}-web ${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="redeploy2" depends="init-common">
<echo message="Redeploying with keepState=false ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -105,7 +105,7 @@
</classpath>
</java>
</target>
-
+
<target name="runthird" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -121,7 +121,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
index 18ed3aa..ce4fc59 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
@@ -27,7 +27,7 @@
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
- boolean resume = false;
+ boolean resume = false;
HttpSession session = req.getSession(false);
if (session != null) {
HashMap map = (HashMap) session.getAttribute("map");
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java
index a9f6858..ab56fc6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java
@@ -23,7 +23,7 @@
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=3137
* (Changing "enableCookies" session property has no effect)
- *
+ *
* Make sure that if the "enableCookies" property at the domain instance level
* is set to FALSE, and the webapp does not override this property to TRUE in
* its sun-web.xml, there will be no session cookie present in the response,
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with session id");
WebTest webTest = new WebTest(args);
@@ -58,8 +58,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeServlet();
} catch (Exception ex) {
ex.printStackTrace();
@@ -84,7 +84,7 @@
}
private void invokeServlet() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
@@ -132,7 +132,7 @@
fail = true;
return;
}
-
+
System.out.println("redirectLine: " + redirectLine);
if (redirectLine == null) {
System.err.println("Missing Location response header");
@@ -154,7 +154,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
fail = true;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties
index 622bf9a..b2da22e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-property-enableCookies-instance-level"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml
index 225c94d..91d9d2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -76,10 +76,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties
index 53e75b2..d30bc91 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-serialize-on-shutdown-only"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java
index faceec8..09aae08 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2003");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -71,6 +71,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties
index e2b0db8..1d983b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-set-attribute-javax-naming-context"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
index a9f146d..3f39148 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
@@ -33,7 +33,7 @@
throw new ServletException(e);
}
- HttpSession httpSession = req.getSession();
+ HttpSession httpSession = req.getSession();
httpSession.setAttribute("JNDIInitialContext", ic);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java
index d6e94a3..0824817 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4661001");
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");
@@ -66,7 +66,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
HttpURLConnection conn = (HttpURLConnection)
@@ -84,9 +84,9 @@
Thread.sleep(5 * 1000);
- // translate server -> client cookie
- String clientCookie = cookie.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
-
+ // translate server -> client cookie
+ String clientCookie = cookie.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
os.write(("GET " + contextRoot + "/CheckSession"
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties
index 4485e86..8529117 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-set-max-inactive-interval-expire"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java
index 6d748e5..7805133 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4688277");
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
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
@@ -79,6 +79,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties
index c2bedaf..c8923b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-set-max-inactive-interval-to-zero-and-invalidate"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
index f27c7cd..3ee35e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
@@ -28,7 +28,7 @@
try {
HttpSession session = req.getSession(true);
session.setMaxInactiveInterval(0);
- session.invalidate();
+ session.invalidate();
} catch (IllegalStateException ise) {
passed = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java
index 878dbed..f36b0fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java
@@ -38,7 +38,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private static final String TEST_NAME = "session-with-cookie-persistence-type";
private String host;
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for cookie-based session persistence");
new WebTest(args).doTest();
@@ -59,7 +59,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -81,7 +81,7 @@
/*
* Create session
- */
+ */
String url = "http://" + host + ":" + port + contextRoot + "/CreateSession";
System.out.println("Connecting to: " + url);
HttpURLConnection conn = (HttpURLConnection)
@@ -117,12 +117,12 @@
/*
* Resume session
- */
+ */
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String getRequestLine = "GET " + contextRoot + "/CheckSession" +
" HTTP/1.0\n";
- System.out.print("\nConnecting to: " + getRequestLine);
+ System.out.print("\nConnecting to: " + getRequestLine);
os.write(getRequestLine.getBytes());
String cookieHeaderLine = "Cookie: " + jsessionIdCookie + "\n";
System.out.print(cookieHeaderLine);
@@ -131,7 +131,7 @@
System.out.print(cookieHeaderLine);
os.write(cookieHeaderLine.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties
index 05bca5b..a1b1611 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-with-cookie-persistence-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml
index cba8bbf..af217ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,21 +44,21 @@
</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}"/>
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml
index 282a9f9..c40d036 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml
@@ -25,6 +25,6 @@
<store-properties>
<property name="cookieName" value="ABC"/>
</store-properties>
- </session-manager>
+ </session-manager>
</session-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java
index ad1d70a..78a2fc8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 13129, session without cookie");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
int a = invoke("/index.jsp");
int b = invoke("/index.jsp;jsessionid=" + sessionId);
int c = invoke("/;jsessionid=" + sessionId);
@@ -69,7 +69,7 @@
*/
private int invoke(String uri)
throws Exception {
-
+
Integer result = null;
URL url = new URL("http://" + host + ":" + port + contextRoot + uri);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties
index 8142350..74679c5 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-session-without-cookie"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml
index 49a5508..5b43ff7 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,16 +45,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -75,11 +75,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -91,10 +91,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java
index 8d6d806..892c14f 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 34113");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties
index 15e22d8..f49625d 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-set-multi-valued-response-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java
index f272b64..12aa395 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java
@@ -43,16 +43,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 32604");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
@@ -72,10 +72,10 @@
if (conn.getHeaderField("A") == null) {
System.err.println("Missing response header 'A'");
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
} else if (conn.getHeaderField("B") == null) {
System.err.println("Missing response header 'B'");
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties
index 535ca76..e835b01 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-set-response-content-length-to-zero-keep-response-headers"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/setWebContextParam/WebTest.java b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/WebTest.java
index 86bb551..24475ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 16222");
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";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,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/web/setWebContextParam/build.properties b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.properties
index 46d34ab..0c176f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-set-web-context-param"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml
index 4f38331..aedb100 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/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,19 +47,19 @@
</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>
@@ -108,7 +108,7 @@
value="--name ${param.name} --value ${param.value} ${appname}-web"/>
</antcall>
</target>
-
+
<target name="unset-web-context-param" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="unset-web-context-param"/>
@@ -128,10 +128,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/web/setWebContextParam/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/descriptor/web.xml
index 28eb734..71617ae 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/descriptor/web.xml
@@ -46,5 +46,5 @@
<servlet-name>mytest</servlet-name>
<url-pattern>/myurl</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java
index 1e050b0..9fffe81 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java
@@ -49,7 +49,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3823");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties
index 3cd067a..9482b37 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-single-sign-on-cookie-http-only"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml
index 896f092..112d670 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml
@@ -37,7 +37,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -63,10 +63,10 @@
</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
@@ -74,14 +74,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -98,7 +98,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java
index 5099fef..15e8305 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java
@@ -49,7 +49,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3823");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties
index 613e26d..8a91956 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-single-sign-on-cookie-secure"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml
index 70bad26..2802489 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -62,10 +62,10 @@
</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
@@ -73,14 +73,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -97,7 +97,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java
index dad2d8e..6a696b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java
@@ -26,7 +26,7 @@
* dynamically reconfigurable"):
*
* This unit test sets the sso-enabled property of http-service to false and
- * restarts the server. It then removes the sso-enabled property of
+ * restarts the server. It then removes the sso-enabled property of
* virtual server "server", so that the sso-enabled property of http-service
* (previously set to false) will take effect. It then sets that property to
* true, and tests whether SSO has been enabled for virtual server "server".
@@ -54,7 +54,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2911");
@@ -67,7 +67,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -94,7 +94,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -130,7 +130,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -165,7 +165,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties
index 5259d76..ab7f720 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-single-sign-on-http-service-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml
index bf5df00..4307a0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -70,23 +70,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}"/>
@@ -103,7 +103,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java
index d64449b..d3df280 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java
@@ -32,7 +32,7 @@
private static final SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private String host;
private String port;
private String contextRoot;
@@ -53,7 +53,7 @@
try {
webTest.doTest(webTest.port, 200);
webTest.doTest(webTest.adminPort, 202);
- // Sleep long enough for the admin console to have been
+ // Sleep long enough for the admin console to have been
// installed and deployed
Thread.currentThread().sleep(60000);
webTest.doTest(webTest.adminPort, 404);
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties b/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties
index 26a5288..f4bb49a 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-single-engine"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml b/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml
index 53f93a0..5ed865b 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,10 +46,10 @@
</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
@@ -57,10 +57,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -68,7 +68,7 @@
<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}"/>
@@ -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/web/singleengine/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleengine/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java
index c89d422..528ef75 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for SSI Escape Character");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -64,7 +64,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.shtml HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties
index 9949dac..e72ae94 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ssi-escape-character"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/ssiHtmlEntity/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/WebTest.java
index 74430ba..e018c2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for SSI Html Entity");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -64,7 +64,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.shtml HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties
index 63e6389..ea80535 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ssi-html-entity"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/ssl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/WebTest.java
index bdc9336..50cc760 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
@@ -43,12 +43,12 @@
SSLSocketFactory ssf = getSSLSocketFactory(trustStorePath);
HttpsURLConnection connection = doSSLHandshake(
"https://" + host + ":" + port + "/", ssf);
- checkStatus(connection);
+ checkStatus(connection);
connection = doSSLHandshake(
- "https://" + host + ":" + port + "/" + contextRoot
+ "https://" + host + ":" + port + "/" + contextRoot
+ "/ServletTest", ssf);
-
+
parseResponse(connection);
} catch (Throwable t) {
t.printStackTrace();
@@ -56,7 +56,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("ssl", stat.FAIL);
- }
+ }
stat.printSummary("web/ssl ---> expect 4 PASS");
}
@@ -89,7 +89,7 @@
throws Exception{
int responseCode= connection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (connection.getResponseCode() != 200){
stat.addStatus("ssl-responseCode", stat.FAIL);
} else {
@@ -101,7 +101,7 @@
throws Exception{
BufferedReader in = null;
-
+
String line = "";
int index;
try {
@@ -129,7 +129,7 @@
stat.addStatus("ssl-FILTER", stat.FAIL);
}
count++;
- }
+ }
}
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/build.properties b/appserver/tests/appserv-tests/devtests/web/ssl/build.properties
index d177c6d..90ee4d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-ssl"/>
+<property name="appname" value="${module}-ssl"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-ssl"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/build.xml b/appserver/tests/appserv-tests/devtests/web/ssl/build.xml
index 3dab601..437726f 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
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,prepare-keystore-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/web/ssl/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/ssl/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
index 8d111ac..14c8e29 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,23 +39,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
index c5a381a..1a9e687 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
@@ -25,11 +25,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,12 +37,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java
index fc433a6..5b6739f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java
@@ -33,7 +33,7 @@
public class WebTest {
private static final String TEST_NAME
- = "ssl-client-auth-unprotected-resource-get-client-cert";
+ = "ssl-client-auth-unprotected-resource-get-client-cert";
private static final String EXPECTED_RESPONSE
= "[Ljava.security.cert.X509Certificate;";
@@ -49,7 +49,7 @@
String contextRoot = args[2];
String keyStorePath = args[3];
String trustStorePath = args[4];
-
+
try {
SSLSocketFactory ssf = getSSLSocketFactory(keyStorePath,
trustStorePath);
@@ -57,9 +57,9 @@
+ port + contextRoot
+ "/TestServlet",
ssf);
-
+
parseResponse(connection);
-
+
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
t.printStackTrace();
@@ -76,7 +76,7 @@
try {
in = new BufferedReader(new InputStreamReader(
connection.getInputStream()));
-
+
String line = null;
while ((line = in.readLine()) != null) {
if (EXPECTED_RESPONSE.equals(line)) {
@@ -105,7 +105,7 @@
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = "changeit".toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -121,7 +121,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties
index b179cce..14681ae 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ssl-client-auth-unprotected-resource-get-client-cert"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml
index fa5becc..0929bbd 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -85,10 +85,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml
index c2a768e..f55cb9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
index 5588468..8a3cb11 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
@@ -29,7 +29,7 @@
String clName = null;
if (cert != null) {
clName = cert.getClass().getName();
- }
+ }
res.getWriter().print(clName);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java
index 85202a3..6802188 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
private static boolean firstConnection = true;
@@ -51,19 +51,19 @@
+ "/ServletTest;jsessionid=01A960C22480CE9F445CDE48DE333F31", ssf);
parseResponse(connection);
-
+
firstConnection = false;
connection = doSSLHandshake(
- "https://" + host + ":" + port + "/" + contextRoot
+ "https://" + host + ":" + port + "/" + contextRoot
+ "/ServletTest;jsessionid=" + sessionFalseId, ssf);
parseResponse(connection);
-
+
} catch (Throwable t) {
t.printStackTrace();
} finally {
if (count != EXPECTED_COUNT){
stat.addStatus("web-sslCookie", stat.FAIL);
- }
+ }
}
@@ -101,8 +101,8 @@
throws Exception{
BufferedReader in = null;
-
- String line= "";
+
+ String line= "";
int index = 0;
try {
in = new BufferedReader(
@@ -116,7 +116,7 @@
System.out.println("context: " + context + " status: " + status);
if (firstConnection){
if ( context.equalsIgnoreCase("getRequestSessionId") )
- requestedSessionId = status;
+ requestedSessionId = status;
else if ( context.equalsIgnoreCase("getSession(false).getId")) {
sessionFalseId = status;
} else if ( context.equalsIgnoreCase("getRequestURI"))
@@ -148,7 +148,7 @@
}
}
count++;
- }
+ }
}
lineNum++;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties
index c7a6de5..58b7e31 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-sslCookie"/>
+<property name="appname" value="${module}-sslCookie"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-sslCookie"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml
index 49c2e2e..437726f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
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,prepare-keystore-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/web/sslCookie/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslCookie/descriptor/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/descriptor/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
index bdf5138..92f449e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
@@ -24,11 +24,11 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,9 +39,9 @@
private static boolean sessionCreated = false;
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
@@ -49,7 +49,7 @@
System.out.println("Create session: " + request.getSession(true).getId());
sessionCreated = true;
}
-
+
out.println("getRequestSessionId::" + request.getRequestedSessionId());
System.out.println("getRequestSessionId::" + request.getRequestedSessionId());
@@ -59,13 +59,13 @@
}
out.println("getRequestURI::" + request.getRequestURI());
System.out.println("getRequestURI::" + request.getRequestURI());
-
+
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java
index 09ecb96..d41aaf0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
@@ -43,12 +43,12 @@
SSLSocketFactory ssf = getSSLSocketFactory(trustStorePath);
HttpsURLConnection connection = doSSLHandshake(
"https://" + host + ":" + port + "/", ssf);
- checkStatus(connection);
+ checkStatus(connection);
connection = doSSLHandshake(
- "https://" + host + ":" + port + "/" + contextRoot
+ "https://" + host + ":" + port + "/" + contextRoot
+ "/ServletTest", ssf);
-
+
parseResponse(connection);
} catch (Throwable t) {
t.printStackTrace();
@@ -56,7 +56,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("multiSelector-ssl", stat.FAIL);
- }
+ }
stat.printSummary("sslMultiSelector");
}
@@ -89,7 +89,7 @@
throws Exception{
int responseCode= connection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (connection.getResponseCode() != 200){
stat.addStatus("multiSelector-responseCode", stat.FAIL);
} else {
@@ -102,7 +102,7 @@
BufferedReader in = new BufferedReader(
new InputStreamReader(connection.getInputStream()));
-
+
String line = "";
int index;
while ((line = in.readLine()) != null) {
@@ -111,15 +111,15 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("multiSelector-" + line.substring(0,index),
stat.PASS);
} else {
- stat.addStatus("multiSelector-filter", stat.FAIL);
+ stat.addStatus("multiSelector-filter", stat.FAIL);
}
count++;
- }
+ }
}
in.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties
index 4acc4d3..0cc2e0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-sslMultiSelector"/>
+<property name="appname" value="${module}-sslMultiSelector"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/sslMultiSelector"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml
index c70cafc..dfbd656 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,7 +55,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -72,7 +72,7 @@
value="configs.config.server-config.network-config.transports.transport.tcp.acceptor-threads="/>
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -82,7 +82,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -95,10 +95,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/web/sslMultiSelector/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
index 8d111ac..14c8e29 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,23 +39,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
index c5a381a..1a9e687 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
@@ -25,11 +25,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,12 +37,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties
index 6e23320..82283e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-serverName"/>
+<property name="appname" value="${module}-serverName"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-serverName"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml
index 0a5a20b..54ea946 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,26 +42,26 @@
</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="."
- debug="true"
+ debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.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,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -74,10 +74,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/web/sslServerName/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslServerName/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java
index 280499c..c82073c 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone Servlet/Filter war test");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-requestdispatcher", stat.FAIL);
- }
+ }
stat.printSummary("web-requestdispatcher");
}
@@ -68,7 +68,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -81,18 +81,18 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-requestdispatcher: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-requestdispatcher: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-requestdispatcher: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties b/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties
index 12ef4ba..214c62b 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-requestdispatcher"/>
+<property name="appname" value="${module}-requestdispatcher"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-requestdispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml b/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml
index 1d98269..6b80157 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -78,11 +78,11 @@
</target>
<target name="clobber" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
-
+ </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/web/standalonewar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/standalonewar/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -65,7 +65,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java
index dc1b115..d5ef651 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java
@@ -66,17 +66,17 @@
/*
* Returns true in case of success, false otherwise.
*/
- private static boolean doTest(String urlString,
+ private static boolean doTest(String urlString,
String expected1,
String expected2,
String expected3) {
- try {
+ try {
URL url = new URL(urlString);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.out.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
return false;
@@ -96,8 +96,8 @@
if (!found) {
System.out.println("Invalid response. Response did not " +
- "contain one of the expected strings: " +
- expected1 + "," +
+ "contain one of the expected strings: " +
+ expected1 + "," +
expected2 + "," +
expected3);
return false;
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties
index d7ec091..87bcd9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties
@@ -18,7 +18,7 @@
<property name="module" value="web"/>
<property name="appname" value="${module}-tag-plugin-for-each"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml
index 72f4fcb..9609ac8 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml
@@ -88,16 +88,16 @@
<target name="build" depends="compile">
<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>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties
index 96217b3..7c66b08 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-tag-plugin-for-each"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml
index f6e78fb..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
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}"/>
@@ -72,10 +72,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/web/tagPluginForEach/test/WebTestNG.java b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/WebTestNG.java
index 435a0b0..6c74770 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/WebTestNG.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/WebTestNG.java
@@ -54,13 +54,13 @@
* Returns true in case of success, false otherwise.
*/
private static boolean doTest(String urlString, String expected) {
- try {
+ try {
URL url = new URL(urlString);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.out.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
return false;
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml
index 354f426..6b2204d 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
+
<suite name="web" >
<parameter name="host" value="localhost"/>
<parameter name="port" value="8080"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java
index 93789b3..c1a0efa 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for Bugzilla 28361 ("foreach no longer works in tag file")
+ * Unit test for Bugzilla 28361 ("foreach no longer works in tag file")
*/
public class WebTest {
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 28361");
WebTest webTest = new WebTest(args);
@@ -62,7 +62,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
@@ -83,7 +83,7 @@
if (br != null) br.close();
} catch (IOException ex) {}
}
-
+
if (!found) {
throw new Exception("Invalid response. Response did not " +
"contain expected: " + EXPECTED);
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties
index d3c6b09..086699f 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-tag-plugin-for-each-tag-file"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml
index f6e78fb..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
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}"/>
@@ -72,10 +72,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/web/tagfileInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/WebTest.java
index 59e47ba..9d49174 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/WebTest.java
@@ -20,7 +20,7 @@
import com.sun.ejte.ccl.reporter.*;
-public class WebTest {
+public class WebTest {
static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -36,7 +36,7 @@
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus(TEST_NAME, stat.PASS);
@@ -73,7 +73,7 @@
if (line.indexOf("PASS") >= 0) {
pass = true;
break;
- }
+ }
}
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties
index ed4e907..609d2ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-tagfile-include"/>
+<property name="appname" value="${module}-tagfile-include"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tagfiles" value="descriptor/tags"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml
index dbbff4e..2196088 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml
@@ -37,7 +37,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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
@@ -56,10 +56,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -67,7 +67,7 @@
<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/web/tagplugin/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagplugin/WebTest.java
index 3cb8c23..3d6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagplugin/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagplugin/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Tag Plugin test");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus("Tag Plugin test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -73,10 +73,10 @@
int index = line.indexOf("PASS");
if (index >= 0) {
pass = true;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties b/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties
index 2a958e4..36601e9 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-tagplugin"/>
+<property name="appname" value="${module}-tagplugin"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml b/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/testFormAuthenticator/WebTest.java b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/WebTest.java
index b307f08..c968f7c 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/WebTest.java
@@ -44,7 +44,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Tomcat bug 49779");
diff --git a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties
index c20c66e..536c1c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-test-form-authenticator"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml
index 3af87a2..54ee385 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -53,24 +53,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="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.APS_HOME}/lib/webtest.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">
<sysproperty key="debug" value="false"/>
@@ -89,7 +89,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml
index 7fc605e..5e78032 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java
index fdde2ef..e307291 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java
@@ -20,33 +20,33 @@
import com.sun.appserv.test.util.results.SimpleReporterAdapter;
public class WebTest {
- private static final SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", "thread-pool-idle-timeout");
+ private static final SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", "thread-pool-idle-timeout");
- public static void main(String args[]) {
- stat.addDescription("HTTP thread timeout");
+ public static void main(String args[]) {
+ stat.addDescription("HTTP thread timeout");
- String host = args[0];
- String portS = args[1];
- String contextRoot = args[2];
- boolean noTimeout = args.length == 4;
+ String host = args[0];
+ String portS = args[1];
+ String contextRoot = args[2];
+ boolean noTimeout = args.length == 4;
- int port = new Integer(portS);
+ int port = new Integer(portS);
- goGet(host, port, contextRoot + "/ServletTest", noTimeout );
+ goGet(host, port, contextRoot + "/ServletTest", noTimeout );
- stat.printSummary("web-thread-timeout");
- }
+ stat.printSummary("web-thread-timeout");
+ }
- private static void goGet(String host, int port, String contextPath, boolean noTimeout) {
- try {
- URL url = new URL("http://" + host + ":" + port + contextPath);
- url.getContent();
- stat.addStatus("web-thread-timeout" + (noTimeout ? "-debug" : ""), noTimeout ? SimpleReporterAdapter.PASS : SimpleReporterAdapter.FAIL);
- } catch( IOException ex){
- stat.addStatus("web-thread-timeout", noTimeout ? SimpleReporterAdapter.FAIL : SimpleReporterAdapter.PASS);
- } catch( Exception ex){
- stat.addStatus("web-thread-timeout", SimpleReporterAdapter.FAIL);
- ex.printStackTrace();
- }
- }
+ private static void goGet(String host, int port, String contextPath, boolean noTimeout) {
+ try {
+ URL url = new URL("http://" + host + ":" + port + contextPath);
+ url.getContent();
+ stat.addStatus("web-thread-timeout" + (noTimeout ? "-debug" : ""), noTimeout ? SimpleReporterAdapter.PASS : SimpleReporterAdapter.FAIL);
+ } catch( IOException ex){
+ stat.addStatus("web-thread-timeout", noTimeout ? SimpleReporterAdapter.FAIL : SimpleReporterAdapter.PASS);
+ } catch( Exception ex){
+ stat.addStatus("web-thread-timeout", SimpleReporterAdapter.FAIL);
+ ex.printStackTrace();
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml
index 3dbc077..771a4ed 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml
@@ -75,7 +75,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar" includes="WebTest.java"/>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common"/>
<target name="deploy" depends="init-common">
@@ -118,7 +118,7 @@
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
<target name="startDomainDebug" depends="startDomainDebugUnix, startDomainDebugWindows"/>
<target name="startDomainDebugUnix" depends="init-common" if="isUnix">
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
index e854149..157c4b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
@@ -24,17 +24,17 @@
public class ServletTest extends HttpServlet {
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doPost(request, response);
- }
+ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ doPost(request, response);
+ }
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- try {
- Thread.sleep(10000);
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ try {
+ Thread.sleep(10000);
response.setContentType("text/plain");
- response.getWriter().println("Here's your content.");
- } catch(InterruptedException ie) {
- throw new IOException(ie);
- }
- }
+ response.getWriter().println("Here's your content.");
+ } catch(InterruptedException ie) {
+ throw new IOException(ie);
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java
index 4c0474b..09cfd6e 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat = new SimpleReporterAdapter(
"appserv-tests");
-
+
public static void main(String args[]) {
String host = args[0];
@@ -41,7 +41,7 @@
try {
stat.addDescription("Trace not allowed test");
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/ServletTest");
System.out.println("Invoking url: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties
index af173ff..0dded5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-traceEnabled"/>
+<property name="appname" value="${module}-traceEnabled"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-traceEnabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml
index 0481197..f341ad4 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -60,16 +60,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -77,7 +77,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -94,10 +94,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/web/traceEnabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/traceEnabled/descriptor/web.xml
index 196a604..81e62e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java
index 03dcc4e..3a6258b 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT GLASSFISH-16768");
@@ -74,7 +74,7 @@
// trailing headers size limit
// need to set maxTrailerSize = 10
String dummy = "01234567890";
-
+
req = new String[] {
"POST /" + webTest.contextRoot + " HTTP/1.1" + CRLF +
"Host: any" + CRLF +
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties
index e6f18e2..579be17 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-trailer-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml
index 05c71d8..82ae005 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml
@@ -37,7 +37,7 @@
<fileset dir="${basedir}" includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,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}"/>
@@ -73,10 +73,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/web/trailerHeader/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/trailerHeader/descriptor/web.xml
index d0af1b2..0093c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/descriptor/web.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
-
+
<servlet>
<servlet-name>EchoHeaderServlet</servlet-name>
<servlet-class>EchoHeaderServlet</servlet-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java
index b0b163e..8a0a5d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 2;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Package protection unit test.");
String host = args[0];
@@ -41,13 +41,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
@@ -64,7 +64,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -76,20 +76,20 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-unprotectedClass: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-unprotectedClass: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-unprotectedClass: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties
index c6accbe..ffa0d0d 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-unprotectedClass"/>
+<property name="appname" value="${module}-unprotectedClass"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-unprotectedClass"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml
index a908918..e2fc254 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
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}"/>
@@ -72,10 +72,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/web/unprotectedClasses/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/descriptor/web.xml
index 7eb5ec0..42f4929 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,14 +31,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
index 2e827b5..f1226cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
@@ -35,7 +35,7 @@
private ServletContext context;
private static String status = "EXPIRED:FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -46,7 +46,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java
index 28f728f..490f606 100644
--- a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7246");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties
index 65e38aa..2c83bb1 100644
--- a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-use-bundled-jsf-with-tag-compilationn"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml
index da25b1a..89664d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<property name="hasWebclient" value="yes"/>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -50,7 +50,7 @@
dest="jsf-cardemo.war"/>
<antcall target="deploy-war-name"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -62,10 +62,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-name"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java
index d4ef135..f11bb88 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode == 200){
stat.addStatus("v3HttpListenerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java
index a32d62e..7e987df 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("v3HttpListenerDynamicConfig-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties
index 715c022..1141e80 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-v3HttpListenerDynamicConfig"/>
+<property name="appname" value="${module}-v3HttpListenerDynamicConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml
index 7df95f7..e97cccd 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml
@@ -50,7 +50,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -80,7 +80,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -92,7 +92,7 @@
</classpath>
</java>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -107,7 +107,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java
index 85babbf..b0f98f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java
@@ -24,11 +24,11 @@
* prior to V3), which has been renamed to
* org.glassfish.web.valve.GlassFishValve in V3, continue to work in V3
* (in a binary-compatible way).
- *
+ *
* This test deploys a webapp that specifies a GlassFish-style valve
* (compiled against the "old" Valve interface) in its sun-web.xml.
* The valve adds an attribute to the request.
- *
+ *
* When the test accesses the webapp's servlet, the servlet checks for the
* presence of this attribute in the request, and will cause the test to fail
* if the attribute is missing.
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ensuring binary compatibility " +
@@ -67,11 +67,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -91,7 +91,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " +
line);
}
@@ -110,6 +110,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties
index 479b58e..af12b4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-valve-glassFish-style-backward-compatible"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/valveTomcatStyle/WebTest.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/WebTest.java
index 6d6d8ca..cdc346d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/WebTest.java
@@ -20,12 +20,12 @@
/*
* Unit test for testing support for Tomcat-style valves.
- *
+ *
* This test deploys a webapp that specifies 3 valves in its sun-web.xml:
* 2 Tomcat-style valves, and 1 GlassFish-style valve. The GlassFish-style
* valve is added in between the two Tomcat-style valves, causing it to be
* wrapped (by the container) inside a TomcatValveAdapter.
- *
+ *
* Each of the valves adds an attribute to the request.
*
* When the test accesses the webapp's servlet, it checks for the presence
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Tomcat-style valves");
@@ -64,11 +64,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -88,7 +88,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " +
line);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties
index 3d49adc..c261924 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-valve-tomcat-style"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
index b9aaf64..9a0ef31 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_1 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
index ef2df6e..1b735b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_2 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java
index 8cfe849..8c6ecae 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java
@@ -23,12 +23,12 @@
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=7177
* ("Add valve configuration support to sun-web.xml")
- *
+ *
* This test deploys a webapp that specifies 3 valves in its sun-web.xml:
* 2 Tomcat-style valves, and 1 GlassFish-style valve. The GlassFish-style
* valve is added in between the two Tomcat-style valves, causing it to be
* wrapped (by the container) inside a TomcatValveAdapter.
- *
+ *
* Each of the valves adds an attribute to the request.
*
* When the test accesses the webapp's servlet, it checks for the presence
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7177");
@@ -67,11 +67,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -91,10 +91,10 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " +
line);
- }
+ }
} finally {
try {
if (is != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties b/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties
index 7c2c918..52508d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-valve-with-properties"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml b/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/valveWithParams/lib/valves/TestValve2.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
index ef48b6b..892ab9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
@@ -34,10 +34,10 @@
if (testProperty == null) {
request.getRequest().setAttribute("valve6", "null_value");
}
- else if ("".equals(testProperty)) {
+ else if ("".equals(testProperty)) {
request.getRequest().setAttribute("valve5", "empty_value");
}
- else {
+ else {
request.getRequest().setAttribute("valve4", testProperty);
}
return GlassFishValve.INVOKE_NEXT;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java
index 1d376ac..7859edc 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java
@@ -78,7 +78,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -86,8 +86,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
invoke("/config/login.conf", "fileRealm");
@@ -104,7 +104,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties
index f88a2e9..07c321f 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-alternate-docroot"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml
index 7878c20..950db36 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml
@@ -36,14 +36,14 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
</target>
<target name="build" depends="compile"/>
-
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -54,12 +54,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=*.policy dir=${env.S1AS_HOME}/domains/${admin.domain}/config""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_3="from=/config/* dir=${env.S1AS_HOME}/domains/${admin.domain}""/>
- </antcall>
+ </antcall>
</target>
<target name="run" depends="init-common">
@@ -72,7 +72,7 @@
</classpath>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java
index baf8f80..19374c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java
@@ -81,7 +81,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -89,8 +89,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
invoke("/config/login.conf", "fileRealm");
@@ -107,7 +107,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties
index 8d466b6..b01fa65 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-alternate-docroot-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml
index 280e705..645eb18 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -64,12 +64,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=*.policy dir=${env.S1AS_HOME}/domains/${admin.domain}/config""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_3="from=/config/* dir=${env.S1AS_HOME}/domains/${admin.domain}""/>
- </antcall>
+ </antcall>
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -81,7 +81,7 @@
<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}"/>
@@ -93,10 +93,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java
index 18bfcef..3a635f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/**
- * Unit test for issue 16252
+ * Unit test for issue 16252
*
* Unit test for dynamic reconfiguration of alternate docroot support.
*
@@ -77,7 +77,7 @@
private String host;
private String port;
private String contextRoot;
- private String expectedResponseCode;
+ private String expectedResponseCode;
private boolean result = true;
public WebTest(String[] args) {
@@ -86,7 +86,7 @@
contextRoot = args[2];
expectedResponseCode = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -94,8 +94,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
invoke("/config/login.conf", "fileRealm");
@@ -113,7 +113,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
try {
URL url = new URL("http://" + host + ":" + port + uri);
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties
index 8d466b6..b01fa65 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-alternate-docroot-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml
index 16d6f1e..a28f8d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -64,12 +64,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=*.policy dir=${env.S1AS_HOME}/domains/${admin.domain}/config""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_3="from=/config/* dir=${env.S1AS_HOME}/domains/${admin.domain}""/>
- </antcall>
+ </antcall>
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -96,7 +96,7 @@
<target name="restart" depends="init-common">
<antcall target="restart-server"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -143,7 +143,7 @@
<arg line="${as.props}"/>
<arg line="test"/>
</exec>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java
index e0b4497..995894e 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java
@@ -53,7 +53,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -61,8 +61,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties
index d812d56..002aa72 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-alternate-docroot-welcomepage-redirect"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml
index 1ef146e..3fa5f52 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml
@@ -40,7 +40,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,28 +48,28 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="create-alternate-resources"/>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_1="from=/mytest dir=/tmp""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=/mytest/* dir=/tmp""/>
- </antcall>
+ </antcall>
</target>
<target name="create-alternate-resources" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java
index 290a1d0..56a1259 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java
@@ -56,7 +56,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1537");
@@ -69,7 +69,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -99,7 +99,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -147,7 +147,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -195,7 +195,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -247,7 +247,7 @@
String cookie = "Cookie: " + jsessionIdSSO + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties
index fc27c60..fd77e5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-auth-realm-property"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml
index 34927d2..d5fe00c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -97,7 +97,7 @@
<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}"/>
@@ -111,10 +111,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/web/virtualServerAuthRealmProperty/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/descriptor/web.xml
index df4cebd..e567e6c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/descriptor/web.xml
@@ -24,12 +24,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
<role-name>admin</role-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java
index 519ca89..b53ff8c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 4408");
WebTest webTest = new WebTest(args);
@@ -60,8 +60,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -71,7 +71,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties
index fce9a95..97dd757 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-change-http-listener-webapp-no-longer-accessible"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml
index bb9281b..2a33dba 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="create-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-virtual-server" />
@@ -91,7 +91,7 @@
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
- <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"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -99,11 +99,11 @@
<arg line="${as.props}"/>
<arg line="--contextroot ${contextroot}"/>
<arg line="--virtualservers myvs"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -115,10 +115,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="delete-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java
index 944e2fd..835cf55 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 6043");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/ HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties
index d16cf3e..cd246d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-create-upper-case-deploy-exclusive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml
index 6e23871..0799220 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,20 +44,20 @@
</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">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
@@ -65,11 +65,11 @@
<arg line="--contextroot ${contextroot}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers TestServer"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</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="create-vs" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java
index 8c1a7d4..8fd8847 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for virtual server default-web-module");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/index.html");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties
index 62791be..63ec5b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-default-web-module"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml
index 4688ce0..4ce95ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java
index 8d31ad2..6cb2aab 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java
@@ -49,7 +49,7 @@
adminUser = args[2];
adminPassword = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4438");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -123,7 +123,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties
index ec4ba2e..e012098 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-default-web-module-form-login-jsecurity-check-direct-access"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml
index 74e9ecc..c0b9e44 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -72,7 +72,7 @@
<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}"/>
@@ -85,10 +85,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java
index e527a01..c4817fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java
@@ -46,7 +46,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6526113");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/index.html");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties
index afd4a3d..a9518b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-default-web-module-restart"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml
index c8286c7..eae9d4c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setDefaultWebModule" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -111,10 +111,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="unsetDefaultWebModule" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -122,7 +122,7 @@
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.${new-virtual-server}.default-web-module="/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java
index 01ac453..53a318b 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for virtual server default-web-module");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -63,7 +63,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties
index 2ec5523..60c4fef 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-default-web-module-request-dispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml
index 4688ce0..4ce95ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java
index 4b62e35..c6f3256 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3710");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeAtRootContext();
invokeAtContextRoot();
stat.addStatus(TEST_NAME, stat.PASS);
@@ -66,7 +66,7 @@
}
private void invokeAtRootContext() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
"/checkRequestPath?run=first");
System.out.println("Connecting to: " + url.toString());
@@ -91,7 +91,7 @@
}
private void invokeAtContextRoot() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/checkRequestPath?run=second");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties
index d050c26..62e068b 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-default-web-module-request-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml
index 284c29d..567cda8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -67,7 +67,7 @@
<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="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
index 1449e96..00d5001 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
@@ -30,7 +30,7 @@
String expectedCtxtRoot = null;
String expectedRequestURL = null;
String expectedRequestURI = null;
-
+
String run = req.getParameter("run");
if ("first".equals(run)) {
expectedCtxtRoot = "";
@@ -41,7 +41,7 @@
expectedCtxtRoot =
"/web-virtual-server-default-web-module-request-path";
expectedRequestURI = expectedCtxtRoot + servletPath;
- expectedRequestURL = "http://" + host + ":" + port +
+ expectedRequestURL = "http://" + host + ":" + port +
expectedRequestURI;
} else {
throw new ServletException();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java
index 028b83a..a3d5104 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for dynamic reconfiguration of docroot");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
stat.addStatus(TEST_NAME, stat.PASS);
@@ -62,7 +62,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties
index 85541f7..e121a25 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-docroot-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml
index 73d8a77..ccfb256 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -75,7 +75,7 @@
<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}"/>
@@ -87,10 +87,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/web/virtualServerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/WebTest.java
index 7bd70b0..4b3fe77 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("virtualServerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties
index a481b53..5ab3519 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-virtualServerDynamicConfig"/>
+<property name="appname" value="${module}-virtualServerDynamicConfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-virtualServerDynamicConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml
index a1f5c19..4184fb3 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml
@@ -66,7 +66,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -74,10 +74,10 @@
</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
@@ -85,10 +85,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -96,7 +96,7 @@
<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}"/>
@@ -108,10 +108,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/web/virtualServerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java
index 62ddc52..5eb1f02 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java
@@ -25,7 +25,7 @@
* ("WAR from an EAR as default webapp no more working after stop/start")
*
* This unit test deploys an EAR, dynamically configures the EAR's embedded
- * WAR as the default-web-module of virtual server "server", accesses the
+ * WAR as the default-web-module of virtual server "server", accesses the
* WAR's JSP resource under both the WAR's context root and the empty context
* root, stops and restarts the domain, and accesses the WAR's JSP resouce
* again (under both the WAR's context root and the empty context root).
@@ -46,7 +46,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 542");
@@ -65,13 +65,13 @@
}
public void doTest(String uri) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties
index 0c820e8..2444cd2 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-virtual-server-ear-wrapped-default-web-module-restart"/>
+<property name="appname" value="${module}-virtual-server-ear-wrapped-default-web-module-restart"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml
index 7694f01..99882c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -64,11 +64,11 @@
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.jar, *.war"/>
</ear>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
+ </target>
<target name="runfirst" depends="init-common">
<java classname="WebTest">
@@ -93,7 +93,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java
index ec6ab2c..dc5aff6 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java
@@ -34,14 +34,14 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -49,14 +49,14 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/index.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java
index fcff499..67edb9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java
@@ -42,7 +42,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Virtual Server log file");
WebTest2 webTest = new WebTest2(args);
@@ -50,8 +50,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -61,7 +61,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -69,7 +69,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties
index 3a84c05..d90df30 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-log-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml
index efaa760..90a2003 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -130,7 +130,7 @@
<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}"/>
@@ -157,7 +157,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/vslogs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
index b6cc341..d9c2dd8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
@@ -28,6 +28,6 @@
System.out.println("Checking file location "+location+"/domains/domain1/logs/vslogs");
if (files != null && files.length == 2) {
resp.getWriter().println("SUCCESS!");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java
index a3e7265..03301d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java
@@ -26,7 +26,7 @@
* virtual servers get lost")
*
* This unit test does the following:
- *
+ *
* - Creates virtual server myvs, and associates it with http-listener-1
* - Deploys webapp to myvs, and assigns this webapp as the default-web-module
* of myvs
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4407");
WebTest webTest = new WebTest(args);
@@ -61,8 +61,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeAtContextRoot();
invokeAtRootContext();
stat.addStatus(TEST_NAME, stat.PASS);
@@ -73,7 +73,7 @@
}
private void invokeAtContextRoot() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/ HTTP/1.1\n";
@@ -102,7 +102,7 @@
}
private void invokeAtRootContext() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET / HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties
index 33e21ae..b5dad7d 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-default-web-module-modify-http-listener-port"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml
index 8e5baf8..0bcef64 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,20 +44,20 @@
</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">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
@@ -65,11 +65,11 @@
<arg line="--contextroot ${contextroot}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers myvs"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</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="create-vs" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java
index 7d56a38..3291680 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6861682");
WebTest webTest = new WebTest(args);
@@ -63,8 +63,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet("/portal/directory",
EXPECTED_LOCATION_RESPONSE_HEADER);
stat.addStatus(TEST_NAME, stat.PASS);
@@ -78,7 +78,7 @@
private void invokeServlet(String uri, String expectedRedirect)
throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties
index eef5e41..e6367ae 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-redirect-property-no-substring-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml
index 5e01576..1d0707d 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java
index 8b96562..116084c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6330300");
WebTest webTest = new WebTest(args);
@@ -60,8 +60,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -70,14 +70,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET /someprefix/1234 HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties
index 89b33d0..966f5fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-redirect-property-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml
index e0961c3..617e791 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java
index 9ce067e..03396e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java
@@ -54,7 +54,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6330300");
WebTest webTest = new WebTest(args);
@@ -62,8 +62,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -72,14 +72,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET /someprefix/5678 HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties
index b66e7df..a6177a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-redirect-property-url-prefix"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml
index 134c6c5..bde88a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,7 @@
<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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java
index fef22e6..f8f3286 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6324911");
WebTest webTest = new WebTest(args);
@@ -82,7 +82,7 @@
os.write("\n".getBytes());
boolean statusHeaderFound = false;
- boolean bodyLineFound = false;
+ boolean bodyLineFound = false;
BufferedReader br = null;
try {
InputStream is = sock.getInputStream();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties
index 4da4357..bfc8031 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-send-error-property"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml
index 5f8dd01..0541bb2 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java
index 157e7d9..fa5f618 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java
@@ -29,8 +29,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -47,12 +47,12 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
- System.out.println("virtual-server-send-error-property-broken-webapp: " + responseCode + " Expected code: 404");
+ System.out.println("virtual-server-send-error-property-broken-webapp: " + responseCode + " Expected code: 404");
if (urlConnection.getResponseCode() != 404){
stat.addStatus("Test virtual-server-send-error-property-broken-webapp", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties
index 47810cc..a79b307 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-send-error-property-broken-webapp"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml
index 7ba9afb..de29066 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml
@@ -54,7 +54,7 @@
value="${appserver.instance.name}.http-service.virtual-server.server.property.send-error_1="/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -62,24 +62,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="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/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml
index 29ac78b..c7df9d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
index 0b9e2e9..d89beab 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
@@ -46,11 +46,11 @@
public class ServletTest extends HttpServlet{
private String status = "virtual-server-send-error-property-broken-webapp::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,16 +58,16 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println(status);
response.setContentType("text/html");
-
+
status = "virtual-server-send-error-property-broken-webapp:::FAIL";
out.println(status);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java
index dec3635..d33dc1a 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java
@@ -66,12 +66,12 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for disabling a virtual server");
WebTest webTest = new WebTest(args);
- try {
+ try {
if ("on".equals(webTest.run)) {
TEST_NAME = TEST_ROOT_NAME + "-on";
webTest.onRun();
@@ -96,7 +96,7 @@
* server.
*/
private void onRun() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties
index 0783426..c5a22d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-state-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml
index 746fad3..757ce1f 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml
@@ -42,7 +42,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -50,17 +50,17 @@
</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="deploy" depends="init-common">
- <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"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -70,14 +70,14 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers myvs"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-virtual-server-myvs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java
index e4a9758..3c18557 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java
@@ -26,7 +26,7 @@
* "myhost", deploys a webapp to it, and accesses the webapp by specifying
* a Host header equal to "myhost" in the request.
*
- * The test then updates the virtual server's "hosts" attribute to
+ * The test then updates the virtual server's "hosts" attribute to
* "mynewhost", and ensures that the webapp may still be accessed when
* specifying a Host header equal to "mynewhost" in the request.
*/
@@ -52,7 +52,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6712778");
@@ -80,7 +80,7 @@
* is mapped to the virtual server.
*/
private void firstRun() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
@@ -115,7 +115,7 @@
* is mapped to the updated virtual server.
*/
private void secondRun() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties
index 4210a58..0e977d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-update-hosts-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml
index a326061..ecb11f1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="create-virtual-server"/>
</target>
@@ -89,10 +89,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="create-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java
index a4ecf81..ad09bf5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6573545");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties
index b04c3f9..584e26e 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-update-http-listeners-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml
index 3305679..eb654b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="create-virtual-server-vs1" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-virtual-server" />
@@ -96,7 +96,7 @@
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
- <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"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -106,11 +106,11 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers vs2"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -122,10 +122,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="delete-virtual-server-vs1" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java
index 4db1fae..bb82ac4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java
@@ -40,7 +40,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 17093");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties
index 5fbb9ac..9a781fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-with-custom-error-report-valve"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml
index bd294be..dc0aa37 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml
@@ -37,7 +37,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,16 +51,16 @@
</jar>
<delete dir="${build.classes.dir}/custom"/>
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="copyJarToDomainLib"/>
<antcall target="restart-server-instance-common"/>
@@ -82,7 +82,7 @@
<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}"/>
@@ -94,10 +94,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeJarFromDomainLib"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java
index ffabb26..c39f0c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11674");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -77,7 +77,7 @@
String line = input.readLine();
System.out.println(line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties
index f446ac4..93c3c99 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-virtual-server-with-custom-valves"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml
index 89d7332..e972aff 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,16 +44,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="copyJarToDomainLib"/>
<antcall target="asadmin-common-ignore-fail">
@@ -65,12 +65,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.valve_2="valves.GlassFishValveImpl""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.valve_3="valves.TomcatValveBase_2""/>
- </antcall>
+ </antcall>
<antcall target="restart-server-instance-common"/>
</target>
@@ -85,7 +85,7 @@
<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}"/>
@@ -97,10 +97,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeJarFromDomainLib"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
index b9aaf64..9a0ef31 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_1 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
index ef2df6e..1b735b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_2 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java
index 6ff42f5..c9a9252 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java
@@ -84,7 +84,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -92,8 +92,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke(contextRoot, "/domain.xml", "<domain ");
invoke(contextRoot, "/server.policy", "grant codeBase");
invoke(contextRoot, "/config/login.conf", "fileRealm");
@@ -114,7 +114,7 @@
*/
private void invoke(String contextRoot, String uri, String expected)
throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties
index 46b2984..7c14a68 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapp-alternate-docroot"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml
index 6fd1bb7..4f481ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -72,11 +72,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java
index 21b7402..d354b29 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support for tag files");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties
index a586741..77e362d 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapp-alternate-docroot-tagfile"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml
index 9eb99b6..e6b5f94 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,16 +42,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="moveResources"/>
@@ -64,7 +64,7 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -72,7 +72,7 @@
<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}"/>
@@ -84,10 +84,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="restoreResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java
index 965ad77..496f3f7 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6329415");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties
index aeca50e..6b6cf53 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapp-deploy-dash-dash-libraries"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml
index 5c9778c..47ba965 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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-libraries"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/web/webappLoaderConsiderHiddenJarFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/WebTest.java
index dcc4ecb..9d82071 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6314481");
@@ -57,18 +57,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties
index 15edd7b..2758269 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapp-loader-consider-hidden-jar-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/webappLoaderEmptyJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/WebTest.java
index e5fc5bd..c76a0cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4670099 and 4649821");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJSP();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -71,7 +71,7 @@
int code = conn.getResponseCode();
if (code != 200) {
throw new Exception("Unexpected response code: " + code);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties
index 6a5cf92..3e34220 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapploader-empty-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/webappLoaderEmptyJar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/descriptor/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/descriptor/web.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java
index e0a4beb..2ba6900 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for
+ * Unit test for
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=6810
* ("WebappClassLoader can not resolve resource with "." suffix")
*/
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 6810");
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties
index 553da07..fa51102 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapp-loader-getresource-dot"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,23 +42,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}"/>
@@ -70,10 +70,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/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java
index 5e264d7..1e30194 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6314481");
@@ -51,18 +51,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties
index e0149ca..0984f88 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webapp-loader-ignore-hidden-jar-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/webdavCopyDelete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/WebTest.java
index d8c7d71..390711f 100644
--- a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for WebDAV copy and delete");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
try {
String tmplate = "/data.html";
String page = "/index.html";
- invoke(new String[] { "COPY " + contextRoot + tmplate + " HTTP/1.1",
+ invoke(new String[] { "COPY " + contextRoot + tmplate + " HTTP/1.1",
"Destination: http://" + host + ":" + port + contextRoot + page }, null, false);
boolean status = invoke(new String[] { "GET " + contextRoot + page + " HTTP/1.1"}, EXPECTED, false);
@@ -92,7 +92,7 @@
for (String reqLine : reqLines) {
System.out.println(reqLine);
os.write((reqLine + "\n").getBytes());
- }
+ }
os.write("Host: localhost\n".getBytes());
os.write("Connection: close\n".getBytes());
diff --git a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties
index a93a482..c4e9f26 100644
--- a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-webdav-copy-delete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/weblogicDD/contextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/WebTest.java
index b565433..3d98fc5 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context root in weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -77,11 +77,11 @@
}
boolean testStatus = EXPECTED_RESPONSE.equals(line);
if (!testStatus) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
testStatus = false;
}
-
+
stat.addStatus(TEST_NAME, (testStatus)? stat.PASS : stat.FAIL);
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties
index 0b5e843..eb9c816 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml
index c51b5a0..e72bd27 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml
@@ -39,9 +39,9 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="build" depends="clean">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -52,11 +52,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/weblogicDD/delegate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/WebTest.java
index 7b59827..cff3d9b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/WebTest.java
@@ -23,10 +23,10 @@
* Unit test for prefer-web-inf-classes in weblogic.xml.
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -40,16 +40,16 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "delegate-flag", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
System.out.println(t.getMessage());
}
if (count != EXPECTED_COUNT){
stat.addStatus("delegate", stat.FAIL);
- }
+ }
stat.printSummary("web/delegateFlag---> expect " + EXPECTED_COUNT + " PASS");
}
@@ -63,7 +63,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -75,18 +75,18 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(result +": " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
+ stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties
index 8c417fb..3a25601 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-wl-delegate"/>
+<property name="appname" value="${module}-wl-delegate"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<!--property name="sun-web.xml" value="descriptor/sun-web.xml"/-->
<property name="weblogic.xml" value="descriptor/weblogic.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml
index e9888a8..6417d0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml
@@ -44,11 +44,11 @@
<javac srcdir="./shared/test"
destdir="./shared" includes="*.java"/>
<jar destfile="shared.jar" basedir="shared"/>
- <copy file="shared.jar"
+ <copy file="shared.jar"
todir="${env.S1AS_HOME}/lib"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,24 +56,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="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}"/>
@@ -85,14 +85,14 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore-appserv" depends="setup-appserv">
<delete file="${env.S1AS_HOME}/lib/shared.jar"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml
index 734697a..c07efc8 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml
@@ -22,12 +22,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
index b939583..f3eecb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
@@ -26,11 +26,11 @@
private static final String PASS = "WLDelegateTest::PASS";
private static final String FAIL = "WLDelegateTest::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -38,12 +38,12 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
String status = FAIL;
response.setContentType("text/html");
-
+
DelegateTest delegate = null;
try{
Class clazz = Class.forName("test.DelegateTest");
@@ -56,7 +56,7 @@
if (delegate != null){
try{
- System.out.println("Delegate: " + delegate.getChildName());
+ System.out.println("Delegate: " + delegate.getChildName());
status = PASS;
} catch (Exception ex){
status = FAIL;
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java
index 2eb2ffa..c217a96 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java
@@ -26,7 +26,7 @@
* container-descriptor:index-directory-sort-by
*/
public class WebTest {
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("WeblogicDD: index-directory-enabled, index-directory-sort-by");
String host = args[0];
@@ -43,10 +43,10 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
boolean ok = goGet(host, port, "", contextRoot + "/" );
-
+
stat.addStatus("wl-web-directoryListing",
((ok)? stat.PASS : stat.FAIL));
} catch (Throwable t) {
@@ -72,7 +72,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -94,11 +94,11 @@
}
System.out.println("a, b, c: " + a + ", " + b + ", " + c);
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
return (listDir && (b < c) && (c < a));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties
index ced2db1..529ba8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-wl-directoryListing"/>
+<property name="appname" value="${module}-wl-directoryListing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="weblogic.xml" value="descriptor/weblogic.xml"/>
<property name="contextroot" value="/web-directoryListing"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml
index 1619c99..67cfe32 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml
@@ -36,21 +36,21 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="build" depends="clean">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
- </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">
<javac
srcdir="."
@@ -67,10 +67,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/web/weblogicDD/jspDescriptor/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/WebTest.java
index 1f22199..7990d2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/WebTest.java
@@ -35,12 +35,12 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp-descriptor in weblogic.xml");
WebTest webTest = new WebTest(args);
webTest.doTest("/test.jsp");
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path) {
@@ -83,7 +83,7 @@
// Test 3. Make sure that spaces are trimmed.
testName = "wl jsp desc: compress-html-template";
String line = input.readLine();
-
+
if (line.equals("pass!")) {
stat.addStatus(testName, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties
index c84aadf..7794595 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties
@@ -15,12 +15,12 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-WLjspDescriptor"/>
+<property name="appname" value="${module}-WLjspDescriptor"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="weblogic.xml" value="descriptor/weblogic.xml"/>
<property name="contextroot" value="${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml
index 057fe00..f4dab8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml
@@ -39,9 +39,9 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="build" depends="clean">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -52,11 +52,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/web/weblogicDD/referenceDescriptor/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/WebTest.java
index df3492d..9709053 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for run-as-principal-name in weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -101,7 +101,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties
index 27950b9..4d06006 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-reference-descriptor"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml
index fe21857..c4e782c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/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,16 +47,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -77,7 +77,7 @@
<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}"/>
@@ -89,10 +89,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -105,7 +105,7 @@
<param name="operand.props" value="--desttype queue my_queue"/>
</antcall>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
index 7948418..9375869 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
@@ -36,7 +36,7 @@
public void init() throws ServletException {
try {
InitialContext ic = new InitialContext();
- queue = (Queue)ic.lookup("java:comp/env/jms/QueueName");
+ queue = (Queue)ic.lookup("java:comp/env/jms/QueueName");
} catch(Exception ex) {
throw new ServletException(ex);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java
index c856945..6bdab18 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for run-as-principal-name in weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -99,7 +99,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties
index 412ab05..1718108 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-run-as-principal-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml
index f0b17c0..ca80b05 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/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"/>
@@ -60,23 +60,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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java
index 1903e97..441c9fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing complete list of " +
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties
index 020dd45..be11ffa 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-session-cookie-config-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml
index 1ca0c33..a8d8814 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml
@@ -38,7 +38,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,15 +46,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -74,7 +74,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
index 67b4f0c..a0fe69c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
@@ -40,32 +40,32 @@
// comment
if (sessionCookie.indexOf("Comment=myComment") == -1) {
throw new ServletException("Missing cookie comment");
- }
+ }
// domain
if (sessionCookie.indexOf("Domain=mydomain") == -1) {
throw new ServletException("Missing cookie domain");
- }
+ }
// path
if (sessionCookie.indexOf("Path=/myPath") == -1) {
throw new ServletException("Missing cookie path");
- }
+ }
// secure
if (sessionCookie.indexOf("Secure") == -1) {
throw new ServletException("Missing Secure attribute");
- }
+ }
// http-only
if (sessionCookie.indexOf("HttpOnly") == -1) {
throw new ServletException("Missing HttpOnly attribute");
- }
+ }
// max-age
if (sessionCookie.indexOf("Max-Age=123") == -1) {
throw new ServletException("Missing max-age");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java
index 3f62a8c..44fc4ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Make sure HttpSessionListener's sessionDestroyed(), and
+ * Make sure HttpSessionListener's sessionDestroyed(), and
* HttpSessionBindingListener's valueUnbound() methods are called when
* session expires.
*
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for timeout-secs, invalidation-interval-secs");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
HttpURLConnection conn = (HttpURLConnection)
@@ -92,7 +92,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties
index 5196d0d..3777c41 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-session-expired"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml
index 8ca1a07..c8515c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,10 +55,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -66,7 +66,7 @@
<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}"/>
@@ -78,10 +78,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/web/weblogicDD/sessionExpired/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/descriptor/web.xml
index a4eec27..6aa8b7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.MyHttpSessionListener</listener-class>
</listener>
@@ -46,7 +46,7 @@
<servlet-name>CheckResult</servlet-name>
<url-pattern>/CheckResult</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
index fd0610c..f6f32ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
@@ -27,17 +27,17 @@
* Notifies the object that it is being bound to a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueBound(HttpSessionBindingEvent event) {
// do nothing
}
-
+
/*
* Notifies the object that it is being unbound from a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueUnbound(HttpSessionBindingEvent event) {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
index 4c34510..47929e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for URL session tracking mode configured via weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -107,7 +107,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
index 02af0c8..7fb9b49 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-session-id-url-rewrite-session-tracking-mode-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
index a824be0..cdd5cdf 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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}"/>
@@ -71,10 +71,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/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java
index 205b4b2..cef68ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Weblogic DD: save-sessions-enabled");
@@ -71,7 +71,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -82,7 +82,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -125,7 +125,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties
index 500347d..1491363 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-wl-session-preserve-across-redeploy-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml
index 226749a..1de719c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml
@@ -39,7 +39,7 @@
<delete file="RepRunConf.txt" failonerror="false"/>
<delete file="JSESSIONID" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,16 +47,16 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -70,7 +70,7 @@
<param name="operand.props" value="--name=${appname}-web ${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="redeploy2" depends="init-common">
<echo message="Redeploying with keepState=false ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -105,7 +105,7 @@
</classpath>
</java>
</target>
-
+
<target name="runthird" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -121,7 +121,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
index 18ed3aa..ce4fc59 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
@@ -27,7 +27,7 @@
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
- boolean resume = false;
+ boolean resume = false;
HttpSession session = req.getSession(false);
if (session != null) {
HashMap map = (HashMap) session.getAttribute("map");
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java
index d1d401c..e28297b 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java
@@ -40,16 +40,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 8535");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties
index 2ed57bc..2198e5a 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-welcome-page-extension-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/welcomePageSecurityConstraintExactMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/WebTest.java
index 52d10be..871355a 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/WebTest.java
@@ -42,16 +42,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6233276");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties
index 6cb0eda..6b565d3 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-welcome-page-security-constraint-exact-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/welcomePageSecurityConstraintJspExtension/WebTest.java b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/WebTest.java
index b8a7cf0..7fd65da 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/WebTest.java
@@ -42,16 +42,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6233276");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
@@ -67,7 +67,7 @@
System.err.println("Wrong response code. Expected: "
+ HttpURLConnection.HTTP_UNAUTHORIZED
+ ", received: " + responseCode);
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
}
} catch( Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties
index 9174e7c..fcc549f 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-welcome-page-security-constraint-jsp-extension"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</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="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<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}"/>
@@ -74,10 +74,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/web/weldJsfFormLoginHttpSessionListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/WebTest.java
index e58a916..0defcd2 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/WebTest.java
@@ -46,7 +46,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -60,7 +60,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -111,7 +111,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties
index bdd7ed7..0817995 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-weld-jsf-form-login-http-session-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml
index d816699..6c27a04 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="src"/>
@@ -65,14 +65,14 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -89,7 +89,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
index a277891..fdd4c38 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
@@ -37,7 +37,7 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
+ <web-resource-name>Protected Area</web-resource-name>
<url-pattern>/*</url-pattern>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
index 07a1d8d..5102602 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
@@ -28,10 +28,10 @@
String value = myBean.getText();
if (!"CDI_VALUE".equals(value)) {
throw new RuntimeException();
- }
+ }
se.getSession().setAttribute("myAttr", value);
System.out.println(">>> sessionCreated: " + value);
- }
+ }
public void sessionDestroyed(HttpSessionEvent se) {
System.out.println(">>> sessionDestroyed");
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java
index 6fe27d6..9c88f8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java
@@ -45,7 +45,7 @@
keyStorePath = args[4];
trustStorePath = args[5];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11504");
WebTest webTest = new WebTest(args);
@@ -70,7 +70,7 @@
URLConnection conn = url.openConnection();
String redirectLocation = conn.getHeaderField("Location");
System.out.println("Location: " + redirectLocation);
-
+
String expectedRedirectLocation = "https://" + host + ":" + httpsPort +
contextRoot + "/protected.txt";
if (!expectedRedirectLocation.equals(redirectLocation)) {
@@ -112,7 +112,7 @@
String trustStorePath) throws Exception {
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = "changeit".toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -128,7 +128,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties
index 8818328..3314ee8 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-weld-jsf-form-login-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml
index 98e4e61..6cc8326 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,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:${env.S1AS_HOME}/lib/appserv-rt.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,prepare-truststore-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -78,7 +78,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
index 4badc45..dc73f51 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
@@ -55,7 +55,7 @@
<form-error-page>/login_error.jsf</form-error-page>
</form-login-config>
</login-config>
-
+
<security-role>
<role-name>admin</role-name>
</security-role>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java
index eaeac1d..af6783c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java
@@ -46,7 +46,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -60,7 +60,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -110,7 +110,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties
index 11e7098..ea6813d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-weld-jsf-server-auth-module-redirect"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml
index 0ee4318..db103fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="src"/>
@@ -70,14 +70,14 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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}"/>
@@ -94,7 +94,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
index 40c6f63..3138874 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
@@ -33,7 +33,7 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
+ <web-resource-name>Protected Area</web-resource-name>
<url-pattern>/*</url-pattern>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java b/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java
index dd3b24f..44e0acb 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java
@@ -23,10 +23,10 @@
* Unit test for bugtraq 4933984 Exception on Redeploy on WinXP
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone Win2k Locking war test");
String host = args[0];
@@ -43,13 +43,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "Win2kLock", contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
@@ -67,7 +67,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -80,19 +80,19 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-Win2kLock: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-Win2kLock: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-Win2kLock: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties b/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties
index 1d2295c..9244315 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-win2kLock"/>
+<property name="appname" value="${module}-win2kLock"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-win2kLock"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml b/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml
index e5d8403..8da606c 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -64,7 +64,7 @@
<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}"/>
@@ -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/web/win2kLock/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/win2kLock/descriptor/web.xml
index 6be4073..3dcff7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/descriptor/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
index 2d4408c..d6f2fb5 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
@@ -34,7 +34,7 @@
private ServletContext context;
private static String status = "Win2kLock:PASS";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -45,14 +45,14 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
request.getSession().setAttribute("test","Win2kLock:PASS");
request.getSession().invalidate();
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println(status);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties b/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties
index 161cada..885bd75 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-wrongProtocol"/>
+<property name="appname" value="${module}-wrongProtocol"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/wrongProtocol"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java b/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java
index d05cba7..31f0435 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java
@@ -94,7 +94,7 @@
report("delete-http-redirect", asadmin("delete-protocol",
"http-redirect"));
}
-
+
private void checkStatus(HttpURLConnection connection)
throws Exception {
int responseCode = connection.getResponseCode();
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties
index 6fcd4df..d64a501 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties
@@ -15,14 +15,14 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
-<property name="appname" value="${module}-wrongProtocolTarget"/>
+<property name="appname" value="${module}-wrongProtocolTarget"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/wrongProtocolTarget"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml
index 9f7119f..976de3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml
@@ -80,7 +80,7 @@
<target name="delete-cluster" depends="init-common">
<antcall target="delete-cluster-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java
index 51776a5..0115af6 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java
@@ -102,7 +102,7 @@
report("delete-http-redirect", asadmin("delete-protocol", "--target", clusterName,
"http-redirect"));
}
-
+
private void checkStatus(HttpURLConnection connection)
throws Exception {
int responseCode = connection.getResponseCode();
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java b/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java
index 00e6a96..17f2c1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 21922");
YassonTest yassonTest = new YassonTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/TransformToJson?parameter="
+ URLEncoder.encode(PARAMETER));
@@ -70,7 +70,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/build.properties b/appserver/tests/appserv-tests/devtests/web/yasson/build.properties
index 93138a3..5d422e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-yasson-loaded"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/build.xml b/appserver/tests/appserv-tests/devtests/web/yasson/build.xml
index 726e03e..9a7592f 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/build.xml
@@ -40,7 +40,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,10 +48,10 @@
</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"
@@ -63,7 +63,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="YassonTest">
<arg value="${http.host}"/>
@@ -75,7 +75,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
index fe4aaf9..e6fb687 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
@@ -17,7 +17,7 @@
-->
<property environment="env"/>
-<property file="${env.APS_HOME}/config.properties"/>
+<property file="${env.APS_HOME}/config.properties"/>
<target name="all" depends="clean, compile, run, undeploy, report"/>
@@ -39,21 +39,21 @@
<target name="compile">
- <mkdir dir="${env.APS_HOME}/build/module/classes"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<property name="class-name" value="${pkg-name}/${server}.class"/>
<echo message="Compiling into ${pkg-name}/${server}.class"/>
- <javac srcdir="." destdir="${env.S1AS_HOME}/domains/domain1/autodeploy"
+ <javac srcdir="." destdir="${env.S1AS_HOME}/domains/domain1/autodeploy"
includes="${src-name}">
<classpath refid="classpath"/>
</javac>
</target>
<target name="compile-client">
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="${client-src-name}"/>
</target>
@@ -64,7 +64,7 @@
<target name="undeploy">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<property name="class-name" value="${pkg-name}/${server}.class"/>
<echo message="Removing file ${class-name} from autodeploy directory"/>
<delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}"/>
@@ -83,7 +83,7 @@
</target>
<target name="report" depends="internal-report-success, internal-report-failure">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
</target>
<target name="run">
@@ -108,17 +108,17 @@
<target name="internal-run" if="deploy_succeeded">
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
<echo message="wsimporting http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<echo message="Running appclient with ${client-pkg-name}.${client}"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="${client-pkg-name}.${client}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties
index b084c54..3175825 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="asyncservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
index 817d668..36dfdfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
@@ -63,8 +63,8 @@
<param name="wsimport.args"
value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/AsyncService?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -77,7 +77,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
@@ -85,7 +85,7 @@
</antcall>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
<replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java
index 6515a93..c895282 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java
@@ -37,23 +37,23 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("async-service");
+ stat.addDescription("async-service");
Client client = new Client();
client.doSyncTest();
client.doASyncPollTest();
client.doASyncCallBackTest();
- stat.printSummary("async-service");
+ stat.printSummary("async-service");
}
public void doSyncTest() {
try {
AddNumbersImpl port = service.getAddNumbersImplPort();
int ret = port.addNumbers(2222, 1234);
- if(ret!=(2222+1234)) {
+ if(ret!=(2222+1234)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-service-sync-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-service-sync-test", stat.PASS);
} catch(Exception e) {
@@ -70,11 +70,11 @@
Thread.sleep (2000);
AddNumbersResponse output = resp.get();
int ret = output.getReturn();
- if(ret!=(1234+5678)) {
+ if(ret!=(1234+5678)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-service-poll-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-service-poll-test", stat.PASS);
} catch(Exception e) {
@@ -92,11 +92,11 @@
Thread.sleep (2000);
AddNumbersResponse output = cbh.getResponse ();
int ret = output.getReturn();
- if(ret!=(9876+5432)) {
+ if(ret!=(9876+5432)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-service-callbackhandler-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-service-callbackhandler-test", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
index f30c7ae..dfd257c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/asyncservice/webservice/AsyncService?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
<enableAsyncMapping>true</enableAsyncMapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml
index e667727..64faaf9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml
@@ -18,17 +18,17 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AsyncService</url-pattern>
- </servlet-mapping>
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AsyncService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml
index ff5e0a8..a655b9b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml
@@ -21,46 +21,46 @@
]>
<project name="servlet endpoint annotations" default="all" basedir=".">
<target name="all">
- <ant dir="noname" target="all"/>
- <ant dir="noname2" target="all"/>
- <!--ant dir="externalwsdl" target="all"/-->
+ <ant dir="noname" target="all"/>
+ <ant dir="noname2" target="all"/>
+ <!--ant dir="externalwsdl" target="all"/-->
- <ant dir="dol-override-1" target="all"/>
+ <ant dir="dol-override-1" target="all"/>
<ant dir="webservices13-addressing" target="all"/>
<ant dir="webserviceref-lookup" target="all"/>
<ant dir="webservices13-addressing-2" target="all"/>
- <ant dir="provider" target="all"/>
- <ant dir="svchandler-1" target="all"/>
- <ant dir="svchandler-2" target="all"/>
- <ant dir="svchandler-3" target="all"/>
- <ant dir="svchandler-4" target="all"/>
- <ant dir="client-handler-1" target="all"/>
- <ant dir="client-handler-2" target="all"/>
- <ant dir="mtom" target="all"/>
- <ant dir="containerresolver" target="all"/>
- <ant dir="endpointaddress" target="all"/>
- <ant dir="fault" target="all"/>
- <ant dir="webservicerefs" target="all"/>
- <ant dir="warservice" target="all"/>
- <ant dir="wsdltojava" target="all"/>
- <ant dir="wsctxt" target="all"/>
- <ant dir="soap12" target="all"/>
- <ant dir="oneway" target="all"/>
- <ant dir="msgctxt" target="all"/>
- <ant dir="nowebxml" target="all"/>
+ <ant dir="provider" target="all"/>
+ <ant dir="svchandler-1" target="all"/>
+ <ant dir="svchandler-2" target="all"/>
+ <ant dir="svchandler-3" target="all"/>
+ <ant dir="svchandler-4" target="all"/>
+ <ant dir="client-handler-1" target="all"/>
+ <ant dir="client-handler-2" target="all"/>
+ <ant dir="mtom" target="all"/>
+ <ant dir="containerresolver" target="all"/>
+ <ant dir="endpointaddress" target="all"/>
+ <ant dir="fault" target="all"/>
+ <ant dir="webservicerefs" target="all"/>
+ <ant dir="warservice" target="all"/>
+ <ant dir="wsdltojava" target="all"/>
+ <ant dir="wsctxt" target="all"/>
+ <ant dir="soap12" target="all"/>
+ <ant dir="oneway" target="all"/>
+ <ant dir="msgctxt" target="all"/>
+ <ant dir="nowebxml" target="all"/>
<ant dir="webservices13-respectbinding" target="all"/>
- <ant dir="async" target="all"/>
- <ant dir="restful" target="all"/>
- <ant dir="restful-2" target="all"/>
- <ant dir="pkgedwarservice" target="all"/>
- <ant dir="mappedname" target="all"/>
- <!--<ant dir="mbyte" target="all"/>-->
- <ant dir="postconstruct" target="all"/>
-<!-- <ant dir="jaxrpcinjection" target="all"/>
- <ant dir="providerhandler" target="all"/>
- <ant dir="prepkged-svc-1" target="all"/>
- <ant dir="libdependent" target="all"/>
- <ant dir="soaptcp" target="all"/>
+ <ant dir="async" target="all"/>
+ <ant dir="restful" target="all"/>
+ <ant dir="restful-2" target="all"/>
+ <ant dir="pkgedwarservice" target="all"/>
+ <ant dir="mappedname" target="all"/>
+ <!--<ant dir="mbyte" target="all"/>-->
+ <ant dir="postconstruct" target="all"/>
+<!-- <ant dir="jaxrpcinjection" target="all"/>
+ <ant dir="providerhandler" target="all"/>
+ <ant dir="prepkged-svc-1" target="all"/>
+ <ant dir="libdependent" target="all"/>
+ <ant dir="soaptcp" target="all"/>
<ant dir="webservices13-addressing-appclient" target="all"/>
-->
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties
index 77b0a22..08e2c88 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/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="client-handler-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
index 9772067..ee5b26f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
@@ -127,11 +127,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -141,7 +141,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml
index d8aa2e5..4dc8be1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java
index a6b5f5d..1966bea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1109]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java
index 398727a..47ea30d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
index 1f79a94..9506719 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef(wsdlLocation="WEB-INF/wsdl/SubtractNumbers.wsdl") SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java
index 35d7053..c53b22d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -50,7 +50,7 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
@@ -59,7 +59,7 @@
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -69,11 +69,11 @@
}
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties
index 0a7695c..9c5519a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/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="client-handler-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
index 7bc8506..b13b122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
@@ -87,7 +87,7 @@
<replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpathref="class.path"
+ classpathref="class.path"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -129,11 +129,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -143,7 +143,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java
index 1860549..9e6865e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1115]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java
index 6ee7a2c..4427216 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java
@@ -26,17 +26,17 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public boolean handleMessage(SOAPMessageContext context) {
try {
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -44,16 +44,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's SERVER SIDE TEST HANDLER CALLED");
+ System.out.println("VIJ's SERVER SIDE TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
index d01ea45..b4f63bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java
index 4a6ad5f..4840de5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java
@@ -26,17 +26,17 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public boolean handleMessage(SOAPMessageContext context) {
try {
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -44,16 +44,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's CLIENT SIDE TEST HANDLER CALLED");
+ System.out.println("VIJ's CLIENT SIDE TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml
index 7c3fa86..18d096c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml
@@ -21,12 +21,12 @@
]>
<project name="servlet endpoint annotations" default="all" basedir=".">
<target name="all">
- <ant dir="svc1" target="setup"/>
- <ant dir="svc2" target="setup"/>
- <ant dir="client" target="setup"/>
- <ant dir="client" target="runtest"/>
- <ant dir="svc1" target="cleanup"/>
- <ant dir="svc2" target="cleanup"/>
- <ant dir="client" target="cleanup"/>
+ <ant dir="svc1" target="setup"/>
+ <ant dir="svc2" target="setup"/>
+ <ant dir="client" target="setup"/>
+ <ant dir="client" target="runtest"/>
+ <ant dir="svc1" target="cleanup"/>
+ <ant dir="svc2" target="cleanup"/>
+ <ant dir="client" target="cleanup"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties
index 2d5952e..b1aecda 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/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="containerresolver-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
index 901335b..323c00e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
@@ -68,7 +68,7 @@
<replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
-
+
includes="webclient/**">
<classpath refid="classpath"/>
</javac>
@@ -103,8 +103,8 @@
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -115,7 +115,7 @@
</java>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java
index 67a0c45..6deec3b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,11 +63,11 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello2 Hi]") != -1)
- found2 = true;
+ found2 = true;
if(line.indexOf("[WebSvcTest-Hello1 Hi]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
index f06c11c..7a05d3a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
@@ -31,8 +31,8 @@
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/containerresolver-app1/Hello1Service?wsdl") Hello1Service service1;
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/containerresolver-app2/Hello2Service?wsdl") Hello2Service service2;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties
index bf02654..d2da424 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="containerresolver-app1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml
index 6eee595..faae129 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml
@@ -65,6 +65,6 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java
index 691c398..4a464f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello1"
)
public class Hello1 {
- public Hello1() {}
+ public Hello1() {}
- @WebMethod(operationName="sayHello1", action="urn:SayHello1")
- public String sayHello1(String who) {
- return "WebSvcTest-Hello1 " + who;
- }
+ @WebMethod(operationName="sayHello1", action="urn:SayHello1")
+ public String sayHello1(String who) {
+ return "WebSvcTest-Hello1 " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties
index e3b2809..3ce7127 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="containerresolver-app2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml
index 1081db4..baa6d5e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml
@@ -65,6 +65,6 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java
index c32fe7d..2593132 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello2"
)
public class Hello2 {
- public Hello2() {}
+ public Hello2() {}
- @WebMethod(operationName="sayHello2", action="urn:SayHello2")
- public String sayHello2(String who) {
- return "WebSvcTest-Hello2 " + who;
- }
+ @WebMethod(operationName="sayHello2", action="urn:SayHello2")
+ public String sayHello2(String who) {
+ return "WebSvcTest-Hello2 " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties
index 4567ab9..9466587 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/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="dol-override-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
index 8f96454..4b99e1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
@@ -66,7 +66,7 @@
value="-wsdllocation WEB-INF/wsdl/SubtractNumbers.wsdl -b custom-server.xml -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/dol-override-1/SubtractNumbers.wsdl"/>
</antcall>
<antcall target="compile"/>
- <copy file="SubtractNumbers.wsdl" todir="${env.APS_HOME}/build/localwsdl"/>
+ <copy file="SubtractNumbers.wsdl" todir="${env.APS_HOME}/build/localwsdl"/>
<copy file="sun-web.xml.template" tofile="sun-web.xml"/>
<replace file="sun-web.xml">
<replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl"/>
@@ -137,11 +137,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -151,7 +151,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java
index e0e93d0..5b181b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1111]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
index dc8a230..9a9fdfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
index c8c150d..05bc92b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties
index f55a53f..d261049 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="endpointaddress"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml
index dceb7c8..32a704a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java
index 3268526..b890709 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("endpointaddress");
+ stat.addDescription("endpointaddress");
Client client = new Client();
client.doTest(args);
- stat.printSummary("endpointaddress");
+ stat.printSummary("endpointaddress");
}
public void doTest(String[] args) {
@@ -41,17 +41,17 @@
URL serviceInfo = new URL (args[0]);
URLConnection con = serviceInfo.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
String inputLine;
- int index=0;
+ int index=0;
while ((inputLine = in.readLine()) != null) {
if ((index= inputLine.indexOf("href="))>0){
- String url = inputLine.substring(index+1);
+ String url = inputLine.substring(index+1);
if (url.indexOf("http:")>0) {
stat.addStatus("endpointaddress", stat.PASS);
- }
+ }
System.out.println(inputLine);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java
index c5727b2..14b6e0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties
index 058f961..15325a6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="externalwsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./test-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java
index 3ae546d..a521f6e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java
@@ -28,15 +28,15 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
- @WebServiceRef
- static HelloService service;
+
+ @WebServiceRef
+ static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -44,16 +44,16 @@
Hello port = service.getHello();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(args[0], stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java
index 7475c65..1257a98 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java
@@ -26,10 +26,10 @@
wsdlLocation="http://localhost:8080/wsdl/HelloService.wsdl"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml
index 729b013..209b2d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.5"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>externalwsdl</display-name>
<welcome-file-list>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml
index 5b6bfca..558094a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>HelloService</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>HelloService</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>HelloService</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties
index e26ecfd..e52099f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="fault"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml
index afbba3b..eb9041e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml
@@ -72,14 +72,14 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
<param name="other-args" value="webservice-with-fault"/>
</antcall>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java
index bc2a69b..03d7aaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java
@@ -33,10 +33,10 @@
static MyService service;
public static void main(String[] args) {
- stat.addDescription("webservices-fault");
+ stat.addDescription("webservices-fault");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-fault");
+ stat.printSummary("webservices-fault");
}
public void doTest(String[] args) {
@@ -62,16 +62,16 @@
}
try {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java
index 454b3ce..b6a460e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) throws MyException {
- if(who == null)
- throw new MyException("INPUT IS NULL");
- else
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) throws MyException {
+ if(who == null)
+ throw new MyException("INPUT IS NULL");
+ else
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java
index 99449b3..a2f1d63 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java
@@ -17,15 +17,15 @@
package endpoint;
public class MyException extends Exception {
- private String message = "";
+ private String message = "";
- public MyException(String message) {
- super(message);
- this.message = message;
- }
+ public MyException(String message) {
+ super(message);
+ this.message = message;
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml
index 0708c5c..5f1b973 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>MyHello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>MyHello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>MyHello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>MyHello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
index 1bb25b3..fc71ce4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
@@ -15,26 +15,26 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jaxrpcinjection"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
+<property name="ejbjar.files" value="${build.classes.dir}"/> \u0020
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.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="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
index 7b069f8..d482196 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -46,53 +46,53 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
+ <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
+ <param name="wscompile.command"
+ value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
</antcall>
- </target>
-
+ </target>
+
<target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
+ <param name="hasWebclient" value="yes"/>
<param name="mappingfile.location" value="${build.classes.dir}"/>
<param name="mappingfile.name" value="SimpleHandlerMapping_servlet.xml"/>
<param name="wsdlfile.location" value="${build.classes.dir}/WEB-INF/wsdl"/>
<param name="wsdlfile.name" value="SimpleHandlerServlet.wsdl"/>
<param name="webwar.classes" value="servlet/*.class"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="assemble" depends="assemble-web, assemble-client"/>
-
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
+ </antcall>
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
+ </antcall>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}/ServletHandlerTest/ServletHandlerTest"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
+ <param name="contextroot" value="ServletHandlerTest"/>
+ </antcall>
<antcall target="deploy-client-common"/>
<move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
</target>
@@ -100,10 +100,10 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client-common"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
index 369f484..d73f52f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
@@ -30,28 +30,28 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-jaxrpc-handler-injection");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-jaxrpc-handler-injection");
}
-
+
public void doTest(String[] args) {
- try {
-
+ try {
+
String targetEndpointAddress = args[0];
-
+
Context ic = new InitialContext();
-
+
Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler");
SimpleServer test = (SimpleServer)
testService.getPort(SimpleServer.class);
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
-
+
System.out.println("endpoint address = " + targetEndpointAddress);
System.out.println("Invocation returned " + test.sayHello("jerome"));
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
index 07e1cb0..4b08059 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
+ <service
+ name="SimpleHandlerServlet"
+ targetNamespace="urn:HandlerTest"
+ typeNamespace="urn:HandlerTest"
packageName="handlertest">
<interface name="servlet.SimpleServer"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml
index c14bb7a..d2d8301 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<description>simple handler service ref</description>
<service-ref-name>service/simplehandler</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
+ <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
<jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
+ <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
<port-component-ref>
<service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
index 336e4f8..f9f2117 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
@@ -22,23 +22,23 @@
public class ServletHandlerTestImpl implements SessionBean {
SessionContext sc;
-
+
public String sayHello(String hello) throws RemoteException {
return "salut " + hello;
}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleServer:::ejbCreate !!");
+ System.out.println("In SimpleServer:::ejbCreate !!");
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
- public void ejbPassivate() {}
+
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
index ed9ce1d..5a81f19 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
@@ -22,9 +22,9 @@
import jakarta.annotation.Resource;
public class SimpleHandler extends GenericHandler {
-
+
protected HandlerInfo info = null;
-
+
/*
@Resource(name="stringValue")
String injectedString = "undefined";
@@ -33,7 +33,7 @@
public void init(HandlerInfo info) {
this.info = info;
}
-
+
public boolean handleRequest(MessageContext context) {
/*
if ("undefined".equals(injectedString)) {
@@ -50,7 +50,7 @@
}
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
try {
Date startTime = (Date) context.getProperty("startTime");
@@ -62,7 +62,7 @@
}
return true;
}
-
+
public QName[] getHeaders() {
return new QName[0];
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
index dc5cf26..0675cd2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
@@ -19,7 +19,7 @@
import java.rmi.*;
public interface SimpleServer extends Remote {
-
+
public String sayHello(String source) throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
index b6b0b34..9a5eaca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
@@ -47,7 +47,7 @@
<param name="wsimport.args"
value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/${test-wsdl-uri}"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
includes="${client-src}/**">
<classpath refid="classpath"/>
</javac>
@@ -56,8 +56,8 @@
<target name="run-client">
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<exec executable="${APPCLIENT}" dir="${build.classes.dir}/client">
- <arg value="${client-class}"/>
- <arg value="${other-args}"/>
+ <arg value="${client-class}"/>
+ <arg value="${other-args}"/>
</exec>
</target>
@@ -75,7 +75,7 @@
<copy verbose="true" toDir="${build.classes.dir}/tmp/WEB-INF/">
<fileset dir="${basedir}" includes="weblogic-webservices.xml"/>
</copy>
-
+
<copy file="${wsdlfile.location}/${wsdlfile.name}"
tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
failonerror="false"/>
@@ -106,7 +106,7 @@
<include name="WEB-INF/web.xml"/>
<include name="WEB-INF/sun-web.xml"/>
<include name="WEB-INF/webservices.xml"/>
- <include name="WEB-INF/weblogic-webservices.xml"/>
+ <include name="WEB-INF/weblogic-webservices.xml"/>
<include name="WEB-INF/jax-ws-catalog.xml"/>
<include name="WEB-INF/wsdl/${wsdlfile.name}"/>
<include name="WEB-INF/wsdl/${schemafile.name}"/>
@@ -137,5 +137,5 @@
<fileset dir="${build.classes.dir}/tmp/wsit/ejb" casesensitive="yes">
<include name="META-INF/**"/>
</fileset>
- </jar>
+ </jar>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties
index a7236f8..3cb9e52 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="libdependent"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
index 31c8a26..bace84a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
@@ -97,7 +97,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java
index e71362b..46d2938 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java
@@ -33,10 +33,10 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -44,16 +44,16 @@
Hello port = service.getHelloPort();
for (int i=0;i<10;i++) {
RetVal ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.getRetVal().indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.getRetVal().indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.getRetVal().indexOf(args[0]) == -1) {
+ }
+ if(ret.getRetVal().indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java
index d49f158..55bfc74 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java
@@ -27,9 +27,9 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- public RetVal sayHello(String who) {
- return new RetVal("WebSvcTest-Hello " + who);
- }
+ public RetVal sayHello(String who) {
+ return new RetVal("WebSvcTest-Hello " + who);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml
index 37ce182..cc6411f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties
index 3942031..e2dc62e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/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="mappedname"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml
index 8efe2f1..2b8daf5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml
@@ -47,7 +47,7 @@
<param name="src" value="endpoint"/>
</antcall>
</target>
-
+
<target name="deploy-app">
<antcall target="deploy-war-common">
<param name="contextroot" value="${appname}"/>
@@ -106,7 +106,7 @@
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
@@ -120,7 +120,7 @@
<arg value="http://${http.host}:${http.port}/endpointaddress/HelloService"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
@@ -168,7 +168,7 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
+ </target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java
index 987d857..9dc9c89 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java
@@ -30,37 +30,37 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-mapped-name");
+ stat.addDescription("webservices-mapped-name");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-mapped-name");
+ stat.printSummary("webservices-mapped-name");
}
public void doTest(String[] args) {
- boolean gotEx = false;
+ boolean gotEx = false;
try {
- javax.naming.InitialContext ic = new javax.naming.InitialContext();
- Object res = ic.lookup("java:comp/env/ignoredName");
- } catch(Exception ex) {
- System.out.println("Caught Expected exception - " + ex.getMessage());
- gotEx = true;
- }
- if(!gotEx) {
- System.out.println("Mapped name not mapped as expected");
+ javax.naming.InitialContext ic = new javax.naming.InitialContext();
+ Object res = ic.lookup("java:comp/env/ignoredName");
+ } catch(Exception ex) {
+ System.out.println("Caught Expected exception - " + ex.getMessage());
+ gotEx = true;
+ }
+ if(!gotEx) {
+ System.out.println("Mapped name not mapped as expected");
stat.addStatus("Simple-mapped-name", stat.FAIL);
- return;
- }
+ return;
+ }
try {
- javax.naming.InitialContext ic = new javax.naming.InitialContext();
- Object res = ic.lookup("java:comp/env/MyMappedName");
+ javax.naming.InitialContext ic = new javax.naming.InitialContext();
+ Object res = ic.lookup("java:comp/env/MyMappedName");
Hello port = service.getHelloPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("Simple-mapped-name", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java
index 70f0ad2..7758d44 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java
index f2ecc93..e1fd1f7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java
@@ -20,8 +20,8 @@
@WebService
public class Hello {
-
+
public String sayHello(String param) {
- return "Hello " + param;
+ return "Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
index a326225..78be6a8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
@@ -30,8 +30,8 @@
@WebServiceRef(name="ignoredName", mappedName="MyMappedName", wsdlLocation="http://HTTP_HOST:HTTP_PORT/mappedname/HelloService?WSDL")
HelloService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties
index 9cc3607..ada723e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="mbyte"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml
index 90c48f6..ce1839b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml
@@ -70,7 +70,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java
index 53665a5..ff84d37 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java
@@ -32,38 +32,38 @@
static HelloîService service;
public static void main(String[] args) {
- stat.addDescription("service-with-mbyte-char");
+ stat.addDescription("service-with-mbyte-char");
Client client = new Client();
client.doTest(args);
- stat.printSummary("service-with-mbyte-char");
+ stat.printSummary("service-with-mbyte-char");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
ret = port.sayDoubleHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java
index a00d18a..6e81ac0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java
@@ -25,15 +25,15 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
- @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
- public String sayDoubleHello(String who) {
- return "WebSvcTest-Double-Hello " + who + " AND " + who;
- }
+ @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
+ public String sayDoubleHello(String who) {
+ return "WebSvcTest-Double-Hello " + who + " AND " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties
index 2e64961..cc742a1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/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="msgctxt"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml
index 203a74d..076e106 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml
@@ -69,7 +69,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java
index d903e9e..467e6b9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -60,7 +60,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java
index 8b12109..160c5bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java
@@ -22,7 +22,7 @@
@WebService
public class Hello {
-
+
@Resource WebServiceContext wsc;
public String sayHello(String param) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml
index d4ee4b5..27f9f21 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
index 168756d..03133c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
@@ -31,7 +31,7 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -39,7 +39,7 @@
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHelloPort();
String ret = port.sayHello("All");
@@ -62,7 +62,7 @@
out.close();
} catch(Exception e) {
e.printStackTrace();
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties
index 62bc087..74b052a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/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="mtom"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
index 5d582f6..74f9e12 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
@@ -131,11 +131,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml
index aca69ab..b08ff82 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java
index c58ee53..c31c778 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[11111]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java
index dc8a230..9a9fdfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
index 361a0b7..38207db 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml
index f8ca485..8423366 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml
@@ -29,7 +29,7 @@
<port-component-name>SubtractNumbersImpl</port-component-name>
<wsdl-service xmlns:wsdl-port_ns__="http://duke.org">wsdl-port_ns__:SubtractNumbersService</wsdl-service>
<wsdl-port xmlns:wsdl-port_ns__="http://duke.org">wsdl-port_ns__:SubtractNumbersPortType</wsdl-port>
- <enable-mtom>true</enable-mtom>
+ <enable-mtom>true</enable-mtom>
<service-endpoint-interface>endpoint.SubtractNumbersPortType</service-endpoint-interface>
<service-impl-bean>
<servlet-link>SubtractNumbersService</servlet-link>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties
index b84ec23..7bf7432 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="multiport"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
index 1ca5214..c3ec9e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
@@ -69,8 +69,8 @@
<param name="wsimport.args"
value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -83,7 +83,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runtest">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java
index f35cddb..08e982d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java
@@ -22,50 +22,50 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef static HttpTestService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
try {
Hello port = new HttpTestService().getHelloPort();
- HelloRequest req = new HelloRequest();
- req.setString("From Vijay ");
- HelloResponse resp = port.hello(req);
- if(resp.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp.getString().indexOf("Hello1") != -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp.getString());
+ HelloRequest req = new HelloRequest();
+ req.setString("From Vijay ");
+ HelloResponse resp = port.hello(req);
+ if(resp.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp.getString().indexOf("Hello1") != -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp.getString());
Hello1 port1 = service.getHello1Port();
- Hello1Request req1 = new Hello1Request();
- req1.setString("From Vijay ");
- Hello1Response resp1 = port1.hello1(req1);
- if(resp1.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp1.getString().indexOf("Hello1") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp1.getString());
- stat.addStatus(args[0], stat.PASS);
+ Hello1Request req1 = new Hello1Request();
+ req1.setString("From Vijay ");
+ Hello1Response resp1 = port1.hello1(req1);
+ if(resp1.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp1.getString().indexOf("Hello1") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp1.getString());
+ stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
e.printStackTrace();
- stat.addStatus(args[0], stat.FAIL);
+ stat.addStatus(args[0], stat.FAIL);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml
index 7c3372f..99df632 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml
@@ -23,9 +23,9 @@
<package name="client"/>
</bindings>
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
<ns2:package name="client"/>
</ns2:schemaBindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml
index 242611b..58c55e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml
@@ -23,9 +23,9 @@
<package name="service"/>
</bindings>
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
<ns2:package name="service"/>
</ns2:schemaBindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java
index a551c23..2658611 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java
@@ -38,8 +38,8 @@
public Hello1Response hello1(Hello1Request req) {
System.out.println("Hello1, " + req.getString() + "!");
- Hello1Response resp = new Hello1Response();
- resp.setString("Hello1, " + req.getString() + "!");
+ Hello1Response resp = new Hello1Response();
+ resp.setString("Hello1, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java
index 82f4efe..20e1e59 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java
@@ -38,8 +38,8 @@
public HelloResponse hello(HelloRequest req) {
System.out.println("Hello, " + req.getString() + "!");
- HelloResponse resp = new HelloResponse();
- resp.setString("Hello, " + req.getString() + "!");
+ HelloResponse resp = new HelloResponse();
+ resp.setString("Hello, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml
index f3b6cc6..af8248b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>WSW2JRLHttpTestApp</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties
index 6ef513a..4bc9eab 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/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="noname"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml
index e752c92..71f6512 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml
@@ -47,7 +47,7 @@
<param name="contextroot" value="${appname}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
@@ -131,6 +131,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java
index e7ee4a2..60df76e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("WebSvcTest-Hello All") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java
index 24a78d1..5466edb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java
@@ -20,8 +20,8 @@
@WebService
public class Hello {
-
+
public String sayHello(String param) {
- return "WebSvcTest-Hello " + param;
+ return "WebSvcTest-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
index 1972c59..c021625 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
@@ -31,14 +31,14 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHelloPort();
String ret = port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties
index ad2d4ca..7895e2f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/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="noname2"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml
index 227aea4..38106b8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml
@@ -68,7 +68,7 @@
</classpath>
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
@@ -141,5 +141,5 @@
</project>
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java
index 6a9a5ba..7f13e95 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java
index 4aef922..705bcda 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java
@@ -24,8 +24,8 @@
portName="Hello"
)
public class Hello2 {
-
+
public String sayHello(String param) {
- return "WebSvcTest-Hello " + param;
+ return "WebSvcTest-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml
index 0c458f4..a82dcc0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello2</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello2</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
index fd7bd60..17ab244 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
@@ -31,14 +31,14 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHello();
String ret = port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties
index 91e9125..44e682a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="nowebxml"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml
index 5bd34fd..5a436e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
@@ -81,7 +81,7 @@
</antcall>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java
index 0f67fd2..dcb4fe8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java
@@ -32,38 +32,38 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("service-with-no-webxml");
+ stat.addDescription("service-with-no-webxml");
Client client = new Client();
client.doTest(args);
- stat.printSummary("service-with-no-webxml");
+ stat.printSummary("service-with-no-webxml");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
ret = port.sayDoubleHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java
index 2e0e0ae..94f1021 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java
@@ -25,15 +25,15 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
- @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
- public String sayDoubleHello(String who) {
- return "WebSvcTest-Double-Hello " + who + " AND " + who;
- }
+ @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
+ public String sayDoubleHello(String who) {
+ return "WebSvcTest-Double-Hello " + who + " AND " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties
index 7338cee..6b93650 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/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="oneway"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml
index a5df82c..d4aea3b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml
@@ -68,7 +68,7 @@
</classpath>
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
@@ -154,7 +154,7 @@
<target name="run-client">
<echo message="Deployed passed"/>
- </target>
+ </target>
<target name="report-success">
<echo message="Test PASSED"/>
@@ -162,7 +162,7 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
-->
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java
index 615876c..d3e39b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -60,7 +60,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml
index d4ee4b5..27f9f21 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
index 5337236..3e7b88b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
@@ -31,7 +31,7 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -39,7 +39,7 @@
throws jakarta.servlet.ServletException {
String ret="Oneway works";
try {
-
+
Hello port = service.getHelloPort();
port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties
index 2dc16cd..7b0770c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/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="pkghello"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml
index c185234..2ede6d8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml
@@ -88,14 +88,14 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
<param name="other-args" value="war-with-packaged-wsdl-and-schema"/>
</antcall>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java
index c270648..2a95096 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java
@@ -32,10 +32,10 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -43,16 +43,16 @@
Hello port = service.getMyPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(args[0], stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java
index 58f2336..127bcc0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java
@@ -27,10 +27,10 @@
wsdlLocation="WEB-INF/wsdl/HelloService.wsdl"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml
index 37ce182..cc6411f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties
index c944cbc..e4076da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/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="postconstruct"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml
index 6a52c3f..d3cc1af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml
@@ -69,7 +69,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
@@ -202,7 +202,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java
index e458f36..90bf18f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -60,7 +60,7 @@
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
String line = null;
-
+
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml
index 8faeb07..37e2797 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
index 5d8ee12..5840ca1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
@@ -31,14 +31,14 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHelloPort();
String ret = port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java
index 39c1b93..341ee6b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java
@@ -30,10 +30,10 @@
@WebServiceRef(name="service/MyService") static AddNumbersService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -41,7 +41,7 @@
AddNumbersPortType port = service.getAddNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://localhost:8080/prepkged-svc-1/webservice/AddNumbersService?WSDL");
int ret = port.addNumbers(100, 200);
- if(ret != 300) {
+ if(ret != 300) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("pre-pkged-appclient", stat.FAIL);
return;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties
index 3f670b4..9b24732 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/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="prepkged-svc-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml
index a5efa8b..60f53c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml
@@ -83,7 +83,7 @@
<param name="wsimport.args"
value="-b custom-client.xml -keep -d ${build.classes.dir}/webclient/WEB-INF/classes ${env.APS_HOME}/devtests/webservice/annotations/prepkged-svc-1/AddNumbers.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
</javac>
@@ -103,7 +103,7 @@
<param name="wsimport.args"
value="-b custom-client.xml -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/prepkged-svc-1/AddNumbers.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/appclient"
+ <javac srcdir="." destdir="${build.classes.dir}/appclient"
classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="appclient/**"/>
<mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl"/>
@@ -162,11 +162,11 @@
<antcall target="undeploy-client"/>
<antcall target="undeploy-client-common"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml
index e691a89..963f6ae 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java
index 11392d9..44f7cbc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF ADD SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[300]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml
index 6a135ad..fe3f736 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml
index 4cfbb59..e6bb237 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java
index e7bda7c..30ac699 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (wsdlLocation="WEB-INF/wsdl/AddNumbers.wsdl", serviceName="AddNumbersService", targetNamespace="http://duke.org", portName="AddNumbersPortType", endpointInterface="endpoint.AddNumbersPortType")
public class AddNumbersImpl implements AddNumbersPortType {
-
+
public int addNumbers (int number1, int number2) {
return number1 + number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml
index 6256153..1889eb4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>AddNumbers Service</description>
+ <description>AddNumbers Service</description>
- <servlet>
- <description>Endpoint for AddNumbers Web Service</description>
- <display-name>AddNumbersWebService</display-name>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumbers Web Service</description>
+ <display-name>AddNumbersWebService</display-name>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
index 045248a..dc5bb70 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef(name="service/MyService") AddNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml
index f534777..4f83195 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml
@@ -28,7 +28,7 @@
<property name="client-src-name" value="client/Client.java"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<target name="all" depends="clean">
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
@@ -37,9 +37,9 @@
<war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war" needxmlfile="false">
<webinf dir="${pkg-name}"
includes="*.xml **/*.wsdl **/*.xsd"/>
- <classes dir="${env.APS_HOME}/build/module/classes"
+ <classes dir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/**"/>
- </war>
+ </war>
<waitfor maxwait="100" maxwaitunit="second">
<or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
@@ -56,7 +56,7 @@
<fail if="deploy_failed" message="Deployment failed"/>
<antcall target="compile-client"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
<antcall target="unjar-client-utils"/>
<antcall target="internal-run"/>
@@ -86,6 +86,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java
index 37ed2af..5c82531 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("servlet-provider-annotation");
+ stat.addDescription("servlet-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("servlet-provider-annotation");
+ stat.printSummary("servlet-provider-annotation");
}
public void doTest(String[] args) {
@@ -41,11 +41,11 @@
HelloImpl port = new HelloImplService().getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("servlet-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml
index 82d33ce..3bcc8d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml
@@ -28,25 +28,25 @@
<property name="client-src-name" value="client/Client.java"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<target name="all" depends="clean">
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
</exec>
- <antcall target="test-compile"/>
- <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
- webxml="web.xml">
- <webinf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- <classes dir="${env.APS_HOME}/build/module/classes"
- includes="${pkg-name}/**"/>
- </war>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
+ <antcall target="test-compile"/>
+ <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
+ webxml="web.xml">
+ <webinf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ <classes dir="${env.APS_HOME}/build/module/classes"
+ includes="${pkg-name}/**"/>
+ </war>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployFailed"/>
- </or>
- </waitfor>
+ </or>
+ </waitfor>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
</condition>
@@ -55,14 +55,14 @@
</condition>
<fail if="deploy_failed" message="Deployment failed"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
<antcall target="unjar-client-utils"/>
- <antcall target="internal-run"/>
+ <antcall target="internal-run"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.war"/>
+ <param name="filename" value="${server}.war"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -71,14 +71,14 @@
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployFailed"/>
</condition>
<fail if="undeploy_failed" message="undeployment failed"/>
- <antcall target="report"/>
+ <antcall target="report"/>
</target>
<target name="test_build">
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
- </exec>
- <antcall target="build"/>
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
+ </exec>
+ <antcall target="build"/>
</target>
<target name="report-success">
@@ -87,6 +87,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java
index 37ed2af..5c82531 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("servlet-provider-annotation");
+ stat.addDescription("servlet-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("servlet-provider-annotation");
+ stat.printSummary("servlet-provider-annotation");
}
public void doTest(String[] args) {
@@ -41,11 +41,11 @@
HelloImpl port = new HelloImplService().getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("servlet-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
index 7c525b4..8a96ff5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
@@ -21,7 +21,7 @@
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.Service ;
+import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
import jakarta.ejb.Stateless;
@@ -41,11 +41,11 @@
private static final JAXBContext jaxbContext = createJAXBContext();
private int combo;
private int bodyIndex;
-
+
public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
-
+
private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
@@ -53,27 +53,27 @@
throw new WebServiceException(e.getMessage(), e);
}
}
-
-
+
+
public Source invoke(Source request) {
try {
recvBean(request);
return sendBean();
} catch(Exception e) {
e.printStackTrace();
- throw new WebServiceException("Provider endpoint failed", e);
+ throw new WebServiceException("Provider endpoint failed", e);
}
}
-
+
private void recvBean(Source source) throws Exception {
System.out.println("**** recvBean ******");
JAXBElement element = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(source);
- System.out.println("name="+element.getName()+ " value=" + element.getValue());
+ System.out.println("name="+element.getName()+ " value=" + element.getValue());
if (element.getValue() instanceof SayHello) {
- SayHello hello = (SayHello) element.getValue();
+ SayHello hello = (SayHello) element.getValue();
System.out.println("Say Hello from " + hello.getArg0());
}
-
+
}
private Source sendBean() throws Exception {
@@ -81,9 +81,9 @@
SayHelloResponse resp = new SayHelloResponse();
resp.setReturn("WebSvcTest-Hello");
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectFactory factory = new ObjectFactory();
+ ObjectFactory factory = new ObjectFactory();
jaxbContext.createMarshaller().marshal(factory.createSayHelloResponse(resp), bout);
return new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml
index 5b8db0c..fbf2ed6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <servlet-class>endpoint.HelloImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <servlet-class>endpoint.HelloImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <url-pattern>/HelloImplService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <url-pattern>/HelloImplService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml
index 82d33ce..3bcc8d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml
@@ -28,25 +28,25 @@
<property name="client-src-name" value="client/Client.java"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<target name="all" depends="clean">
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
</exec>
- <antcall target="test-compile"/>
- <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
- webxml="web.xml">
- <webinf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- <classes dir="${env.APS_HOME}/build/module/classes"
- includes="${pkg-name}/**"/>
- </war>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
+ <antcall target="test-compile"/>
+ <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
+ webxml="web.xml">
+ <webinf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ <classes dir="${env.APS_HOME}/build/module/classes"
+ includes="${pkg-name}/**"/>
+ </war>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployFailed"/>
- </or>
- </waitfor>
+ </or>
+ </waitfor>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
</condition>
@@ -55,14 +55,14 @@
</condition>
<fail if="deploy_failed" message="Deployment failed"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
<antcall target="unjar-client-utils"/>
- <antcall target="internal-run"/>
+ <antcall target="internal-run"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.war"/>
+ <param name="filename" value="${server}.war"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -71,14 +71,14 @@
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployFailed"/>
</condition>
<fail if="undeploy_failed" message="undeployment failed"/>
- <antcall target="report"/>
+ <antcall target="report"/>
</target>
<target name="test_build">
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
- </exec>
- <antcall target="build"/>
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
+ </exec>
+ <antcall target="build"/>
</target>
<target name="report-success">
@@ -87,6 +87,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java
index a5a4a01..eee6926 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("servlet-provider-annotation");
+ stat.addDescription("servlet-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("servlet-provider-annotation");
+ stat.printSummary("servlet-provider-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("injectedValue Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("servlet-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
index 4b47fc1..0c9d954 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
@@ -21,7 +21,7 @@
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.Service ;
+import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
import jakarta.ejb.Stateless;
@@ -42,11 +42,11 @@
private static final JAXBContext jaxbContext = createJAXBContext();
private int combo;
private int bodyIndex;
-
+
public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
-
+
private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
@@ -54,28 +54,28 @@
throw new WebServiceException(e.getMessage(), e);
}
}
-
-
+
+
public Source invoke(Source request) {
try {
recvBean(request);
return sendBean();
} catch(Exception e) {
e.printStackTrace();
- throw new WebServiceException("Provider endpoint failed", e);
+ throw new WebServiceException("Provider endpoint failed", e);
}
}
-
+
private void recvBean(Source source) throws Exception {
System.out.println("**** recvBean ******");
System.out.println(jaxbContext.createUnmarshaller().unmarshal(source));
JAXBElement element = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(source);
- System.out.println("name="+element.getName()+ " value=" + element.getValue());
+ System.out.println("name="+element.getName()+ " value=" + element.getValue());
if (element.getValue() instanceof SayHello) {
- SayHello hello = (SayHello) element.getValue();
+ SayHello hello = (SayHello) element.getValue();
System.out.println("Say Hello from " + hello.getArg0());
}
-
+
}
private Source sendBean() throws Exception {
@@ -83,9 +83,9 @@
SayHelloResponse resp = new SayHelloResponse();
resp.setReturn("WebSvcTest-Hello");
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectFactory factory = new ObjectFactory();
+ ObjectFactory factory = new ObjectFactory();
jaxbContext.createMarshaller().marshal(factory.createSayHelloResponse(resp), bout);
return new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java
index fba6051..649457e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,33 +50,33 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
paramElement.setValue(injectedString + " " + paramElement.getValue());
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml
index 22e5c8b..a1717d7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <servlet-class>endpoint.HelloImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <servlet-class>endpoint.HelloImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <url-pattern>/HelloImplService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <url-pattern>/HelloImplService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
<env-entry>
<env-entry-name>stringValue</env-entry-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties
index 4f5df04..f05063c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="restful-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml
index 1f6648f..713874b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml
@@ -59,8 +59,8 @@
<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -73,14 +73,14 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
<param name="other-args" value="restful-svc-2"/>
</antcall>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java
index b4b3356..06d2601 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java
@@ -53,7 +53,7 @@
private static String queryString = "num1=30&num2=20";
public static void main (String[] args) throws Exception {
- stat.addDescription("webservices-simple-restful-svc");
+ stat.addDescription("webservices-simple-restful-svc");
Client client = new Client();
Service service = client.createService();
URI endpointURI = new URI(endpointAddress);
@@ -72,7 +72,7 @@
System.out.println ("Invoking Restful GET Request with query string " + queryString);
Source result = d.invoke(null);
printSource(result);
- stat.printSummary("webservices-simple-restful-svc");
+ stat.printSummary("webservices-simple-restful-svc");
}
private Service createService() {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java
index 0faaab2..3728c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java
@@ -60,7 +60,7 @@
throw new HTTPException(500);
}
}
-
+
private Source createSource(String str) {
StringTokenizer st = new StringTokenizer(str, "=&/");
String token = st.nextToken();
@@ -76,5 +76,5 @@
new ByteArrayInputStream(body.getBytes()));
return source;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml
index 2ff674f..93baf24 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml
@@ -18,23 +18,23 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Restful Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Restful Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties
index eed198b..a1ec113 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="restful"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
index 0c7b5c7..85852de 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
@@ -58,8 +58,8 @@
<mkdir dir="${build.classes.dir}/client"/>
<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
@@ -74,7 +74,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
@@ -82,7 +82,7 @@
</antcall>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java
index 7fd67de..2e5cef7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java
@@ -40,13 +40,13 @@
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) throws Exception {
- stat.addDescription("webservices-simple-restful-svc");
- String endpointAddress =
+ stat.addDescription("webservices-simple-restful-svc");
+ String endpointAddress =
"http://HTTP_HOST:HTTP_PORT/restful/webservice/AddNumbersService";
URL url = new URL(endpointAddress+"?num1=10&num2=20");
System.out.println ("Invoking URL="+url);
process(url, args);
- stat.printSummary("webservices-simple-restful-svc");
+ stat.printSummary("webservices-simple-restful-svc");
}
private static void process(URL url, String[] args) throws Exception {
@@ -64,12 +64,12 @@
oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
trans.setOutputProperties(oprops);
trans.transform(source, sr);
- String resp = bos.toString();
+ String resp = bos.toString();
System.out.println("**** Response ******"+resp);
bos.close();
- if(resp.indexOf("<ns:return>30</ns:return>") != -1)
+ if(resp.indexOf("<ns:return>30</ns:return>") != -1)
stat.addStatus(args[0], stat.PASS);
- else
+ else
stat.addStatus(args[0], stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java
index 0faaab2..3728c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java
@@ -60,7 +60,7 @@
throw new HTTPException(500);
}
}
-
+
private Source createSource(String str) {
StringTokenizer st = new StringTokenizer(str, "=&/");
String token = st.nextToken();
@@ -76,5 +76,5 @@
new ByteArrayInputStream(body.getBytes()));
return source;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml
index 2ff674f..93baf24 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml
@@ -18,23 +18,23 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Restful Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Restful Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java
index 1154d3e..3cb717d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java
@@ -30,10 +30,10 @@
@WebServiceRef(name="service/MyService") static AddNumbersService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -41,7 +41,7 @@
AddNumbersPortType port = service.getAddNumbersPort();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/soap12/webservice/AddNumbersService?WSDL");
int ret = port.addNumbers(100, 200);
- if(ret != 300) {
+ if(ret != 300) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("soap12", stat.FAIL);
return;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties
index d496838..f0c1c06 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/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="soap12"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
index 555790c..ef09191 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
@@ -74,7 +74,7 @@
</antcall>
<replace file="appclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="appclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/appclient"
+ <javac srcdir="." destdir="${build.classes.dir}/appclient"
classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="appclient/**"/>
<mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl"/>
@@ -108,7 +108,7 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client-common"/>
</target>
-
+
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml
index 6a135ad..fe3f736 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml
index 4cfbb59..e6bb237 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java
index 374f5bd..c3d2b99 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.xml.ws.BindingType(jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
@jakarta.jws.WebService (wsdlLocation="WEB-INF/wsdl/AddNumbers.wsdl", serviceName="AddNumbersService", targetNamespace="http://duke.org", portName="AddNumbersPort", endpointInterface="endpoint.AddNumbersPortType")
public class AddNumbersImpl implements AddNumbersPortType {
-
+
public int addNumbers (int number1, int number2) {
return number1 + number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml
index 6256153..1889eb4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>AddNumbers Service</description>
+ <description>AddNumbers Service</description>
- <servlet>
- <description>Endpoint for AddNumbers Web Service</description>
- <display-name>AddNumbersWebService</display-name>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumbers Web Service</description>
+ <display-name>AddNumbersWebService</display-name>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties
index 3b23424..fa8a750 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/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="soaptcp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="ejb.wsit.descriptors" value="./etc/ejb"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
index e4f0916..db63bb5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
@@ -26,13 +26,13 @@
]>
<project name="webservicerefs" default="all" basedir=".">
-
+
&commonSetup;
&commonBuild;
&commonRun;
&testproperties;
&jaxwsTools;
-
+
<path id="client-classpath">
<pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
@@ -41,16 +41,16 @@
<pathelement path="${env.S1AS_HOME}/lib/activation.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
</path>
-
+
<target name="all" depends="clean, setup-web, clean, setup-ejb, assemble-client, runclient, undeploy"/>
-
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="setup-web" depends="assemble-web, deploy-web-app"/>
<target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
-
+
<target name="assemble-ejb">
<antcall target="compile-common">
<param name="src" value="ejb_endpoint"/>
@@ -63,7 +63,7 @@
<param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
</antcall>
</target>
-
+
<target name="assemble-web">
<antcall target="compile-common">
<param name="src" value="servlet_endpoint"/>
@@ -73,7 +73,7 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="assemble-client" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<echo message="wsimporting http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"/>
@@ -86,7 +86,7 @@
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
includes="client/**">
<classpath refid="client-classpath"/>
</javac>
@@ -94,22 +94,22 @@
<fileset dir="${client.wsit.descriptors}"/>
</copy>
</target>
-
+
<target name="deploy-web-app">
<antcall target="deploy-war-common">
<param name="contextroot" value="${appname}"/>
</antcall>
</target>
-
+
<target name="deploy-ejb-jar">
<antcall target="deploy-jar-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-jar-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
index 66ddd09..54a8bfd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
@@ -38,15 +38,15 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
@Resource
static jakarta.transaction.UserTransaction ut;
-
+
public static final int TIME_OUT = 1000 * 60;
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) {
stat.addDescription("soaptcp-test");
String host = "localhost";
@@ -54,12 +54,12 @@
if (args.length == 1) { // run with appclient?
args = args[0].split(" ");
}
-
+
if (args.length >= 2) {
host = args[0];
port = Integer.parseInt(args[1]);
}
-
+
System.out.println("Connecting to host: " + host + " port: " + port);
Client client = new Client();
if (client.doPortUnificationTest(host, port)) {
@@ -72,12 +72,12 @@
stat.printSummary("soaptcp-test");
}
-
+
public void doServletTest() {
try {
ServletHelloService svc = new ServletHelloService();
ServletHello port = svc.getServletHelloPort();
-
+
for (int i=0;i<10;i++) {
String ret = port.sayServletHello("Appserver Tester !");
if(ret.indexOf("WebSvcTest-Servlet-Hello") == -1) {
@@ -93,7 +93,7 @@
stat.addStatus("SOAP/TCP-Servlet-Endpoint", stat.FAIL);
}
}
-
+
public void doEjbTest() {
try {
WSHelloEJBService svc = new WSHelloEJBService();
@@ -114,7 +114,7 @@
stat.addStatus("SOAP/TCP-EJB-Endpoint", stat.FAIL);
}
}
-
+
public boolean doPortUnificationTest(String host, int port) {
try {
Socket s = new Socket("localhost", 8080);
@@ -122,24 +122,24 @@
final VersionController versionController = VersionController.getInstance();
final Version framingVersion = versionController.getFramingVersion();
final Version connectionManagementVersion = versionController.getConnectionManagementVersion();
-
+
final OutputStream outputStream = s.getOutputStream();
outputStream.write(TCPConstants.PROTOCOL_SCHEMA.getBytes("US-ASCII"));
-
+
DataInOutUtils.writeInts4(outputStream, framingVersion.getMajor(),
framingVersion.getMinor(),
connectionManagementVersion.getMajor(),
connectionManagementVersion.getMinor());
outputStream.flush();
-
+
final InputStream inputStream = s.getInputStream();
final int[] versionInfo = new int[4];
-
+
DataInOutUtils.readInts4(inputStream, versionInfo, 4);
-
+
final Version serverFramingVersion = new Version(versionInfo[0], versionInfo[1]);
final Version serverConnectionManagementVersion = new Version(versionInfo[2], versionInfo[3]);
-
+
final boolean success = versionController.isVersionSupported(serverFramingVersion, serverConnectionManagementVersion);
if (success) {
stat.addStatus("SOAP/TCP-PortUnification", stat.PASS);
@@ -153,7 +153,7 @@
e.printStackTrace();
stat.addStatus("SOAP/TCP-PortUnification", stat.FAIL);
}
-
+
return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml
index 34ce41f..fae3b40 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml
@@ -18,10 +18,10 @@
-->
<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="mainclientconfig"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="mainclientconfig"
>
<import location="ServiceChannelWSImpl.wsdl" namespace="http://servicechannel.tcp.transport.ws.xml.sun.com/"/>
<import location="ServletHelloService.wsdl" namespace="http://servlet_endpoint/"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml
index 641a670..b29d2e5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml
@@ -18,10 +18,10 @@
-->
<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="WSHelloEJBService" targetNamespace="http://ejb_endpoint/" xmlns:tns="http://ejb_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="WSHelloEJBService" targetNamespace="http://ejb_endpoint/" xmlns:tns="http://ejb_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
>
<portType name="WSHelloEJB"/>
<binding name="WSHelloEJBPortBinding" type="tns:WSHelloEJB">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml
index 4a63f76..efc46b4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml
@@ -18,10 +18,10 @@
-->
<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="ServletHelloService" targetNamespace="http://servlet_endpoint/" xmlns:tns="http://servlet_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="ServletHelloService" targetNamespace="http://servlet_endpoint/" xmlns:tns="http://servlet_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
>
<portType name="ServletHello"/>
<binding name="ServletHelloPortBinding" type="tns:ServletHello">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java
index 79b0725..e931bd4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java
@@ -20,8 +20,8 @@
@WebService
public class ServletHello {
-
+
public String sayServletHello(String param) {
- return "WebSvcTest-Servlet-Hello " + param;
+ return "WebSvcTest-Servlet-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml
index f06f74c..0add81d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml
@@ -18,25 +18,25 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Servlet Hello Service</description>
- <display-name>Servlet HelloWAR</display-name>
+ <description>WebTier for the Servlet Hello Service</description>
+ <display-name>Servlet HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Servlet Hello Web Service</description>
- <display-name>ServletHelloWebService</display-name>
- <servlet-name>ServletHello</servlet-name>
- <servlet-class>servlet_endpoint.ServletHello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Servlet Hello Web Service</description>
+ <display-name>ServletHelloWebService</display-name>
+ <servlet-name>ServletHello</servlet-name>
+ <servlet-class>servlet_endpoint.ServletHello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>ServletHello</servlet-name>
- <url-pattern>/webservice/ServletHelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ServletHello</servlet-name>
+ <url-pattern>/webservice/ServletHelloService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties
index 5c1b4ab..6228337 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/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="svchandler-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml
index 4a7a61d..1188534 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml
@@ -83,7 +83,7 @@
<replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpathref="class.path"
+ classpathref="class.path"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -124,11 +124,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java
index b893b9a..1494959 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1113]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java
index 659c48e..8101459 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java
index e0a5767..469d6bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.annotation.PostConstruct;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -49,7 +49,7 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
@@ -59,7 +59,7 @@
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -67,16 +67,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml
index 8f43a6d..ce6cd23 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
<env-entry>
<env-entry-name>stringValue</env-entry-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
index 1502ffd..b79fc8e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties
index 4ddb9df..1459562 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/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="svchandler-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml
index 77b2277..4931caf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml
@@ -87,7 +87,7 @@
<replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpathref="class.path"
+ classpathref="class.path"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -133,11 +133,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -147,7 +147,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java
index d033c31..9f7003b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1113]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java
index f908128..36087ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,17 +50,17 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -68,16 +68,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml
index 54d20c4..6ccb50c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+
<env-entry>
<env-entry-name>stringValue</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
index a51166f..8a636df 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties
index e0d0521..e94e814 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/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="svchandler-3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml
index f559505..e72a881 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml
@@ -85,7 +85,7 @@
<replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpathref="class.path"
+ classpathref="class.path"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -126,11 +126,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -141,7 +141,7 @@
</java>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java
index 56549fa..4d6026c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1111]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java
index 2de4c99..2966c4a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java
@@ -26,17 +26,17 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public boolean handleMessage(SOAPMessageContext context) {
try {
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -44,14 +44,14 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
index 51277cb..43f60b3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties
index b8724bc..0212ecd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/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="svchandler-4"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml
index 4de419f..1606289 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml
@@ -130,11 +130,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java
index 61bc820..6690ee7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1113]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml
index 839fcb1..48f1716 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml
index 170d667..0988122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java
index f908128..36087ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,17 +50,17 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -68,16 +68,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml
index 54d20c4..6ccb50c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+
<env-entry>
<env-entry-name>stringValue</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
index 4e2b758..a419b13 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties
index 8326c83..2471559 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="warservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml
index 83dd39d..04725f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml
@@ -73,7 +73,7 @@
<antcall target="restart-server-instance-common"/>
<antcall target="runclient"/>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
@@ -81,7 +81,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java
index 00a2aaa..0f9a47e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java
@@ -32,10 +32,10 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -43,16 +43,16 @@
Hello port = service.getHelloPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(args[0], stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java
index c5727b2..14b6e0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml
index 37ce182..cc6411f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties
index 209d951..a501470 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/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="${ant.project.name}"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml
index 5d003d2..f1f48e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml
@@ -122,11 +122,11 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml
index 0fb0f1b..01549ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties
index b469bab..1705d29 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/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="webserviceref-lookup"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml
index d2a8f72..4210493 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -124,11 +124,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java
index 0def70d..ce82592 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
index 49cd203..1ef2021 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
@@ -27,14 +27,14 @@
public class Client extends HttpServlet {
@jakarta.xml.ws.WebServiceRef(name="foo/bar" )
- @Addressing
+ @Addressing
SubtractNumbersService service;
@jakarta.xml.ws.WebServiceRef(lookup="java:comp/env/foo/bar")
SubtractNumbersService service2;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties
index 58c6cb7..032e613 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservicerefs"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
index e1c0513..8aca3eb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
@@ -78,8 +78,8 @@
<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -97,7 +97,7 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-jar-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java
index 70a6d40..7cbb799 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java
@@ -36,11 +36,11 @@
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
- stat.addDescription("webservicerefs-test");
+ stat.addDescription("webservicerefs-test");
Client client = new Client();
client.doServletTest();
client.doEjbTest();
- stat.printSummary("webservicerefs-test");
+ stat.printSummary("webservicerefs-test");
}
public void doServletTest() {
@@ -50,11 +50,11 @@
ServletHello port = svc.getServletHelloPort();
for (int i=0;i<10;i++) {
String ret = port.sayServletHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Servlet-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Servlet-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("WebServiceRefs-Servlet-Endpoint", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("WebServiceRefs-Servlet-Endpoint", stat.PASS);
@@ -71,11 +71,11 @@
WSHello port = svc.getWSHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayEjbHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-EJB-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-EJB-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("WebServiceRefs-EJB-Endpoint", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("WebServiceRefs-EJB-Endpoint", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java
index 73d3a54..bb2fa72 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java
@@ -21,5 +21,5 @@
@WebService
public interface WSHello {
- public String sayEjbHello(String who);
+ public String sayEjbHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java
index 79b0725..e931bd4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java
@@ -20,8 +20,8 @@
@WebService
public class ServletHello {
-
+
public String sayServletHello(String param) {
- return "WebSvcTest-Servlet-Hello " + param;
+ return "WebSvcTest-Servlet-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml
index f06f74c..0add81d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml
@@ -18,25 +18,25 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Servlet Hello Service</description>
- <display-name>Servlet HelloWAR</display-name>
+ <description>WebTier for the Servlet Hello Service</description>
+ <display-name>Servlet HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Servlet Hello Web Service</description>
- <display-name>ServletHelloWebService</display-name>
- <servlet-name>ServletHello</servlet-name>
- <servlet-class>servlet_endpoint.ServletHello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Servlet Hello Web Service</description>
+ <display-name>ServletHelloWebService</display-name>
+ <servlet-name>ServletHello</servlet-name>
+ <servlet-class>servlet_endpoint.ServletHello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>ServletHello</servlet-name>
- <url-pattern>/webservice/ServletHelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ServletHello</servlet-name>
+ <url-pattern>/webservice/ServletHelloService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties
index e46a810..99c4c7e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/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="webservices13-addressing-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml
index 6389e73..0961163 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -124,11 +124,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java
index 2a92e35..3ce871b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
index a478d81..3debd3d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
@@ -28,11 +28,11 @@
@jakarta.xml.ws.WebServiceRef(name="foo/bar" ,value =SubtractNumbersService.class)
@Addressing (enabled=false)
- //@Addressing
+ //@Addressing
SubtractNumbersImpl port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java
index 97bd436..798cf0a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java
@@ -32,10 +32,10 @@
@WebServiceRef(name="service/MyService") static AddNumbersService service;
public static void main(String[] args) {
- stat.addDescription("webservices13-addressing-appclient test");
+ stat.addDescription("webservices13-addressing-appclient test");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices13-addressing-appclientID");
+ stat.printSummary("webservices13-addressing-appclientID");
}
public void doTest(String[] args) {
@@ -45,7 +45,7 @@
AddNumbersPortType port = service.getAddNumbersPort();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://localhost:8080/webservices13-addressing-appclient/webservice/AddNumbersService?WSDL");
int ret = port.addNumbers(100, 200);
- if(ret != 300) {
+ if(ret != 300) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("webservices13-addressing-appclient", stat.FAIL);
return;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties
index 019c686..5c739c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/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="webservices13-addressing-appclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml
index 7ffa7b0..3920cfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml
@@ -109,7 +109,7 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client-common"/>
</target>
-
+
<target name="runtest" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml
index 6a135ad..fe3f736 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml
index 4cfbb59..e6bb237 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java
index 374f5bd..c3d2b99 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.xml.ws.BindingType(jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
@jakarta.jws.WebService (wsdlLocation="WEB-INF/wsdl/AddNumbers.wsdl", serviceName="AddNumbersService", targetNamespace="http://duke.org", portName="AddNumbersPort", endpointInterface="endpoint.AddNumbersPortType")
public class AddNumbersImpl implements AddNumbersPortType {
-
+
public int addNumbers (int number1, int number2) {
return number1 + number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml
index 6256153..1889eb4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>AddNumbers Service</description>
+ <description>AddNumbers Service</description>
- <servlet>
- <description>Endpoint for AddNumbers Web Service</description>
- <display-name>AddNumbersWebService</display-name>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumbers Web Service</description>
+ <display-name>AddNumbersWebService</display-name>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties
index 80bb1c1..b711cb3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/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="webservices13-addressing"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml
index bccc7ab..4ae3018 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -124,11 +124,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java
index 2d1571d..35b7a1a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
index 55f405f..fddb240 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
@@ -28,11 +28,11 @@
@jakarta.xml.ws.WebServiceRef(SubtractNumbersService.class)
//@Addressing (required = true,enabled=true ,responses=AddressingFeature.Responses.NON_ANONYMOUS)
- //@Addressing
+ //@Addressing
SubtractNumbersImpl port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties
index 05ee829..376f59f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/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="webservices13-clientdds"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml
index e85eb0d..8ef10aa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml
@@ -64,7 +64,7 @@
<antcall target="wsimport">
<param name="wsimport.args"
value=" -Xendorsed -p endpoint -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/webservices13-clientdds/SubtractNumbers.wsdl"/>
- </antcall>
+ </antcall>
<antcall target="compile"/>
<antcall target="pkg-war">
<param name="wsdlfile.location" value="${env.APS_HOME}/devtests/webservice/annotations/webservices13-clientdds"/>
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -125,11 +125,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java
index fbd3af2..2ed3a91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java
index 8d10efd..4c9bc4e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java
@@ -26,7 +26,7 @@
endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
index 21087d2..8fad0d4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
@@ -28,11 +28,11 @@
//@jakarta.xml.ws.WebServiceRef(SubtractNumbersService.class)
//@Addressing (required = true,enabled=true ,responses=AddressingFeature.Responses.NON_ANONYMOUS)
- //@Addressing
+ //@Addressing
SubtractNumbersPortType port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties
index 9f0eb51..55dcf0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/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="webservices13-respectbinding"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml
index a86a237..12922e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml
@@ -86,7 +86,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -127,11 +127,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -141,7 +141,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java
index 987551d..77e2cab 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml
@@ -18,29 +18,29 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
index 2c75f33..2421143 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
@@ -28,11 +28,11 @@
@jakarta.xml.ws.WebServiceRef(SubtractNumbersService.class)
//@Addressing (required = true,enabled=true ,responses=AddressingFeature.Responses.NON_ANONYMOUS)
- //@Addressing
+ //@Addressing
SubtractNumbersImpl port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties
index cef48f8..73df654 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/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="wsctx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml
index 4e70668..97c8198 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml
@@ -56,12 +56,12 @@
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="assemble-client" depends="init-common">
<mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
@@ -78,7 +78,7 @@
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
<jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
</target>
-
+
<target name="deploy-client" depends="init-common">
<property name="client.war" value="${assemble.dir}/wsclient.war"/>
<echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java
index 557110f..083dc69 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello AllHelloWAR]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
index 4af6b43..b2dd71c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
@@ -26,20 +26,20 @@
@WebService
public class Hello {
-
+
@Resource WebServiceContext wsc;
public String sayHello(String param) {
- System.out.println("wsctxt-servlet wsc = " + wsc);
- if(wsc != null) {
+ System.out.println("wsctxt-servlet wsc = " + wsc);
+ if(wsc != null) {
ServletContext sc =
(ServletContext)wsc.getMessageContext().get(MessageContext.SERVLET_CONTEXT);
String a = null;
if (sc!= null ) {
a = sc.getServletContextName();
}
- return "Hello " + param +a;
+ return "Hello " + param +a;
}
- return "WebService Context injection failed";
+ return "WebService Context injection failed";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
index 40fc285..95cb73f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
@@ -29,8 +29,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties
index 55de93a..efbd7ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsdltojava"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
index e5499f5..7c41604 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
@@ -71,8 +71,8 @@
<param name="wsimport.args"
value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/wsdltojava/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -85,14 +85,14 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runtest">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
<param name="other-args" value="basic-wsdl-to-java-test-case"/>
</antcall>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="HttpTestService.wsdl" token="${http.host}" value="HTTP_HOST"/>
<replace file="HttpTestService.wsdl" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java
index e544de5..47200d0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java
@@ -22,33 +22,33 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef static HttpTestService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
- HelloRequest req = new HelloRequest();
- req.setString("From Vijay ");
- HelloResponse resp = port.hello(req);
- if(resp.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp.getString());
- stat.addStatus(args[0], stat.PASS);
+ HelloRequest req = new HelloRequest();
+ req.setString("From Vijay ");
+ HelloResponse resp = port.hello(req);
+ if(resp.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp.getString());
+ stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
e.printStackTrace();
- stat.addStatus(args[0], stat.FAIL);
+ stat.addStatus(args[0], stat.FAIL);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
index 7c3372f..99df632 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
@@ -23,9 +23,9 @@
<package name="client"/>
</bindings>
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
<ns2:package name="client"/>
</ns2:schemaBindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
index 242611b..58c55e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
@@ -23,9 +23,9 @@
<package name="service"/>
</bindings>
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
<ns2:package name="service"/>
</ns2:schemaBindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java
index a93d8d1..654ce72 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java
@@ -38,8 +38,8 @@
public HelloResponse hello(HelloRequest req) {
System.out.println("Hello, " + req.getString() + "!");
- HelloResponse resp = new HelloResponse();
- resp.setString("Hello, " + req.getString() + "!");
+ HelloResponse resp = new HelloResponse();
+ resp.setString("Hello, " + req.getString() + "!");
return resp;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml
index 640433a..95665f8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>WSW2JRLHttpTestApp</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml b/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml
index 2529bc1..0a50676 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml
@@ -39,10 +39,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant doclit
- ant all
- </echo>
+ <echo>
+ Usage:
+ ant doclit
+ ant all
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties
index 31029ff..dc3f633 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="doclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml
index 648ec53..95d9412 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="build" depends="init-common, clean">
@@ -61,7 +61,7 @@
<target name="gen-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping.xml ${features} config.xml"/>
</antcall>
</target>
@@ -70,7 +70,7 @@
<!-- NO feature flags as mapping file should contain enough info -->
<target name="gen-non-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:both -cp . -f:wsi mapping.config.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties
index b375f50..8c339e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml
index c74260a..e36baee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="build" depends="init-common, clean">
@@ -61,7 +61,7 @@
<target name="gen-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping.xml ${features} config.xml"/>
</antcall>
</target>
@@ -70,7 +70,7 @@
<!-- NO feature flags as mapping file should contain enough info -->
<target name="gen-non-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:both -cp . -f:wsi mapping.config.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/build.xml
index c60dc4f..6e5faaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/build.xml
@@ -39,16 +39,16 @@
<ant dir="jaxrpc-hello-ejb" target="all"/>
<delete dir="${env.APS_HOME}/build/module"/>
<ant dir="jaxrpc-hello-web" target="all"/>
-<!-- <ant dir="googleserver" target="all"/>--> <!-- 3 tests -->
+<!-- <ant dir="googleserver" target="all"/>--> <!-- 3 tests -->
<ant dir="xsdany" target="all"/> <!-- 1 test -->
<ant dir="filter_urlhandling" target="all"/> <!-- 1 test -->
<!-- <ant dir="security" target="all"/>--> <!-- 9 test -->
-<!-- <ant dir="simplefault" target="all"/>
- <ant dir="handler" target="all"/>
- <ant dir="webstub_properties" target="all"/>
- <ant dir="servlethandler" target="all"/>-->
- <ant dir="annotations" target="all"/>
- <ant dir="ejb_annotations" target="all"/>
+<!-- <ant dir="simplefault" target="all"/>
+ <ant dir="handler" target="all"/>
+ <ant dir="webstub_properties" target="all"/>
+ <ant dir="servlethandler" target="all"/>-->
+ <ant dir="annotations" target="all"/>
+ <ant dir="ejb_annotations" target="all"/>
<ant dir="mapping/j2w/signature" target="all"/> <!-- 2 tests -->
<ant dir="google" target="all"/> <!-- 1 test -->
<ant dir="gf_dd/endpoint_address_uri" target="all"/> <!-- 1 test -->
@@ -87,24 +87,24 @@
<target name="clean">
<delete>
- <fileset dir="${basedir}"
+ <fileset dir="${basedir}"
includes="**.output, count.txt"/>
</delete>
<ant dir="google" target="clean"/>
<ant dir="xsdany" target="clean"/>
<ant dir="mapping/j2w/signature" target="clean"/>
<ant dir="webstub_properties" target="clean"/>
- <ant dir="filter_urlhandling" target="clean"/>
+ <ant dir="filter_urlhandling" target="clean"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the webservice tests)
+ <echo>
+ Usage:
+ ant all (Executes all the webservice tests)
- ant google (Executes the google tests)
- ant xsdany (Executes the xsdany tests)
- </echo>
+ ant google (Executes the google tests)
+ ant xsdany (Executes the xsdany tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
index e7f211e..d6dea53 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
@@ -84,14 +84,14 @@
</target>
-
-
+
+
<target name="clean" >
<delete dir="${build}" />
<delete dir="${env.APS_HOME}/build" />
- <delete dir="${dist}" />
+ <delete dir="${dist}" />
<delete dir="${assemble}" />
<delete dir="${assemble.dir}" />
<delete file="${ear.name}" />
@@ -191,7 +191,7 @@
onerror="abort" >
<transaction src="${sql.script}"/>
</sql>
- </target>
+ </target>
<target name="delete-db"
description="Deletes the database tables." >
@@ -221,39 +221,39 @@
<equals arg1="${db.ping.result}" arg2="0" />
</condition>
</target>
-
+
<target name="start-db"
unless="db.running"
description="Starts the Derby databse server."
depends="ping-db">
-
+
<sun-appserv-admin
explicitcommand="start-database" />
</target>
-
+
<target name="stop-db"
description="Stops the Derby database server."
depends="ping-db"
if="db.running">
<sun-appserv-admin
explicitcommand="stop-database" />
- </target>
-
+ </target>
+
<target name="admin_command_common">
<echo message="Doing admin task ${admin.command}"/>
- <sun-appserv-admin
+ <sun-appserv-admin
command="${admin.command}"
- user="${admin.user}"
- passwordfile="${admin.password.file}"
- host="${admin.host}"
- port="${admin.port}"
+ user="${admin.user}"
+ passwordfile="${admin.password.file}"
+ host="${admin.host}"
+ port="${admin.port}"
asinstalldir="${j2ee.home}" />
</target>
-
+
<target name="create-jdbc-resource_common">
<antcall target="admin_command_common">
<param name="admin.command"
- value="create-jdbc-resource
+ value="create-jdbc-resource
--connectionpoolid ${conpool.name} ${jdbc.resource.name}" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties
index e86f005..e9ff113 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/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="doclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml
index 7b31edf..6c45a06 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -52,16 +52,16 @@
<target name="assemble" depends="init-common, build, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SimpleTest.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="DocLitMapping.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="DocLitMapping.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="DocLitMapping.xml,META-INF/wsdl/**,doclit/*.class" />
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -75,19 +75,19 @@
<target name="run" depends="init-common">
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config.xml"/>
</antcall>
<copy todir="${build.classes.dir}/doclit">
- <fileset dir="output/doclit"
+ <fileset dir="output/doclit"
includes="SimpleTest.class"/>
</copy>
<delete dir="output"/>
@@ -98,23 +98,23 @@
<mkdir dir="output"/>
<antcall target="run.wscompile">
<!-- use model -->
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model DocLitMapping.xml wscompile_config.xml"/>
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model DocLitMapping.xml wscompile_config.xml"/>
<!-- use mapping -->
-<!--
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
+<!--
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
-->
</antcall>
<delete dir="output"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant clean
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant clean
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
index e6e100e..36597bb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
@@ -15,7 +15,7 @@
*/
/*
- * @(#)SimpleTestImpl.java 1.3 02/04/05
+ * @(#)SimpleTestImpl.java 1.3 02/04/05
*/
package doclit;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml
index db0451e..a7cee02 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SimpleTest.wsdl"
packageName="doclit"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml
index 743a418..82e6172 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml
@@ -17,16 +17,16 @@
-->
<property environment="env"/>
-<property file="${env.APS_HOME}/config.properties"/>
+<property file="${env.APS_HOME}/config.properties"/>
<target name="test-all" depends="clean">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
<echo message="Starting Test ${directory}"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="deploy">
- <param name="pkg-name" value="${pkg-name}"/>
- </antcall>
+ <param name="pkg-name" value="${pkg-name}"/>
+ </antcall>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
@@ -42,11 +42,11 @@
</target>
<target name="clean">
- <echo message="Clean from ${ant.file}"/>
+ <echo message="Clean from ${ant.file}"/>
<delete dir="${env.APS_HOME}/build/module/classes"/>
- <delete dir="${env.APS_HOME}/build/module/archive"/>
- <mkdir dir="${env.APS_HOME}/build/module/classes"/>
- <mkdir dir="${env.APS_HOME}/build/module/archive"/>
+ <delete dir="${env.APS_HOME}/build/module/archive"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes"/>
+ <mkdir dir="${env.APS_HOME}/build/module/archive"/>
</target>
<path id="classpath">
@@ -68,14 +68,14 @@
<target name="test-compile">
<echo message="Compiling into ${pkg-name}/${server}.class"/>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/*.java">
<classpath refid="classpath"/>
</javac>
</target>
<target name="compile-client">
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="${client-src-name}">
<classpath refid="classpath"/>
</javac>
@@ -84,15 +84,15 @@
<target name="build">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="test-compile"/>
<echo message="Building with package ${pkg-name}"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar"
basedir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/**">
- <metainf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- </jar>
+ <metainf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ </jar>
</target>
<target name="deploy">
@@ -109,7 +109,7 @@
<target name="undeploy">
<basename file="${src-name}" property="server" suffix=".java"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.jar"/>
+ <param name="filename" value="${server}.jar"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -132,7 +132,7 @@
</target>
<target name="report" depends="internal-report-success, internal-report-failure">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
</target>
<target name="run">
@@ -145,7 +145,7 @@
</condition>
<antcall target="prepare-client"/>
<antcall target="internal-run"/>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
@@ -159,7 +159,7 @@
</target>
<target name="configurable-wsdl-import">
- <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
+ <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL"/>
</exec>
@@ -169,13 +169,13 @@
<!--basename file="${server}" property="port" suffix="EJB"/-->
<basename file="${server}" property="port"/>
<antcall target="wsdl-import">
- <param name="server" value="${server}"/>
- <param name="port" value="${port}"/>
+ <param name="server" value="${server}"/>
+ <param name="port" value="${port}"/>
</antcall>
<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<antcall target="unjar-client-utils"/>
</target>
@@ -186,11 +186,11 @@
<target name="internal-run" if="deploy_succeeded">
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
<echo message="Running appclient with ${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
+ <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties
index e909636..c49e40e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="async"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml
index d3e3a28..e02613e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml
@@ -60,8 +60,8 @@
<param name="wsimport.args"
value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -72,13 +72,13 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
<param name="other-args" value="async-ejb-test"/>
</antcall>
- <!--restore the tokens back in file-->
+ <!--restore the tokens back in file-->
<replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
<replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
index b92f35b..66fe8d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
@@ -37,23 +37,23 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("async-ejb-service");
+ stat.addDescription("async-ejb-service");
Client client = new Client();
client.doSyncTest();
client.doASyncPollTest();
client.doASyncCallBackTest();
- stat.printSummary("async-ejb-service");
+ stat.printSummary("async-ejb-service");
}
public void doSyncTest() {
try {
AddNumbersImpl port = service.getAddNumbersImplPort();
int ret = port.addNumbers(2222, 1234);
- if(ret!=(2222+1234)) {
+ if(ret!=(2222+1234)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-ejb-service-sync-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-ejb-service-sync-test", stat.PASS);
} catch(Exception e) {
@@ -70,11 +70,11 @@
Thread.sleep (2000);
AddNumbersResponse output = resp.get();
int ret = output.getReturn();
- if(ret!=(1234+5678)) {
+ if(ret!=(1234+5678)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-ejb-service-poll-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-ejb-service-poll-test", stat.PASS);
} catch(Exception e) {
@@ -92,11 +92,11 @@
Thread.sleep (2000);
AddNumbersResponse output = cbh.getResponse ();
int ret = output.getReturn();
- if(ret!=(9876+5432)) {
+ if(ret!=(9876+5432)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-ejb-service-callbackhandler-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-ejb-service-callbackhandler-test", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml
index 633f712..0e3aca6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/AddNumbersImplService/AddNumbersImpl?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
<enableAsyncMapping>true</enableAsyncMapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml
index d0669de..1c9b9fd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml
@@ -22,7 +22,7 @@
]>
<project name="Hello" default="core" basedir=".">
-
+
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
@@ -32,18 +32,18 @@
<target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar"/>
+ </antcall>
</target>
<target name="private-run">
- <antcall target="clean"/>
- <echo message="wsimporting http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL"/>
+ <antcall target="clean"/>
+ <echo message="wsimporting http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL"/>
<replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST"/>
<replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
@@ -54,10 +54,10 @@
<classpath refid="classpath"/>
</javac>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**"/>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</or>
@@ -68,20 +68,20 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<echo message="Running appclient with ${client-pkg-name}.${client}"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
-<!--restore the tokens back in file-->
+<!--restore the tokens back in file-->
<replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
<replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
</target>
@@ -92,6 +92,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
index 372facd..4ca9ba4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
@@ -17,7 +17,7 @@
package client;
import jakarta.ejb.EJB;
-import ejb.Hello;
+import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -27,25 +27,25 @@
new SimpleReporterAdapter("appserv-tests");
@EJB(mappedName="ejb.Hello")
- static Hello hello;
+ static Hello hello;
public static void main(String[] args) {
- stat.addDescription("async-ejb-client");
+ stat.addDescription("async-ejb-client");
Client client = new Client();
client.doSyncTest();
client.doAsyncPollTest();
client.doAsyncCallbackTest();
- stat.printSummary("async-ejb-client");
+ stat.printSummary("async-ejb-client");
}
public void doSyncTest() {
try {
String ret = hello.invokeSync("Hello Tester !");
- if(ret.indexOf("SYNC CALL") == -1) {
+ if(ret.indexOf("SYNC CALL") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("async-sync-ejb-client", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-sync-ejb-client", stat.PASS);
} catch(Exception e) {
@@ -57,11 +57,11 @@
public void doAsyncPollTest() {
try {
String ret = hello.invokeAsyncPoll("Hello Tester !");
- if(ret.indexOf("ASYNC POLL CALL") == -1) {
+ if(ret.indexOf("ASYNC POLL CALL") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("async-poll-ejb-client", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-poll-ejb-client", stat.PASS);
} catch(Exception e) {
@@ -73,11 +73,11 @@
public void doAsyncCallbackTest() {
try {
String ret = hello.invokeAsyncCallBack("Hello Tester !");
- if(ret.indexOf("ASYNC CALL BACK CALL") == -1) {
+ if(ret.indexOf("ASYNC CALL BACK CALL") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("async-callback-ejb-client", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-callback-ejb-client", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml
index 8857cca..67df59b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/WebServiceEJBService/WebServiceEJB?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="ejb"/>
<enableAsyncMapping>true</enableAsyncMapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
index 2baa0f0..5907284 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
@@ -20,7 +20,7 @@
@Remote
public interface Hello {
- public String invokeSync(String msg);
- public String invokeAsyncPoll(String msg);
- public String invokeAsyncCallBack(String msg);
+ public String invokeSync(String msg);
+ public String invokeAsyncPoll(String msg);
+ public String invokeAsyncCallBack(String msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
index 3fe23ee..c897330 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
@@ -27,24 +27,24 @@
import endpoint.SayHelloResponse;
-@Stateless
+@Stateless
public class HelloEJB implements Hello {
@WebServiceRef
WebServiceEJBService webService;
-
+
public String invokeSync(String string) {
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
- return ejb.sayHello("SYNC CALL" + string);
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ return ejb.sayHello("SYNC CALL" + string);
}
public String invokeAsyncPoll(String msg) {
try {
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
Response<SayHelloResponse> resp = ejb.sayHelloAsync("ASYNC POLL CALL" + msg);
- Thread.sleep (2000);
- SayHelloResponse out = resp.get();
+ Thread.sleep (2000);
+ SayHelloResponse out = resp.get();
return(out.getReturn());
} catch(Throwable t) {
return(t.getMessage());
@@ -52,9 +52,9 @@
}
public String invokeAsyncCallBack(String msg) {
- try {
+ try {
System.out.println("VIJ - invoking async call back");
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
MyCallBackHandler cbh = new MyCallBackHandler();
Future<?> response =
ejb.sayHelloAsync("ASYNC CALL BACK CALL" + msg, cbh);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties
index 25afd85..4f9b61e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="bigint"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml
index c4bd333..5a88fc3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml
@@ -51,7 +51,7 @@
<jar destfile="${assemble.dir}/${appname}-ejb.jar"
basedir="${build.classes.dir}"
includes="**">
- </jar>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
@@ -61,8 +61,8 @@
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -75,7 +75,7 @@
<arg line="${as.props}"/>
<arg line="--upload=true"/>
<arg line="--dropandcreatetables"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-ejb.jar"/>
</exec>
</target>
@@ -86,14 +86,14 @@
<arg line="${as.props}"/>
<arg line="--droptables=true"/>
<arg line="--cascade=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${appname}-ejb"/>
</exec>
<exec executable="${ASADMIN}" failonerror="true">
<arg line="stop-database"/>
</exec>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
index 27427f1..c448b8c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
@@ -47,6 +47,6 @@
System.out.println("removeCustomer");
String ejbQL = "DELETE FROM Customer c WHERE c.name = \""+id+"\"";
int ret = em.createQuery( ejbQL ).executeUpdate();
- return ret;
+ return ret;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
index 036906a..5d4a26a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
@@ -24,41 +24,41 @@
<target name="all">
<ant dir="noname" target="all"/>
<ant dir="nointf" target="all"/>
- <ant dir="security" target="all"/>
- <!--ant dir="provider" target="all"/-->
- <ant dir="oneway" target="all"/>
- <ant dir="wsctxtinterceptor" target="all"/>
+ <ant dir="security" target="all"/>
+ <!--ant dir="provider" target="all"/-->
+ <ant dir="oneway" target="all"/>
+ <ant dir="wsctxtinterceptor" target="all"/>
<ant dir="ejbclient" target="all"/>
- <ant dir="msgctxt" target="all"/>
- <ant dir="asyncejbclient" target="all"/>
+ <ant dir="msgctxt" target="all"/>
+ <ant dir="asyncejbclient" target="all"/>
<ant dir="serviceejbclient" target="all"/>
- <ant dir="portejbclient" target="all"/>
- <ant dir="localremoteejbwebservice" target="all"/>
- <ant dir="libdependent" target="all"/>
- <ant dir="messagectxt" target="all"/>
- <ant dir="singleton" target="all"/>
- <ant dir="msgctxinterceptor" target="all"/>
- <ant dir="ejbwebservicesinwar" target="all"/>
- <ant dir="ejbwebservicesinwar-2" target="all"/>
- <ant dir="ejbwebservicesinwar-3" target="all"/>
- <ant dir="ejbwebservicesinwar-sessioncontext" target="all"/>
- <ant dir="ejbwebservicesinwar-interceptor" target="all"/>
+ <ant dir="portejbclient" target="all"/>
+ <ant dir="localremoteejbwebservice" target="all"/>
+ <ant dir="libdependent" target="all"/>
+ <ant dir="messagectxt" target="all"/>
+ <ant dir="singleton" target="all"/>
+ <ant dir="msgctxinterceptor" target="all"/>
+ <ant dir="ejbwebservicesinwar" target="all"/>
+ <ant dir="ejbwebservicesinwar-2" target="all"/>
+ <ant dir="ejbwebservicesinwar-3" target="all"/>
+ <ant dir="ejbwebservicesinwar-sessioncontext" target="all"/>
+ <ant dir="ejbwebservicesinwar-interceptor" target="all"/>
<ant dir="ejbservletwebservicesinwar" target="all"/>
- <ant dir="async" target="all"/>
- <!--<ant dir="bigint" target="all"/>-->
- <ant dir="libdependent" target="all"/>
- <ant dir="libdependent-2" target="all"/>
+ <ant dir="async" target="all"/>
+ <!--<ant dir="bigint" target="all"/>-->
+ <ant dir="libdependent" target="all"/>
+ <ant dir="libdependent-2" target="all"/>
<ant dir="svchandler" target="all"/>
- <ant dir="wsctxt" target="all"/>
- <ant dir="sessionctx" target="all"/>
- <ant dir="wsnameejbname" target="all"/>
- <ant dir="dependencynoinjection" target="all"/>
- <ant dir="exception" target="all"/>
- <ant dir="methodinjection" target="all"/>
- <ant dir="invalidmethodinjection" target="all"/>
+ <ant dir="wsctxt" target="all"/>
+ <ant dir="sessionctx" target="all"/>
+ <ant dir="wsnameejbname" target="all"/>
+ <ant dir="dependencynoinjection" target="all"/>
+ <ant dir="exception" target="all"/>
+ <ant dir="methodinjection" target="all"/>
+ <ant dir="invalidmethodinjection" target="all"/>
<ant dir="portdependencynoinjection" target="all"/>
- <ant dir="portfieldinjection" target="all"/>
- <ant dir="portmethodinjection" target="all"/>
+ <ant dir="portfieldinjection" target="all"/>
+ <ant dir="portmethodinjection" target="all"/>
<ant dir="wsRef-webservice-features" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
index 7abf638..5461e1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
@@ -34,22 +34,22 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ws-dependency-no-injection");
+ stat.addDescription("ws-dependency-no-injection");
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
- } catch(Throwable t) {
- t.printStackTrace();
- System.out.println("Dependency lookup failed : " + t.getMessage());
- stat.addStatus("ws-dependency-no-injection", stat.FAIL);
- }
- System.out.println("Service is " + service);
- if (service!=null) {
- Client client = new Client();
- client.doTest(args);
- }
- stat.printSummary("ws-dependency-no-injection");
+ service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
+ } catch(Throwable t) {
+ t.printStackTrace();
+ System.out.println("Dependency lookup failed : " + t.getMessage());
+ stat.addStatus("ws-dependency-no-injection", stat.FAIL);
+ }
+ System.out.println("Service is " + service);
+ if (service!=null) {
+ Client client = new Client();
+ client.doTest(args);
+ }
+ stat.printSummary("ws-dependency-no-injection");
}
public void doTest(String[] args) {
@@ -57,11 +57,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-ejb-method-injection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-dependency-no-injection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml
index f7ca438..6dd0dfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml
@@ -22,7 +22,7 @@
]>
<project name="Hello" default="core" basedir=".">
-
+
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
@@ -32,30 +32,30 @@
<target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar"/>
+ </antcall>
</target>
<target name="private-run">
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="WebServiceEJB"/>
- <param name="port" value="WebServiceEJB"/>
- </antcall>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="WebServiceEJB"/>
+ <param name="port" value="WebServiceEJB"/>
+ </antcall>
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="ejb/HelloEJB.java">
<classpath refid="classpath"/>
</javac>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**"/>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</or>
@@ -66,17 +66,17 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<echo message="Running appclient with ${client-pkg-name}.${client}"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
@@ -86,6 +86,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
index 76dbcd0..fdaf43d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
@@ -17,7 +17,7 @@
package client;
import jakarta.ejb.EJB;
-import ejb.Hello;
+import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -27,24 +27,24 @@
new SimpleReporterAdapter("appserv-tests");
@EJB(mappedName="ejb.Hello")
- static Hello hello;
+ static Hello hello;
public static void main(String[] args) {
- stat.addDescription("ejbclient-annotation");
+ stat.addDescription("ejbclient-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejbclient-annotation");
+ stat.printSummary("ejbclient-annotation");
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = hello.invoke("Hello Tester !");
- if(ret.indexOf("Hello Tester") == -1) {
+ if(ret.indexOf("Hello Tester") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejbclient-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
index 86ad44f..86ed68d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
@@ -20,5 +20,5 @@
@Remote
public interface Hello {
- public String invoke(String msg);
+ public String invoke(String msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
index d95f391..9507f94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
@@ -22,18 +22,18 @@
import endpoint.WebServiceEJBService;
import endpoint.WebServiceEJB;
-@Stateless
+@Stateless
public class HelloEJB implements Hello {
@WebServiceRef
WebServiceEJBService webService;
-
+
public String invoke(String string) {
- System.out.println("invoked with " + string);
- System.out.println("getting the port now from " + webService);
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
- System.out.println("got " + ejb);
- return ejb.sayHello(string);
+ System.out.println("invoked with " + string);
+ System.out.println("getting the port now from " + webService);
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ System.out.println("got " + ejb);
+ return ejb.sayHello(string);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties
index b1fdcaf..2f15d15 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/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="ejbservletwebservicesinwar"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml
index b653900..23fc718 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -114,7 +114,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -140,6 +140,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml
index 0fb0f1b..01549ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java
index e422760..b8e8dfa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
index f3ca33c..4505052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
@@ -33,10 +33,10 @@
@Resource
private SessionContext sc;
- public HelloEjb() {}
+ public HelloEjb() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "EJB WS:" + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "EJB WS:" + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
index 1b4927e..ab0854f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
@@ -28,10 +28,10 @@
)
public class HelloWS {
- public HelloWS() {}
+ public HelloWS() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Servlet WS:" + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Servlet WS:" + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
index 3797941..38c8dda 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
@@ -32,8 +32,8 @@
@jakarta.xml.ws.WebServiceRef(webclient.HelloService.class)
webclient.Hello hiport2;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties
index 18538d4..e8334a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/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="ejbwebservicesinwar-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml
index 731cc5f..f788575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
index d5a7ae8..4e2a65c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
@@ -32,10 +32,10 @@
//@Resource
// private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties
index d8f481b..701cb87 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/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="ejbwebservicesinwar-3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml
index 731cc5f..f788575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java
index e1665b3..c1b7dab 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
index d964e8f..ab85c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
@@ -33,10 +33,10 @@
@Resource
private WebServiceContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties
index 8fa0abb..eaf46d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/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="ejbwebservicesinwar-interceptor"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml
index 731cc5f..f788575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java
index 4c025d9..a52c9cf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[sayHello]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
index a044778..e0bec45 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
@@ -32,12 +32,12 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
@jakarta.interceptor.Interceptors(SimpleInterceptor.class)
- public String sayHello(Object who) {
- return "Hello " + who ;
+ public String sayHello(Object who) {
+ return "Hello " + who ;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties
index 581af77..345bd48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/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="ejbwebservicesinwar-sessioncontext"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml
index 731cc5f..f788575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java
index a39ce27..e329882 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
index 86fa82c..32321fe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
@@ -32,11 +32,11 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who ;
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who ;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties
index 18b4ccc..1d3953d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwebservicesinwar"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml
index 14cc5fd..10b6a4c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java
index 77dfd07..d032934 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("ejbwebservicesinwar");
+ stat.addDescription("ejbwebservicesinwar");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejbwebservicesinwar");
+ stat.printSummary("ejbwebservicesinwar");
}
public void doTest(String[] args) {
@@ -41,17 +41,17 @@
URL serviceInfo = new URL (args[0]);
URLConnection con = serviceInfo.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
String inputLine;
- int index=0;
+ int index=0;
while ((inputLine = in.readLine()) != null) {
if ((index= inputLine.indexOf("message="))>0){
- String url = inputLine.substring(index+7);
+ String url = inputLine.substring(index+7);
if (url.indexOf("sayHello")>0) {
stat.addStatus("ejbwebservicesinwar", stat.PASS);
- }
+ }
System.out.println(inputLine);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
index 665690a..2be69f2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
@@ -33,10 +33,10 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties
index fde379a..d2623f4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwsinwarwithwsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml
index 88cc758..e93c0ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml
@@ -48,7 +48,7 @@
value="-wsdllocation WEB-INF/wsdl/HelloService.wsdl -keep -d ${build.classes.dir} HelloService.wsdl"/>
</antcall>
</target>
-
+
<target name="compile" depends="init-common">
<antcall target="compile-common">
<param name="src" value="endpoint"/>
@@ -97,6 +97,6 @@
<param name="other-args" value="ejbwsinwarwithwsdl"/>
</antcall>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java
index c2770e3..691a012 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("ejbwsinwarwithwsdl");
+ stat.addDescription("ejbwsinwarwithwsdl");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejbwsinwarwithwsdl");
+ stat.printSummary("ejbwsinwarwithwsdl");
}
public void doTest(String[] args) {
@@ -50,17 +50,17 @@
/*
URL serviceInfo = new URL (args[0]);
URLConnection con = serviceInfo.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
String inputLine;
- int index=0;
+ int index=0;
while ((inputLine = in.readLine()) != null) {
if ((index= inputLine.indexOf("href="))>0){
- String url = inputLine.substring(index+1);
+ String url = inputLine.substring(index+1);
if (url.indexOf("http:")>0) {
stat.addStatus("ejbwsinwarwithwsdl", stat.PASS);
- }
+ }
System.out.println(inputLine);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
index 34ab65f..5c64053 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
@@ -30,9 +30,9 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
index ac6e3bd..b8e90be 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-exception");
+ stat.addDescription("ejb-exception");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejb-exception");
+ stat.printSummary("ejb-exception");
}
public void doTest(String[] args) {
@@ -43,15 +43,15 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
- // we were supposed to fail !
+ // we were supposed to fail !
stat.addStatus("ejb-exception", stat.FAIL);
} catch(Exception e) {
System.out.println("Got expected exception " + e.getMessage());
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
index 70084ac..a8f7b13 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
@@ -24,6 +24,6 @@
public class HelloImpl {
public String sayHello(String who) {
- throw new RuntimeException("I am a bad bad ejb endpoint");
+ throw new RuntimeException("I am a bad bad ejb endpoint");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml
index 8b2f576..a5451a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
index 0a1ed84..fa63782 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
@@ -29,28 +29,28 @@
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static void setService(HelloImplService s) {
-
- System.out.println("Injection sucessful with "+s.getClass().toString());
- service = s;
- }
+ static void setService(HelloImplService s) {
- @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static int setFoo(HelloImplService s) {
- service1 = s;
- return 0;
- }
+ System.out.println("Injection sucessful with "+s.getClass().toString());
+ service = s;
+ }
- @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static void myService(String foo, HelloImplService s) {
- service2 = s;
- }
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
+ static int setFoo(HelloImplService s) {
+ service1 = s;
+ return 0;
+ }
+
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
+ static void myService(String foo, HelloImplService s) {
+ service2 = s;
+ }
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- void setMyService(HelloImplService s) {
-
- service3 = s;
- }
+ void setMyService(HelloImplService s) {
+
+ service3 = s;
+ }
static HelloImplService service1=null;
@@ -63,28 +63,28 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ws-ejb-invalidmethodinjection");
+ stat.addDescription("ws-ejb-invalidmethodinjection");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ws-ejb-invalidmethodinjection");
+ stat.printSummary("ws-ejb-invalidmethodinjection");
}
public void doTest(String[] args) {
try {
- if (service1!=null || service2!=null || service3!=null) {
- System.out.println("Failed : invalid injection method got injected !");
+ if (service1!=null || service2!=null || service3!=null) {
+ System.out.println("Failed : invalid injection method got injected !");
stat.addStatus("ws-ejb-invalidmethodinjection", stat.FAIL);
} else {
- System.out.println("Success : invalid references were not injected");
- }
+ System.out.println("Success : invalid references were not injected");
+ }
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-ejb-invalidmethodinjection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-ejb-invalidmethodinjection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties
index daa8e10..a1d0b2d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="libdependent-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml
index 48199dc..911c65c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml
@@ -70,8 +70,8 @@
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -82,7 +82,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
index 9995186..61afa16 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
@@ -37,21 +37,21 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-libdependent-2-service");
+ stat.addDescription("ejb-libdependent-2-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("ejb-libdependent-2-service");
+ stat.printSummary("ejb-libdependent-2-service");
}
public void doSyncTest() {
try {
HelloImpl port = service.getHelloImplPort();
RetVal ret = port.sayHello("Hi LibDependent");
- if(ret.getRetVal().indexOf("LibDep") == -1) {
- System.out.println("WRONG GREETING " + ret.getRetVal());
+ if(ret.getRetVal().indexOf("LibDep") == -1) {
+ System.out.println("WRONG GREETING " + ret.getRetVal());
stat.addStatus("ejb-libdependent-2-service-test", stat.FAIL);
- return;
- }
+ return;
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
stat.addStatus("ejb-libdependent-2-service-test", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties
index 0850852..0417354 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="libdependent"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml
index 9a37d58..995cdb6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml
@@ -69,8 +69,8 @@
<param name="wsimport.args"
value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
</antcall>
- <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
+ <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
includes="client/**"/>
</target>
@@ -86,7 +86,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
index dadba66..3510374 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
@@ -37,10 +37,10 @@
// static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-libdependent-service");
+ stat.addDescription("ejb-libdependent-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("ejb-libdependent-service");
+ stat.printSummary("ejb-libdependent-service");
}
public void doSyncTest() {
@@ -48,11 +48,11 @@
HelloImplService service = new HelloImplService();
HelloImpl port = service.getHelloImplPort();
RetVal ret = port.sayHello("Hi LibDependent");
- if(ret.getRetVal().indexOf("LibDep") == -1) {
- System.out.println("WRONG GREETING " + ret.getRetVal());
+ if(ret.getRetVal().indexOf("LibDep") == -1) {
+ System.out.println("WRONG GREETING " + ret.getRetVal());
stat.addStatus("ejb-libdependent-service-test", stat.FAIL);
- return;
- }
+ return;
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
stat.addStatus("ejb-libdependent-service-test", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml
index f7ca438..6dd0dfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml
@@ -22,7 +22,7 @@
]>
<project name="Hello" default="core" basedir=".">
-
+
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
@@ -32,30 +32,30 @@
<target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar"/>
+ </antcall>
</target>
<target name="private-run">
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="WebServiceEJB"/>
- <param name="port" value="WebServiceEJB"/>
- </antcall>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="WebServiceEJB"/>
+ <param name="port" value="WebServiceEJB"/>
+ </antcall>
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="ejb/HelloEJB.java">
<classpath refid="classpath"/>
</javac>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**"/>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</or>
@@ -66,17 +66,17 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<echo message="Running appclient with ${client-pkg-name}.${client}"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
@@ -86,6 +86,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
index 1ef7a13..e878e7c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
@@ -17,7 +17,7 @@
package client;
import jakarta.ejb.EJB;
-import ejb.Hello;
+import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -27,24 +27,24 @@
new SimpleReporterAdapter("appserv-tests");
@EJB(mappedName="ejb.Hello")
- static Hello hello;
+ static Hello hello;
public static void main(String[] args) {
- stat.addDescription("localremoteejbwebservice-issue");
+ stat.addDescription("localremoteejbwebservice-issue");
Client client = new Client();
client.doTest(args);
- stat.printSummary("localremoteejbwebservice-issue");
+ stat.printSummary("localremoteejbwebservice-issue");
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = hello.invoke("Hello Tester !");
- if(ret.indexOf("Hello Tester") == -1) {
+ if(ret.indexOf("Hello Tester") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("localremoteejbwebservice-issue", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
index 86ad44f..86ed68d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
@@ -20,5 +20,5 @@
@Remote
public interface Hello {
- public String invoke(String msg);
+ public String invoke(String msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
index d95f391..9507f94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
@@ -22,18 +22,18 @@
import endpoint.WebServiceEJBService;
import endpoint.WebServiceEJB;
-@Stateless
+@Stateless
public class HelloEJB implements Hello {
@WebServiceRef
WebServiceEJBService webService;
-
+
public String invoke(String string) {
- System.out.println("invoked with " + string);
- System.out.println("getting the port now from " + webService);
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
- System.out.println("got " + ejb);
- return ejb.sayHello(string);
+ System.out.println("invoked with " + string);
+ System.out.println("getting the port now from " + webService);
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ System.out.println("got " + ejb);
+ return ejb.sayHello(string);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
index b9b572f..9e6a9b4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
@@ -24,6 +24,6 @@
*/
@Local
public interface NewSessionBeanLocal {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
index 6344440..02f9256 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
@@ -24,6 +24,6 @@
*/
@Remote
public interface NewSessionBeanRemote {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
index 9837456..e79cebc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-msgctxt");
+ stat.addDescription("webservices-ejb-msgctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-msgctxt");
+ stat.printSummary("webservices-ejb-msgctxt");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-msgctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-msgctxt", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
index 91f6459..56c7d39 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
@@ -30,11 +30,11 @@
public String sayHello(String who) {
- if(ejbsc != null) {
+ if(ejbsc != null) {
System.out.println(ejbsc.getMessageContext());
if (ejbsc.getMessageContext() instanceof jakarta.xml.ws.handler.MessageContext){
//System.out.println("YYYYY" +ejbsc.getMessageContext().getClass());
- return "WebSvcTest-Hello " + who;
+ return "WebSvcTest-Hello " + who;
}
else {
// System.out.println("NNN " + ejbsc.getMessageContext().getClass());
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
index 1818949..e0ca532 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
@@ -28,18 +28,18 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static void setService(HelloImplService s) {
- service = s;
- }
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
+ static void setService(HelloImplService s) {
+ service = s;
+ }
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ws-ejb-method-injection");
+ stat.addDescription("ws-ejb-method-injection");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ws-ejb-method-injection");
+ stat.printSummary("ws-ejb-method-injection");
}
public void doTest(String[] args) {
@@ -47,11 +47,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-ejb-method-injection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-ejb-method-injection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
index d455c3a..2aca292 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
@@ -32,21 +32,21 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("msgctxt-invocationhandlerctxt");
+ stat.addDescription("msgctxt-invocationhandlerctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("msgctxt-invocationhandlerctxt");
+ stat.printSummary("msgctxt-invocationhandlerctxt");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloEJBPort();
String ret = port.sayHello("Appserver Tester !");
- if(ret == null) {
+ if(ret == null) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("msgctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("msgctxt-invocationhandlerctxt", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
index 1020a1b..11aa2b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
@@ -40,7 +40,7 @@
@AroundInvoke
private Object interceptBusinessMethod(InvocationContext invCtx) {
- try {
+ try {
System.out.println("ContextData" + invCtx.getContextData());
//This is just to get the invocation trace
//remove once bug is fixed
@@ -53,7 +53,7 @@
} else {
return null;
}
- } catch(Throwable t) { t.printStackTrace();}
+ } catch(Throwable t) { t.printStackTrace();}
return null;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
index 9837456..e79cebc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-msgctxt");
+ stat.addDescription("webservices-ejb-msgctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-msgctxt");
+ stat.printSummary("webservices-ejb-msgctxt");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-msgctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-msgctxt", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
index c06f183..7d7075e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
@@ -28,12 +28,12 @@
@Resource WebServiceContext ejbsc;
public String sayHello(String who) {
- System.out.println("EJB WSCTXT wsc = " + ejbsc);
- jakarta.xml.ws.handler.MessageContext m = ejbsc.getMessageContext();
- if(m == null)
- return "WebService Context injection failed";
- if(ejbsc != null)
- return "WebSvcTest-Hello " + who;
+ System.out.println("EJB WSCTXT wsc = " + ejbsc);
+ jakarta.xml.ws.handler.MessageContext m = ejbsc.getMessageContext();
+ if(m == null)
+ return "WebService Context injection failed";
+ if(ejbsc != null)
+ return "WebSvcTest-Hello " + who;
return "EJB WebServiceContext injection failed";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties
index fb51256..311dd7b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="multiport"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml
index b8c5424..cfd00f4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml
@@ -63,11 +63,11 @@
<mkdir dir="${assemble.dir}"/>
<mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
<copy file="HttpTestService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
+ <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
<jar destfile="${assemble.dir}/${appname}-ejb.jar"
basedir="${build.classes.dir}"
includes="service/**,META-INF/**">
- </jar>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
@@ -77,15 +77,15 @@
<param name="wsimport.args"
value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
</target>
-
+
<target name="run">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
index 2015dec..b9c5e21 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
@@ -22,50 +22,50 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef static HttpTestService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
- HelloRequest req = new HelloRequest();
- req.setString("From Vijay ");
- HelloResponse resp = port.hello(req);
- if(resp.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp.getString().indexOf("Hello1") != -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp.getString());
+ HelloRequest req = new HelloRequest();
+ req.setString("From Vijay ");
+ HelloResponse resp = port.hello(req);
+ if(resp.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp.getString().indexOf("Hello1") != -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp.getString());
Hello1 port1 = service.getHello1Port();
- Hello1Request req1 = new Hello1Request();
- req1.setString("From Vijay ");
- Hello1Response resp1 = port1.hello1(req1);
- if(resp1.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp1.getString().indexOf("Hello1") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp1.getString());
- stat.addStatus(args[0], stat.PASS);
+ Hello1Request req1 = new Hello1Request();
+ req1.setString("From Vijay ");
+ Hello1Response resp1 = port1.hello1(req1);
+ if(resp1.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp1.getString().indexOf("Hello1") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp1.getString());
+ stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
e.printStackTrace();
- stat.addStatus(args[0], stat.FAIL);
+ stat.addStatus(args[0], stat.FAIL);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml
index 7c3372f..99df632 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml
@@ -23,9 +23,9 @@
<package name="client"/>
</bindings>
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
<ns2:package name="client"/>
</ns2:schemaBindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml
index 242611b..58c55e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml
@@ -23,9 +23,9 @@
<package name="service"/>
</bindings>
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
<ns2:package name="service"/>
</ns2:schemaBindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
index eb847ca..9a44ec4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
@@ -39,8 +39,8 @@
public Hello1Response hello1(Hello1Request req) {
System.out.println("Hello1, " + req.getString() + "!");
- Hello1Response resp = new Hello1Response();
- resp.setString("Hello1, " + req.getString() + "!");
+ Hello1Response resp = new Hello1Response();
+ resp.setString("Hello1, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
index 67df4bb..7c6ab0e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
@@ -39,8 +39,8 @@
public HelloResponse hello(HelloRequest req) {
System.out.println("Hello, " + req.getString() + "!");
- HelloResponse resp = new HelloResponse();
- resp.setString("Hello, " + req.getString() + "!");
+ HelloResponse resp = new HelloResponse();
+ resp.setString("Hello, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
index 188105e..55de671 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-nointf-annotation");
+ stat.addDescription("webservices-ejb-nointf-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-nointf-annotation");
+ stat.printSummary("webservices-ejb-nointf-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-nointf-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
index 29c4421..7da92ba 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
@@ -32,10 +32,10 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-noname-annotation");
+ stat.addDescription("webservices-ejb-noname-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-noname-annotation");
+ stat.printSummary("webservices-ejb-noname-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
Hello port = service.getHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-noname-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
index 5deb6d2..3c420fd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
@@ -32,10 +32,10 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("ejb-oneway-annotation");
+ stat.addDescription("ejb-oneway-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejb-oneway-annotation");
+ stat.printSummary("ejb-oneway-annotation");
}
public void doTest(String[] args) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
index 01cef46..7d5c431 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
@@ -25,5 +25,5 @@
@WebMethod
@Oneway
- public void sayHello(String who);
+ public void sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
index 7fd8907..d1899e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
@@ -34,33 +34,33 @@
static HelloImpl port;
public static void main(String[] args) {
- stat.addDescription("ws-portdependency-no-injection");
+ stat.addDescription("ws-portdependency-no-injection");
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
- } catch(Throwable t) {
- t.printStackTrace();
- System.out.println("Dependency lookup failed : " + t.getMessage());
- stat.addStatus("ws-dependency-no-injection", stat.FAIL);
- }
- System.out.println("Port is " + port);
- if (port!=null) {
- Client client = new Client();
- client.doTest(args);
- }
- stat.printSummary("ws-portdependency-no-injection");
+ port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
+ } catch(Throwable t) {
+ t.printStackTrace();
+ System.out.println("Dependency lookup failed : " + t.getMessage());
+ stat.addStatus("ws-dependency-no-injection", stat.FAIL);
+ }
+ System.out.println("Port is " + port);
+ if (port!=null) {
+ Client client = new Client();
+ client.doTest(args);
+ }
+ stat.printSummary("ws-portdependency-no-injection");
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-portdependency-no-injection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-portdependency-no-injection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml
index d763632..d429b22 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml
@@ -24,31 +24,31 @@
<project name="methodinjection" default="core" basedir=".">
&commonBuild;
- <property file="${env.APS_HOME}/config.properties"/>
+ <property file="${env.APS_HOME}/config.properties"/>
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<target name="all" depends="clean, private-deploy, private-run, private-undeploy, report"/>
<target name="private-deploy">
- <antcall target="deploy"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="HelloImpl"/>
- <param name="port" value="HelloImpl"/>
- </antcall>
+ <antcall target="deploy"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="HelloImpl"/>
+ <param name="port" value="HelloImpl"/>
+ </antcall>
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="ejb/GatewayImpl.java">
<classpath refid="classpath"/>
</javac>
- <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
- <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
+ <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**">
- <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
- </jar>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**">
+ <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
+ </jar>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</or>
@@ -59,30 +59,30 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
</target>
<target name="private-run">
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="GatewayImpl"/>
- <param name="port" value="GatewayImpl"/>
- </antcall>
- <antcall target="compile-client"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="GatewayImpl"/>
+ <param name="port" value="GatewayImpl"/>
+ </antcall>
+ <antcall target="compile-client"/>
<echo message="Running appclient with ${client-pkg-name}.${client}"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="${client-pkg-name}.${client}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
<target name="private-undeploy">
<antcall target="undeploy"/>
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
</target>
<target name="report-success">
@@ -91,6 +91,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
index 7fa7620..f57d574 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
@@ -28,43 +28,43 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-port-field-injection";
+ private final static String desc = "ws-ejb-port-field-injection";
- @WebServiceRef(GatewayImplService.class)
+ @WebServiceRef(GatewayImplService.class)
static GatewayImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
- System.out.println("Method injected reference test...");
+ System.out.println("Method injected reference test...");
String ret = port.invokeMethod("Appserver Tester !");
- if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Field injected reference test...");
+ System.out.println("Field injected reference test...");
ret = port.invokeField("Appserver Tester !");
- if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Dependency jndi looup reference test...");
+ System.out.println("Dependency jndi looup reference test...");
ret = port.invokeDependency("Appserver Tester !");
- if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
stat.addStatus(desc, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
index 099d530..c1dd371 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
@@ -39,16 +39,16 @@
HelloImpl portMethod=null;
- // method injection has to be private to avoid being part of the
+ // method injection has to be private to avoid being part of the
// web service interface.
@WebServiceRef(HelloImplService.class)
private void setPort(HelloImpl port) {
- portMethod = port;
+ portMethod = port;
}
@WebMethod
public String invokeMethod(String who) {
- return "METHOD " + portMethod.sayHello(who);
+ return "METHOD " + portMethod.sayHello(who);
}
@WebMethod
@@ -58,17 +58,17 @@
@WebMethod
public String invokeDependency(String who) {
- try {
- Context ic = new InitialContext();
-// HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
-// HelloImpl port = service.getPort(HelloImpl.class);
-// System.out.println("From service... " + port.sayHello(who));
- HelloImpl port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
- return "JNDI " + port.sayHello(who);
- } catch(Throwable t) {
- t.printStackTrace();
- return "FAILED";
- }
+ try {
+ Context ic = new InitialContext();
+// HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
+// HelloImpl port = service.getPort(HelloImpl.class);
+// System.out.println("From service... " + port.sayHello(who));
+ HelloImpl port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
+ return "JNDI " + port.sayHello(who);
+ } catch(Throwable t) {
+ t.printStackTrace();
+ return "FAILED";
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
index 0c0651e..7e4db1c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
@@ -28,27 +28,27 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-port-field-injection";
+ private final static String desc = "ws-ejb-port-field-injection";
- @WebServiceRef(HelloImplService.class)
+ @WebServiceRef(HelloImplService.class)
static HelloImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(desc, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
index 6706171..dbb6a5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
@@ -28,31 +28,31 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-port-method-injection";
+ private final static String desc = "ws-ejb-port-method-injection";
- @WebServiceRef(HelloImplService.class)
- static void setPort(HelloImpl s) {
- port = s;
- }
+ @WebServiceRef(HelloImplService.class)
+ static void setPort(HelloImpl s) {
+ port = s;
+ }
static HelloImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(desc, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml
index 825066a..1894e3e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml
@@ -27,28 +27,28 @@
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<target name="all" depends="clean">
- <antcall target="test_build"/>
- <basename file="${src-name}" property="server" suffix=".java"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <antcall target="test_build"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
- </or>
- </waitfor>
+ </or>
+ </waitfor>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
-
+
<antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
+ <antcall target="undeploy"/>
+ <antcall target="report"/>
</target>
<target name="test_build">
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
- </exec>
- <antcall target="build"/>
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
+ </exec>
+ <antcall target="build"/>
</target>
<target name="report-success">
@@ -57,6 +57,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
index d265bb5..fb5ff25 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-provider-annotation");
+ stat.addDescription("ejb-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejb-provider-annotation");
+ stat.printSummary("ejb-provider-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
index 5a28123..a5c09ef 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
@@ -21,7 +21,7 @@
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.Service ;
+import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
import jakarta.ejb.Stateless;
@@ -43,11 +43,11 @@
private static final JAXBContext jaxbContext = createJAXBContext();
private int combo;
private int bodyIndex;
-
+
public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
-
+
private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
@@ -55,28 +55,28 @@
throw new WebServiceException(e.getMessage(), e);
}
}
-
-
+
+
public Source invoke(Source request) {
try {
recvBean(request);
return sendBean();
} catch(Exception e) {
e.printStackTrace();
- throw new WebServiceException("Provider endpoint failed", e);
+ throw new WebServiceException("Provider endpoint failed", e);
}
}
-
+
private void recvBean(Source source) throws Exception {
System.out.println("**** recvBean ******");
System.out.println(jaxbContext.createUnmarshaller().unmarshal(source));
JAXBElement element = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(source);
- System.out.println("name="+element.getName()+ " value=" + element.getValue());
+ System.out.println("name="+element.getName()+ " value=" + element.getValue());
if (element.getValue() instanceof SayHello) {
- SayHello hello = (SayHello) element.getValue();
+ SayHello hello = (SayHello) element.getValue();
System.out.println("Say Hello from " + hello.getArg0());
}
-
+
}
private Source sendBean() throws Exception {
@@ -84,9 +84,9 @@
SayHelloResponse resp = new SayHelloResponse();
resp.setReturn("WebSvcTest-Hello");
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectFactory factory = new ObjectFactory();
+ ObjectFactory factory = new ObjectFactory();
jaxbContext.createMarshaller().marshal(factory.createSayHelloResponse(resp), bout);
return new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties
index 47dbabd..d03760d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="restful-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml
index 76c64d2..df6e1f3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml
@@ -57,8 +57,8 @@
<target name="assemble-client" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -69,7 +69,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
index f6d7eca..6757071 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
@@ -40,13 +40,13 @@
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) throws Exception {
- stat.addDescription("webservices-simple-restful-svc");
- String endpointAddress =
+ stat.addDescription("webservices-simple-restful-svc");
+ String endpointAddress =
"http://localhost:8080/AddNumbersImplService/endpoint.AddNumbersImpl";
URL url = new URL(endpointAddress+"?num1=10&num2=20");
System.out.println ("Invoking URL="+url);
process(url, args);
- stat.printSummary("webservices-simple-restful-svc");
+ stat.printSummary("webservices-simple-restful-svc");
}
private static void process(URL url, String[] args) throws Exception {
@@ -64,12 +64,12 @@
oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
trans.setOutputProperties(oprops);
trans.transform(source, sr);
- String resp = bos.toString();
+ String resp = bos.toString();
System.out.println("**** Response ******"+resp);
bos.close();
- if(resp.indexOf("<ns:return>30</ns:return>") != -1)
+ if(resp.indexOf("<ns:return>30</ns:return>") != -1)
stat.addStatus(args[0], stat.PASS);
- else
+ else
stat.addStatus(args[0], stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
index cb4b41f..0300a51 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
@@ -62,7 +62,7 @@
throw new HTTPException(500);
}
}
-
+
private Source createSource(String str) {
StringTokenizer st = new StringTokenizer(str, "=&/");
String token = st.nextToken();
@@ -78,5 +78,5 @@
new ByteArrayInputStream(body.getBytes()));
return source;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml
index 446c584..abd0ef2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml
@@ -29,9 +29,9 @@
<property name="client-src-name" value="client/Client.java"/>
<property name="app-client-parameters" value="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
<target name="all" depends="clean">
- <antcall target="deploy"/>
- <basename file="${src-name}" property="server" suffix=".java"/>
- <condition property="deploy_succeeded">
+ <antcall target="deploy"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
<condition property="deploy_failed">
@@ -39,39 +39,39 @@
</condition>
<fail message="Deployment failed" if="deploy_failed"/>
<echo message="Deployment passed ${deploy_succeeded}"/>
- <echo message="ALL WEBSERVICE INVOCATION SHOULD FAIL..."/>
+ <echo message="ALL WEBSERVICE INVOCATION SHOULD FAIL..."/>
<antcall target="run">
- <param name="app-client-extra-parameters" value="-user nouser -password nopass"/>
+ <param name="app-client-extra-parameters" value="-user nouser -password nopass"/>
</antcall>
- <echo message="CREATING USERS..."/>
+ <echo message="CREATING USERS..."/>
<copy file="${admin.password.file}" tofile="./passwordfile" overwrite="true"/>
<echo file="./passwordfile" append="true">
AS_ADMIN_USERPASSWORD=tester
</echo>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester --authrealmname file webservicetester"/>
- </exec>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester --authrealmname file webservicetester"/>
+ </exec>
<copy file="${admin.password.file}" tofile="./passwordfile" overwrite="true"/>
<echo file="./passwordfile" append="true">
AS_ADMIN_USERPASSWORD=tester2
</echo>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester2 --authrealmname file webservicetester2"/>
- </exec>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester2 --authrealmname file webservicetester2"/>
+ </exec>
<antcall target="internal-run">
- <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester tester"/>
+ <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester tester"/>
</antcall>
<antcall target="internal-run">
- <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester2 tester2 FAILURE"/>
- </antcall>
- <echo message="DELETING USERS..."/>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester"/>
- </exec>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester2"/>
- </exec>
- <antcall target="undeploy"/>
+ <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester2 tester2 FAILURE"/>
+ </antcall>
+ <echo message="DELETING USERS..."/>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester"/>
+ </exec>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester2"/>
+ </exec>
+ <antcall target="undeploy"/>
</target>
<target name="report-success">
@@ -80,6 +80,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
index 93137a5..953d14c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
@@ -38,26 +38,26 @@
String password=null;
boolean successExpected=true;
String description;
- if (args.length>1) {
+ if (args.length>1) {
username=args[0];
password=args[1];
- description="webservices-ejb-rolesAllowed-annotation-positive";
+ description="webservices-ejb-rolesAllowed-annotation-positive";
if (args.length>2) {
description="webservices-ejb-rolesAllowed-annotation-negative-2";
successExpected = !(args[2].equalsIgnoreCase("FAILURE"));
- }
+ }
} else {
successExpected = false;
- description="webservices-ejb-rolesAllowed-annotation-negative";
- }
- stat.addDescription(description);
+ description="webservices-ejb-rolesAllowed-annotation-negative";
+ }
+ stat.addDescription(description);
Client client = new Client();
client.doTest(description, username, password, successExpected);
- stat.printSummary(description);
+ stat.printSummary(description);
}
public void doTest(String desc, String username, String password, boolean successExpected) {
-
+
try {
HelloImpl port = service.getHelloImplPort();
if (username!=null && password!=null) {
@@ -66,7 +66,7 @@
requestContext.put("jakarta.xml.ws.security.auth.username",username);
requestContext.put("jakarta.xml.ws.security.auth.password",password);
}
-
+
// @PermitAll invocation, it should always work
try {
String ret = port.permitAll("Appserver Tester !");
@@ -81,10 +81,10 @@
System.out.println("@PermitAll method invocation failed - TEST FAILED");
stat.addStatus(desc, stat.FAIL);
} else {
- System.out.println("@PermitAll method invocation failed - good...");
+ System.out.println("@PermitAll method invocation failed - good...");
}
}
-
+
// @DenyAll invocation, it should always faile
try {
String ret = port.denyAll("Appserver Tester !");
@@ -96,7 +96,7 @@
} catch(Exception e) {
System.out.println("@DenyAll method invocation failed - good...");
}
-
+
// role based invocation
String ret = port.roleBased("Appserver Tester !");
if(ret.indexOf("WebSvcTest-Hello") == -1) {
@@ -105,19 +105,19 @@
return;
}
System.out.println(ret);
- if (successExpected)
- stat.addStatus(desc, stat.PASS);
- else
- stat.addStatus(desc, stat.FAIL);
-
+ if (successExpected)
+ stat.addStatus(desc, stat.PASS);
+ else
+ stat.addStatus(desc, stat.FAIL);
+
} catch(Throwable t) {
- if (successExpected) {
- t.printStackTrace();
- stat.addStatus(desc, stat.FAIL);
- } else {
- System.out.println("Got expected failure " + t.getMessage());
- stat.addStatus(desc, stat.PASS);
- }
+ if (successExpected) {
+ t.printStackTrace();
+ stat.addStatus(desc, stat.FAIL);
+ } else {
+ System.out.println("Got expected failure " + t.getMessage());
+ stat.addStatus(desc, stat.PASS);
+ }
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
index adc9bfc..bdac44f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
@@ -30,7 +30,7 @@
public String roleBased(String who) {
return "WebSvcTest-Hello " + who;
}
-
+
@DenyAll
public String denyAll(String who) {
return "WebSvcTest-Hello " + who;
@@ -39,5 +39,5 @@
@PermitAll
public String permitAll(String who) {
return "WebSvcTest-Hello " + who;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml
index d9ae964..0b4ef0d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml
@@ -27,10 +27,10 @@
<ejb>
<ejb-name>HelloImpl</ejb-name>
<webservice-endpoint>
- <port-component-name>HelloImpl</port-component-name>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
+ <port-component-name>HelloImpl</port-component-name>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
</webservice-endpoint>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml
index d763632..d429b22 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml
@@ -24,31 +24,31 @@
<project name="methodinjection" default="core" basedir=".">
&commonBuild;
- <property file="${env.APS_HOME}/config.properties"/>
+ <property file="${env.APS_HOME}/config.properties"/>
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<target name="all" depends="clean, private-deploy, private-run, private-undeploy, report"/>
<target name="private-deploy">
- <antcall target="deploy"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="HelloImpl"/>
- <param name="port" value="HelloImpl"/>
- </antcall>
+ <antcall target="deploy"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="HelloImpl"/>
+ <param name="port" value="HelloImpl"/>
+ </antcall>
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="ejb/GatewayImpl.java">
<classpath refid="classpath"/>
</javac>
- <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
- <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
+ <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**">
- <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
- </jar>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**">
+ <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
+ </jar>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</or>
@@ -59,30 +59,30 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
</target>
<target name="private-run">
<basename file="${client-src-name}" property="client" suffix=".java"/>
<dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="GatewayImpl"/>
- <param name="port" value="GatewayImpl"/>
- </antcall>
- <antcall target="compile-client"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="GatewayImpl"/>
+ <param name="port" value="GatewayImpl"/>
+ </antcall>
+ <antcall target="compile-client"/>
<echo message="Running appclient with ${client-pkg-name}.${client}"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="${client-pkg-name}.${client}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
<target name="private-undeploy">
<antcall target="undeploy"/>
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
</target>
<target name="report-success">
@@ -91,6 +91,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
index 03e9b67..0c260df 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
@@ -28,43 +28,43 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-sevice-field-injection";
+ private final static String desc = "ws-ejb-sevice-field-injection";
- @WebServiceRef(GatewayImplService.class)
+ @WebServiceRef(GatewayImplService.class)
static GatewayImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
- System.out.println("Method injected reference test...");
+ System.out.println("Method injected reference test...");
String ret = port.invokeMethod("Appserver Tester !");
- if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Field injected reference test...");
+ System.out.println("Field injected reference test...");
ret = port.invokeField("Appserver Tester !");
- if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Dependency jndi looup reference test...");
+ System.out.println("Dependency jndi looup reference test...");
ret = port.invokeDependency("Appserver Tester !");
- if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
stat.addStatus(desc, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
index a0403dc..15acef6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
@@ -38,38 +38,38 @@
HelloImplService serviceMethod=null;
- // method injection has to be private to avoid being part of the
+ // method injection has to be private to avoid being part of the
// web service interface.
@WebServiceRef()
private void setService(HelloImplService service) {
- serviceMethod = service;
+ serviceMethod = service;
}
@WebMethod
public String invokeMethod(String who) {
- HelloImpl port = serviceMethod.getPort(HelloImpl.class);
- return "METHOD " + port.sayHello(who);
+ HelloImpl port = serviceMethod.getPort(HelloImpl.class);
+ return "METHOD " + port.sayHello(who);
}
@WebMethod
public String invokeField(String who) {
- HelloImpl port = serviceField.getPort(HelloImpl.class);
+ HelloImpl port = serviceField.getPort(HelloImpl.class);
return "FIELD " + port.sayHello(who);
}
@WebMethod
public String invokeDependency(String who) {
String result = null;
- try {
- Context ic = new InitialContext();
- HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
- HelloImpl port = service.getPort(HelloImpl.class);
+ try {
+ Context ic = new InitialContext();
+ HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
+ HelloImpl port = service.getPort(HelloImpl.class);
result = "JNDI " + port.sayHello(who);
- System.out.println(result);
- } catch(Throwable t) {
- t.printStackTrace();
- return "FAILED";
- }
+ System.out.println(result);
+ } catch(Throwable t) {
+ t.printStackTrace();
+ return "FAILED";
+ }
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
index daf2dee..8de7817 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-sessionctx");
+ stat.addDescription("webservices-ejb-sessionctx");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-sessionctx");
+ stat.printSummary("webservices-ejb-sessionctx");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello ANONYMOUS") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello ANONYMOUS") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-sessionctx", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-sessionctx", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
index 5ecbcb1..1ae195f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
@@ -30,9 +30,9 @@
@Resource SessionContext ejbsc;
public String sayHello(String who) {
- System.out.println("EJB WSCTXT wsc = " + ejbsc);
- if(ejbsc != null)
- return "WebSvcTest-Hello " + ejbsc.getCallerPrincipal();
+ System.out.println("EJB WSCTXT wsc = " + ejbsc);
+ if(ejbsc != null)
+ return "WebSvcTest-Hello " + ejbsc.getCallerPrincipal();
return "EJB WebServiceContext injection failed";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties
index 11e4d4e..bd3fde7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="singleton"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml
index f029ea3..563bed3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml
@@ -69,8 +69,8 @@
<param name="wsimport.args"
value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
</antcall>
- <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
+ <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
includes="client/**"/>
</target>
@@ -86,7 +86,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
index 8ceb062..846cd3a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
@@ -37,10 +37,10 @@
// static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-singleton-service");
+ stat.addDescription("ejb-singleton-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("ejb-singleton-service");
+ stat.printSummary("ejb-singleton-service");
}
public void doSyncTest() {
@@ -48,11 +48,11 @@
HelloImplService service = new HelloImplService();
HelloImpl port = service.getHelloImplPort();
RetVal ret = port.sayHello("Hi Singleton");
- if(ret.getRetVal().indexOf("Sing") == -1) {
- System.out.println("WRONG GREETING " + ret.getRetVal());
+ if(ret.getRetVal().indexOf("Sing") == -1) {
+ System.out.println("WRONG GREETING " + ret.getRetVal());
stat.addStatus("ejb-singleton-service-test", stat.FAIL);
- return;
- }
+ return;
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
stat.addStatus("ejb-singleton-service-test", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
index 46618ec..c874b31 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
@@ -32,10 +32,10 @@
//static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("handler-chain-annotation");
+ stat.addDescription("handler-chain-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("handler-chain-annotation");
+ stat.printSummary("handler-chain-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
Hello port =new HelloEJBService().getHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello injectedValue") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello injectedValue") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("handler-chain-annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("handler-chain-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
index fba6051..649457e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,33 +50,33 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
paramElement.setValue(injectedString + " " + paramElement.getValue());
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties
index 2e76a39..026aa44 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/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="wsRef-webservice-features"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml
index 71c7167..6acf7fe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -115,7 +115,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -141,6 +141,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java
index ffd76f5..30f95e0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
index 93b799c..408ce48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
@@ -26,10 +26,10 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml
@@ -18,10 +18,10 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
index 8052095..5f3c809 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
@@ -30,11 +30,11 @@
@MTOM(enabled=true)
@RespectBinding
@Addressing (required = false,enabled=true)
-
+
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
index 89ad876..6ef77aa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-wsctxt");
+ stat.addDescription("webservices-ejb-wsctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-wsctxt");
+ stat.printSummary("webservices-ejb-wsctxt");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-wsctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-wsctxt", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
index ca8dd25..4909c71 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
@@ -31,8 +31,8 @@
public String sayHello(String who) {
- System.out.println("EJB WSCTXT wsc = " + ejbsc);
- if(ejbsc != null) {
+ System.out.println("EJB WSCTXT wsc = " + ejbsc);
+ if(ejbsc != null) {
System.out.println(ejbsc.getMessageContext());
if (ejbsc.getMessageContext() instanceof jakarta.xml.ws.handler.MessageContext){
System.out.println("YYYYY" +ejbsc.getMessageContext().getClass());
@@ -41,9 +41,9 @@
System.out.println("NNN " + ejbsc.getMessageContext().getClass());
}
- return "WebSvcTest-Hello " + who;
+ return "WebSvcTest-Hello " + who;
}
-/* if(sc != null) {
+/* if(sc != null) {
System.out.println(sc.getContextData().getClass());
System.out.println(sc.getContextData());
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
index 7c86441..1abf4b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
@@ -32,31 +32,31 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("wsctxt-invocationhandlerctxt");
+ stat.addDescription("wsctxt-invocationhandlerctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("wsctxt-invocationhandlerctxt");
+ stat.printSummary("wsctxt-invocationhandlerctxt");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloEJBPort();
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("1234") == -1) {
+ if(ret.indexOf("1234") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
- if(ret.indexOf("45") == -1) {
+ }
+ if(ret.indexOf("45") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ }
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
index b82bcfa..159b305 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
@@ -40,12 +40,12 @@
@AroundInvoke
private Object interceptBusinessMethod(InvocationContext invCtx) {
- try {
+ try {
Map<String, Object> map = invCtx.getContextData();
map.put("intVal", new Integer(45));
map.put("longVal", new Long(1234));
return invCtx.proceed();
- } catch(Throwable t) {}
+ } catch(Throwable t) {}
return null;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties
index 500709c..c67ca0d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsnameejbname"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml
index d81e8f4..6435ae1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml
@@ -58,8 +58,8 @@
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
@@ -70,7 +70,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
</target>
-
+
<target name="runclient">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
index 7e37fcf..d0d60be 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
@@ -37,21 +37,21 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("wsname-ejbname-service");
+ stat.addDescription("wsname-ejbname-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("wsname-ejbname-service");
+ stat.printSummary("wsname-ejbname-service");
}
public void doSyncTest() {
try {
ThisShouldBeIgnored port = service.getThisShouldBeIgnoredPort();
int ret = port.addNumbers(2222, 1234);
- if(ret!=(2222+1234)) {
+ if(ret!=(2222+1234)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("wsname-ejbname-service-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("wsname-ejbname-service-test", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml
index 318ded3..03ee86a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml
@@ -18,7 +18,7 @@
<!DOCTYPE project [
<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
+<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
]>
<project name="Filter URL handling test" default="all" basedir=".">
@@ -34,7 +34,7 @@
<param name="src" value="client"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="client.Client">
<arg value="http://${http.host}:${http.port}/"/>
@@ -42,11 +42,11 @@
<pathelement path="${build.classes.dir}"/>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
</classpath>
- </java>
+ </java>
</target>
-
+
<target name="clean">
<antcall target="clean-common"/>
</target>
</project>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java
index 9352f74..f11d135 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java
@@ -30,20 +30,20 @@
*/
public class Client {
-
+
private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
stat.addDescription("webservices-filter-url-handling");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-filter-url-handling");
+ stat.printSummary("webservices-filter-url-handling");
}
public void doTest(String[] args) {
try {
- String webURL = args[0];
+ String webURL = args[0];
URL url = new URL(args[0] + "//");
System.out.println("Invoking " + url.toExternalForm());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -59,7 +59,7 @@
if (HttpURLConnection.HTTP_INTERNAL_ERROR == responseCode) {
// server not started
System.out.println("Error, server is down ?");
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
return;
}
if (HttpURLConnection.HTTP_OK == responseCode) {
@@ -68,23 +68,23 @@
int length = connection.getContentLength();
System.out.println("Content-length " + length);
if (length==-1) {
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
} else {
- stat.addStatus("webservice filter url handling", stat.PASS);
+ stat.addStatus("webservice filter url handling", stat.PASS);
}
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
} else {
System.out.println("ERROR - Unknow return code " + responseCode);
Map map = connection.getHeaderFields();
for (Iterator itr=map.keySet().iterator();itr.hasNext();) {
String header = (String) itr.next();
System.out.println("Header " + header + "-->" + map.get(header));
- }
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ }
+ stat.addStatus("webservice filter url handling", stat.FAIL);
}
} catch(Exception e) {
System.out.println("Errror - exception " + e.getMessage());
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties b/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties
index c4f85ea..35acf49 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/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="service_endpoint_address"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties b/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
index 6eb75c3..b687d6b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="google"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml b/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
index ad7fd49..1c2d2f7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -43,7 +43,7 @@
<param name="src" value="client"/>
</antcall>
<antcall target="compile-common">
- <param name="src" value="mejbclient"/>
+ <param name="src" value="mejbclient"/>
</antcall>
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -61,11 +61,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/google">
- <fileset dir="output/google"
+ <fileset dir="output/google"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -74,11 +74,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/googleejb">
- <fileset dir="output/googleejb"
+ <fileset dir="output/googleejb"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -87,35 +87,35 @@
<target name="assemble" depends="init-common, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="GoogleMapping_appclient.xml,META-INF/wsdl/**,google/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="build-mejb" depends="init-common, compile">
+ <target name="build-mejb" depends="init-common, compile">
<copy file="mejbclient/application-client.xml" tofile="${build.classes.dir}/META-INF/application-client.xml"/>
<copy file="mejbclient/sun-application-client.xml" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
<mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/mejbclient.jar" manifest="mejbclient/MANIFEST.MF">
- <fileset dir="${build.classes.dir}"
- includes="google/MEJBClient.class META-INF/application-client.xml META-INF/sun-application-client.xml"
- />
- </jar>
+ <jar destfile="${assemble.dir}/mejbclient.jar" manifest="mejbclient/MANIFEST.MF">
+ <fileset dir="${build.classes.dir}"
+ includes="google/MEJBClient.class META-INF/application-client.xml META-INF/sun-application-client.xml"
+ />
+ </jar>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -131,13 +131,13 @@
</target>
<target name="run-mejbclient" depends="init-common">
- <exec executable="${APPCLIENT}" failonerror="true">
- <arg line="-client ${assemble.dir}/mejbclient.jar"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line="${appclient.application.args}"/>
- </exec>
+ <exec executable="${APPCLIENT}" failonerror="true">
+ <arg line="-client ${assemble.dir}/mejbclient.jar"/>
+ <arg line="-textauth"/>
+ <arg line="-user j2ee"/>
+ <arg line="-password j2ee"/>
+ <arg line="${appclient.application.args}"/>
+ </exec>
</target>
<target name="run" depends="init-common">
@@ -145,10 +145,10 @@
<param name="appclient.application.args" value="spellng http://${http.host}:${http.port}/googleejb/GoogleSearch"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="contactgoogle">
<antcall target="runclient-common">
@@ -158,23 +158,23 @@
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
</antcall>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
index bd8c242..a24ea6c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
@@ -26,7 +26,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private String googleKey;
public static void main (String[] args) {
@@ -35,23 +35,23 @@
client.doTest(args);
stat.printSummary("webservices-googleID");
}
-
+
public void doTest(String[] args) {
String word = (args.length == 0) ?
"spellng" : args[0];
String targetEndpointAddress = (args.length == 2) ?
args[1] : "http://api.google.com/search/beta2";
- try {
- Context ic = new InitialContext();
-
-
+ try {
+ Context ic = new InitialContext();
+
+
String googleKey = (String) ic.lookup("java:comp/env/googlekey");
GoogleSearchService googleSearchService =
(GoogleSearchService) ic.lookup("java:comp/env/service/GoogleSearch");
- GoogleSearchPort googlePort =
+ GoogleSearchPort googlePort =
googleSearchService.getGoogleSearchPort();
-
+
((Stub)googlePort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
System.out.println("Contacting google for a spelling suggestion at " + targetEndpointAddress);
@@ -63,11 +63,11 @@
stat.addStatus("googleclient main", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("googleclient main" , stat.FAIL);
//System.exit(15);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
index 94cf733..5590d34 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
@@ -32,6 +32,6 @@
<wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
<jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
+ </service-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
index 1bb0adf..e82ea0a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
@@ -17,7 +17,7 @@
package googleejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -29,18 +29,18 @@
private SessionContext sc;
public GoogleEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
+ System.out.println("In GoogleEJB::ejbCreate !!");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
{
try {
@@ -53,9 +53,9 @@
} catch(Exception e) {
EJBException ejbEx = new EJBException("getCallerPrincipal exception");
ejbEx.initCause(e);
- throw ejbEx;
+ throw ejbEx;
}
-
+
MessageContext msgContext = sc.getMessageContext();
System.out.println("msgContext = " + msgContext);
@@ -68,20 +68,20 @@
return returnValue;
}
-
+
public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
index 5ffa564..ba83503 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
@@ -31,11 +31,11 @@
// private SimpleReporterAdapter stat =
// new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- MEJBClient client = new MEJBClient();
+ public static void main(String[] args) {
+ MEJBClient client = new MEJBClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -48,78 +48,78 @@
ex.printStackTrace();
}
}
-
+
public void test01() {
-
- // instanciate the mejb
- try {
-
- Context ic = new InitialContext();
- System.out.println("***Created initial context");
-
- java.lang.Object objref = ic.lookup("ejb/mgmt/MEJB");
- System.out.println("***Looked up ManagementHome!!");
- ManagementHome home = (ManagementHome)PortableRemoteObject.narrow(
- objref, ManagementHome.class);
- System.out.println("***Narrowed ManagementHome!!");
+ // instanciate the mejb
+ try {
- Management mejb = home.create();
- System.out.println("***Got the MEJB!!");
+ Context ic = new InitialContext();
+ System.out.println("***Created initial context");
- String domain = mejb.getDefaultDomain();
- System.out.println("***MEJB default domain = "+domain);
- int mbeanCount = mejb.getMBeanCount().intValue();
- System.out.println("***MBeanCount = "+mbeanCount);
+ java.lang.Object objref = ic.lookup("ejb/mgmt/MEJB");
+ System.out.println("***Looked up ManagementHome!!");
- // Print attributes of all MBeans
+ ManagementHome home = (ManagementHome)PortableRemoteObject.narrow(
+ objref, ManagementHome.class);
+ System.out.println("***Narrowed ManagementHome!!");
+
+ Management mejb = home.create();
+ System.out.println("***Got the MEJB!!");
+
+ String domain = mejb.getDefaultDomain();
+ System.out.println("***MEJB default domain = "+domain);
+ int mbeanCount = mejb.getMBeanCount().intValue();
+ System.out.println("***MBeanCount = "+mbeanCount);
+
+ // Print attributes of all MBeans
ObjectName query = new ObjectName("*:j2eeType=J2EEApplication,name=googleApp,*");
- Set mbeanNames = mejb.queryNames(query, null);
- if ( mbeanNames.size() != 1 ) {
- System.out.println("***ERROR: mbeans returned by query is "
+ Set mbeanNames = mejb.queryNames(query, null);
+ if ( mbeanNames.size() != 1 ) {
+ System.out.println("***ERROR: mbeans returned by query is "
+mbeanNames.size() + " it should be 1");
- }
-
- Iterator it = mbeanNames.iterator();
- ObjectName name = (ObjectName)it.next();
- System.out.println("Obtained jsr77 mbean for googleApp = "+name);
+ }
- // Get attr values from MEJB and print them
- try{
+ Iterator it = mbeanNames.iterator();
+ ObjectName name = (ObjectName)it.next();
+ System.out.println("Obtained jsr77 mbean for googleApp = "+name);
+
+ // Get attr values from MEJB and print them
+ try{
Object attr = mejb.getAttribute(name, "hasWebServices");
- boolean hasWebServices=false;
- if (attr instanceof Boolean) {
- hasWebServices = ((Boolean) attr).booleanValue();
- }
-
- System.out.println("For HasWebServices "+hasWebServices);
+ boolean hasWebServices=false;
+ if (attr instanceof Boolean) {
+ hasWebServices = ((Boolean) attr).booleanValue();
+ }
+
+ System.out.println("For HasWebServices "+hasWebServices);
attr = mejb.getAttribute(name, "endpointAddresses");
- if (attr instanceof String[]) {
- String[] addresses = (String[]) attr;
- for (int i=0;i<addresses.length;i++) {
- System.out.println("Registered addresses " + addresses[i]);
+ if (attr instanceof String[]) {
+ String[] addresses = (String[]) attr;
+ for (int i=0;i<addresses.length;i++) {
+ System.out.println("Registered addresses " + addresses[i]);
- // retrieve the wsdl file
- URL url = new URL("http://localhost:8080/"+addresses[i]+"?wsdl");
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
- connection.connect();
- int responseCode = connection.getResponseCode();
- if (responseCode!=HttpURLConnection.HTTP_OK) {
- System.out.println("Cannot retrieve wsdl for " + addresses[i] + " error is " + connection.getResponseMessage());
- } else {
- InputStream is = new BufferedInputStream(connection.getInputStream());
- byte[] buffer = new byte[100];
- int read;
- do {
- read = is.read(buffer,0, 100);
- System.out.println(new String(buffer,0, read));
- } while(read==100 && read!=-1);
- }
- }
- }
-
+ // retrieve the wsdl file
+ URL url = new URL("http://localhost:8080/"+addresses[i]+"?wsdl");
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.connect();
+ int responseCode = connection.getResponseCode();
+ if (responseCode!=HttpURLConnection.HTTP_OK) {
+ System.out.println("Cannot retrieve wsdl for " + addresses[i] + " error is " + connection.getResponseMessage());
+ } else {
+ InputStream is = new BufferedInputStream(connection.getInputStream());
+ byte[] buffer = new byte[100];
+ int read;
+ do {
+ read = is.read(buffer,0, 100);
+ System.out.println(new String(buffer,0, read));
+ } while(read==100 && read!=-1);
+ }
+ }
+ }
+
}
catch(Exception exp){
//exp.printStackTrace();
@@ -127,14 +127,14 @@
"accessing mbean details: Keep continuing\n");
}
- mejb.remove();
+ mejb.remove();
- } catch(NamingException ne){
+ } catch(NamingException ne){
System.out.println("***Exception while initializing context.\n");
ne.printStackTrace();
- } catch(Exception re) {
+ } catch(Exception re) {
re.printStackTrace();
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
index 98c8655..5298488 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="google"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
index cd7bcec..beb846c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="googleejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
index fb29dce..af79035 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/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="googleserver"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="web.xml" value="descriptor/war/web.xml"/>
<property name="sun-web.xml" value="descriptor/war/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
index 05d12b0..60d9f17 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
@@ -35,9 +35,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -66,11 +66,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -classpath . -model googleclient.model wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/googleclient">
- <fileset dir="output/googleclient"
+ <fileset dir="output/googleclient"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<!-- <delete dir="output"/> -->
@@ -79,11 +79,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/googleserver">
- <fileset dir="output/googleserver"
+ <fileset dir="output/googleserver"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -92,37 +92,37 @@
<target name="wscompile-web" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -f:norpcstructures -keep -d output -s output -model googleweb.model -classpath . wscompile_config_web.xml"/>
</antcall>
<copy todir="${build.classes.dir}/googleserverweb">
- <fileset dir="output/googleserverweb"
+ <fileset dir="output/googleserverweb"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
</target>
<target name="assemble" depends="init-common, compile">
- <!--
- EJB module creation
+ <!--
+ EJB module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleserver/*.class" />
</antcall>
- <!--
- War module creation
+ <!--
+ War module creation
-->
<antcall target="build-war-file"/>
- <!--
- AppClient module creation
+ <!--
+ AppClient module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
@@ -130,36 +130,36 @@
file="GoogleSearch_types.wsdl"/>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch_partial.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <copy todir="${build.classes.dir}"
- file="googleclient.model"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="googleclient.model"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,googleclient/*.class" />
</antcall>
- <!--
- EAR file creation
+ <!--
+ EAR file creation
-->
<antcall target="ear-common" />
<copy todir="${build.classes.dir}/META-INF"
file="${sun-application.xml}"/>
- <jar destfile = "${assemble.dir}/${appname}App.ear"
- update="true">
+ <jar destfile = "${assemble.dir}/${appname}App.ear"
+ update="true">
<fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
</fileset>
</jar>
-
- </target>
+
+ </target>
<target name="build-appclient-file" depends="init-common">
</target>
<target name="build-war-file" depends="init-common">
<echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
+ <delete file="${war.file}"/>
<mkdir dir="${build.classes.dir}/tmp"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF"
@@ -173,10 +173,10 @@
file="GoogleSearch.wsdl"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/tmp"
- file="GoogleMapping_web.xml"/>
- <copy todir="${build.classes.dir}/tmp"
- file="googleweb.model"/>
+ <copy todir="${build.classes.dir}/tmp"
+ file="GoogleMapping_web.xml"/>
+ <copy todir="${build.classes.dir}/tmp"
+ file="googleweb.model"/>
<copy todir="${build.classes.dir}/tmp/WEB-INF/classes/googleserverweb">
<fileset dir="${build.classes.dir}/googleserverweb">
<include name="**/*.class"/>
@@ -186,12 +186,12 @@
<fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
<include name="**/**"/>
</fileset>
- </jar>
+ </jar>
<delete dir="${build.classes.dir}/tmp"/>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -222,7 +222,7 @@
<target name="build-standalone" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:client -keep -d ${build.classes.dir} -s ${build.classes.dir} -classpath . wscompile_config_standalone.xml"/>
</antcall>
<antcall target="compile-common">
@@ -242,7 +242,7 @@
<pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
<pathelement location="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
<pathelement location="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="${build.classes.dir}"/>
</classpath>
@@ -250,10 +250,10 @@
<sysproperty key="http.proxyPort" value="8080"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="contactgoogle">
<antcall target="runclient-common">
@@ -263,34 +263,34 @@
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
</antcall>
</target>
<target name="gen-mapping-web" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping GoogleMapping_web.xml wscompile_config_web.xml"/>
</antcall>
</target>
<target name="create-user">
<antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="staff"/>
+ <param name="user" value="j2ee"/>
+ <param name="password" value="j2ee"/>
+ <param name="groups" value="staff"/>
</antcall>
<antcall target="reconfig-common"/>
</target>
-
+
<target name="delete-user">
<!-- remove test users, just cleanup. -->
<antcall target="delete-user-common">
@@ -303,10 +303,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
index bdde202..4d7f7db 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
@@ -29,10 +29,10 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
@@ -42,12 +42,12 @@
public static void main (String[] args) {
- stat.addDescription("googleserver appclient");
+ stat.addDescription("googleserver appclient");
Client client = new Client(args);
client.doTest();
stat.printSummary("googleserver-applientID");
}
-
+
public Client(String[] args) {
word = (args.length > 0) ? args[0] : "spellng";
targetEndpointAddress = (args.length > 1) ? args[1] : null;
@@ -55,7 +55,7 @@
public void doTest() {
- try {
+ try {
Context ic = new InitialContext();
String googleKey = (String)
ic.lookup("java:comp/env/googlekey");
@@ -80,7 +80,7 @@
doDynamicProxyTest(googleSearchService, googleKey);
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
doSpellingSuggestion(googleSearchPort, googleKey,
targetEndpointAddress);
@@ -106,7 +106,7 @@
partialWsdlServiceGeneric.getPort(GoogleSearchPort.class);
googleSearch.doSpellingSuggestion(googleKey, word);
-/** GoogleSearchService partialWsdlServiceGenerated =
+/** GoogleSearchService partialWsdlServiceGenerated =
(GoogleSearchService)
ic.lookup("java:comp/env/service/partialGenerated");
googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort();
@@ -115,17 +115,17 @@
stat.addStatus("appclient main", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("appclient main" , stat.FAIL);
- }
+ }
}
private void doSpellingSuggestion(GoogleSearchPort googleSearchPort,
String googleKey,
- String endpointAddress)
+ String endpointAddress)
throws Exception {
if( endpointAddress != null ) {
@@ -142,7 +142,7 @@
System.out.println("Contacting google for spelling " +
"suggestion at " + endpointAddress);
-
+
String spellingSuggestion =
googleSearchPort.doSpellingSuggestion(googleKey, word);
System.out.println("Gave google the word '" + word + "' ... " +
@@ -155,21 +155,21 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
if( targetEndpointAddress != null ) {
- c3.setTargetEndpointAddress(targetEndpointAddress);
- }
+ c3.setTargetEndpointAddress(targetEndpointAddress);
+ }
Object params[] = new Object[] {googleKey, "hello" };
String response = (String) c3.invoke(params);
System.out.println("Response = " + response);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -182,18 +182,18 @@
System.out.println("Calling oneway operation");
Call oneway = service.createCall(PORT_QNAME, "helloOneWay");
if( targetEndpointAddress != null ) {
- oneway.setTargetEndpointAddress(targetEndpointAddress);
- }
+ oneway.setTargetEndpointAddress(targetEndpointAddress);
+ }
long oneWayMethodWaitTimeInMillis = 7000;
- Date before = new Date();
- oneway.invokeOneWay(new Object[]
+ Date before = new Date();
+ oneway.invokeOneWay(new Object[]
{ oneWayMethodWaitTimeInMillis + "" });
Date after = new Date();
long elapsedTime = after.getTime() - before.getTime();
- System.out.println("one way operation began at " + before +
- " and returned at " + after +
+ System.out.println("one way operation began at " + before +
+ " and returned at " + after +
" and took " + elapsedTime + " milli-seconds");
if( elapsedTime > oneWayMethodWaitTimeInMillis ) {
throw new Exception("one way operation blocked for too long ");
@@ -204,7 +204,7 @@
// to undeploy, but the endpoint is still executing its
// oneway operation.
long sleepTime = (oneWayMethodWaitTimeInMillis - elapsedTime);
-
+
System.out.println("now sleeping for " + sleepTime + " milli secs");
Thread.sleep(sleepTime);
System.out.println("returning from doDynamicProxyTest");
@@ -260,7 +260,7 @@
System.out.println("Successfully caught unsupported operation " +
"for Service.getPort(SEI)");
}
-
+
try {
Remote remote = service.getPort(PORT_QNAME, GoogleSearchPort.class);
} catch(java.lang.UnsupportedOperationException uoe) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
index f7105c9..36d7960 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class ClientHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In ClientHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In ClientHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In ClientHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In ClientHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In ClientHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
index cc01ca2..4e7445a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
@@ -90,7 +90,7 @@
</service-endpoint-interface>
<port-component-link>googleserver-web.war#GoogleSearchPort</port-component-link>
</port-component-ref>
- </service-ref>
+ </service-ref>
<!-- <service-ref>
<description>partial wsdl test google service ref</description>
<service-ref-name>service/partialGenerated</service-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
index 21cde76..c534d78 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
@@ -33,5 +33,5 @@
<group-name>eng</group-name>
<group-name>mgr</group-name>
<group-name>guest</group-name>
- </security-role-mapping>
+ </security-role-mapping>
</sun-application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
index ffb61f5..abe2723 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In FooHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In FooHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In FooHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In FooHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
index 6b935cb..3186ace 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
@@ -24,7 +24,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,24 +33,24 @@
public class GoogleEJB implements SessionBean {
private SessionContext sc;
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
+
public GoogleEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
+ System.out.println("In GoogleEJB::ejbCreate !!");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
{
try {
@@ -75,9 +75,9 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
}
-
+
try {
boolean result = sc.isCallerInRole("foo");
System.out.println(
@@ -87,7 +87,7 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
}
String returnValue = "spelling suggestion from ejb";
@@ -96,10 +96,10 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/WebDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort webPort = (GoogleSearchPort)
+ GoogleSearchPort webPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = webPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
@@ -111,7 +111,7 @@
System.out.println("GoogleEJB returning " + returnValue);
return returnValue;
}
-
+
public void helloOneWay(String s1) {
System.out.println("In GoogleEJB::helloOneWay. param = " +
@@ -131,16 +131,16 @@
public googleserver.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
private void doDynamicProxyTest(Service service) throws Exception {
@@ -148,14 +148,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -164,7 +164,7 @@
System.out.println("wsdlLocation = " + wsdlLocation);
}
Iterator ports = service.getPorts();
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
index 08f27fb..20c866b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
@@ -24,7 +24,7 @@
public class StandAloneClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private String word;
@@ -32,12 +32,12 @@
private String googleKey;
public static void main (String[] args) {
- stat.addDescription("googleserver standalone");
+ stat.addDescription("googleserver standalone");
StandAloneClient client = new StandAloneClient(args);
client.doTest();
stat.printSummary("googleserver-standaloneID");
}
-
+
public StandAloneClient(String[] args) {
word = (args.length > 0) ? "spellng" : args[0];
targetEndpointAddress = (args.length > 1) ?
@@ -47,11 +47,11 @@
}
public void doTest() {
- try {
- GoogleSearchService googleSearchService =
+ try {
+ GoogleSearchService googleSearchService =
new GoogleSearchService_Impl();
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
((Stub)googleSearchPort)._setProperty
@@ -72,15 +72,15 @@
spellingSuggestion + "'");
stat.addStatus("appclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } catch (Exception ex) {
System.out.println("google client test failed");
ex.printStackTrace();
stat.addStatus("appclient main" , stat.FAIL);
- }
+ }
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
index 7a51507..cbe53ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
System.out.println("In FooHandler::handleFault()");
return true;
}
-
+
public boolean handleRequest(MessageContext context) {
System.out.println("In FooHandler::handleRequest()");
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
System.out.println("In FooHandler::handleResponse()");
return true;
- }
-
+ }
+
public void init(HandlerInfo config) {
System.out.println("In FooHandler::init()");
try {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
index 916f52e..b41c202 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
@@ -30,11 +30,11 @@
public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
+
private boolean gotInit = false;
public GoogleServletImpl() {
@@ -50,9 +50,9 @@
System.out.println("Got ServiceLifecycle::destroy call");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
public void helloOneWay(String s1) {
@@ -71,8 +71,8 @@
new Date());
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
throws RemoteException {
System.out.println("GoogleServletImpl.doSpellingSuggestion() " +
@@ -88,22 +88,22 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/EjbDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort ejbPort = (GoogleSearchPort)
+ GoogleSearchPort ejbPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = ejbPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
e.printStackTrace();
throw new RemoteException(e.getMessage(), e);
}
- }
-
+ }
+
System.out.println("GoogleServletImpl returning " + returnValue);
return returnValue;
}
-
+
public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
return null;
}
@@ -113,14 +113,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -129,7 +129,7 @@
System.out.println("wsdlLocation = " + wsdlLocation);
}
Iterator ports = service.getPorts();
-
+
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
index 5ffdeb9..5634c14 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="googleclient"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
index cc7a838..f1a8116 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="googleserver"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
index d9ccfe6..99ad91c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="http://localhost:8080/GoogleServlet/GoogleSearch?WSDL"
packageName="standalone"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
index dd6e766..db0ca77 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="googleserverweb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
index 54bd850..f9520dc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
@@ -15,26 +15,26 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="simplehandler"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
+<property name="ejbjar.files" value="${build.classes.dir}"/> \u0020
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.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="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
index ef05dd5..af798a8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -49,45 +49,45 @@
<param name="src" value="ejb"/>
</antcall>
</target>
-
+
<target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
+ <param name="wscompile.command"
+ value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
</antcall>
- </target>
-
+ </target>
+
<target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,ejb/*.class"/>
</antcall>
</target>
-
+
<target name="assemble" depends="assemble-ejb, assemble-client"/>
-
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
+ </antcall>
<antcall target="gen-ejb-wsdl"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,simplehandler/**,ejb/SimpleServer.class,com/**" />
- </antcall>
+ </antcall>
<antcall target="deploy-client-common"/>
<move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}/simplehandler"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -95,10 +95,10 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
index fb00f88..f8201a2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
@@ -30,28 +30,28 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-simple-soapfault");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-soapfaultID");
}
-
+
public void doTest(String[] args) {
- try {
-
+ try {
+
String targetEndpointAddress = args[0];
-
+
Context ic = new InitialContext();
-
+
Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler");
SimpleServer test = (SimpleServer)
testService.getPort(SimpleServer.class);
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
-
+
System.out.println("endpoint address = " + targetEndpointAddress);
System.out.println("Invocation returned " + test.sayHello("jerome"));
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
index 3054949..d7dba23 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServer"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
+ <service
+ name="SimpleHandlerServer"
+ targetNamespace="urn:HandlerTest"
+ typeNamespace="urn:HandlerTest"
packageName="handlertest">
<interface name="ejb.SimpleServer"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
index 8e5029d..cb7fbe0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<description>simple handler service ref</description>
<service-ref-name>service/simplehandler</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServer.wsdl</wsdl-file>
+ <wsdl-file>META-INF/wsdl/SimpleHandlerServer.wsdl</wsdl-file>
<jaxrpc-mapping-file>SimpleHandlerMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServer</service-qname>
+ <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServer</service-qname>
<port-component-ref>
<service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
index 74dd711..d2ac35b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
@@ -21,13 +21,13 @@
import javax.xml.rpc.handler.*;
public class SimpleHandler extends GenericHandler {
-
+
protected HandlerInfo info = null;
-
+
public void init(HandlerInfo info) {
this.info = info;
}
-
+
public boolean handleRequest(MessageContext context) {
try {
Date startTime = new Date();
@@ -37,7 +37,7 @@
}
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
try {
Date startTime = (Date) context.getProperty("startTime");
@@ -49,7 +49,7 @@
}
return true;
}
-
+
public QName[] getHeaders() {
return new QName[0];
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
index b78fa62..653d44c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
@@ -19,7 +19,7 @@
import java.rmi.*;
public interface SimpleServer extends Remote {
-
+
public String sayHello(String source) throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
index b34ce51..97ed2c6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
@@ -22,23 +22,23 @@
public class SimpleServerImpl implements SessionBean {
SessionContext sc;
-
+
public String sayHello(String hello) throws RemoteException {
return "salut " + hello;
}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleServer:::ejbCreate !!");
+ System.out.println("In SimpleServer:::ejbCreate !!");
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
- public void ejbPassivate() {}
+
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
index 4f9cc4c..83eb713 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-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="jaxrpc-hello-ejb"/>
<property name="appname" value="${module}"/>
@@ -30,11 +30,11 @@
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
+ value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+ value="descriptor/sun-application-client.xml"/>
<property name="sun-application.xml"
- value="descriptor/sun-application.xml"/>
+ value="descriptor/sun-application.xml"/>
<property name="appclientjar.files" value="${build.classes.dir}"/>
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
index c0c8c27..a5be6ef 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
@@ -56,8 +56,8 @@
<delete file="${assemble.ear}/${ejbjar.file}" />
<delete dir="${assemble.ear}/META-INF" />
<copy todir="${assemble.ear}">
- <fileset dir="${build}/"
- includes="**/*.class"
+ <fileset dir="${build}/"
+ includes="**/*.class"
excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
</copy>
<copy file="${build}/MyHelloService.wsdl" todir="${assemble.ear}/META-INF/wsdl" />
@@ -65,7 +65,7 @@
<copy file="webservices.xml" todir="${assemble.ear}/META-INF" />
<copy file="ejb-jar.xml" todir="${assemble.ear}/META-INF" />
<copy file="sun-ejb-jar.xml" todir="${assemble.ear}/META-INF" />
- <jar destfile="${assemble.ear}/${ejbjar.file}"
+ <jar destfile="${assemble.ear}/${ejbjar.file}"
>
<fileset dir="${assemble.ear}" includes="META-INF/**, build/**,helloservice/**" />
</jar>
@@ -78,7 +78,7 @@
<target name="create-ear" depends="create-ejb-jar"
description="Executes the targets needed to create the ejb jar.">
- <jar destfile="${assemble.ear}/${ear.file}"
+ <jar destfile="${assemble.ear}/${ear.file}"
>
<fileset dir="${assemble.ear}" includes="${ejbjar.file}" />
</jar>
@@ -120,7 +120,7 @@
-
+
<copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
<mkdir dir="${assemble.dir}"/>
<jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
@@ -183,6 +183,6 @@
<replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
<replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
index 4c2b3b1..dccfbc0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java
index f93a1d5..506218c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml
index 5416691..b13a575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml
@@ -19,10 +19,10 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
+ <service
+ name="MyHelloService"
+ targetNamespace="urn:Foo"
+ typeNamespace="urn:Foo"
packageName="helloservice">
<interface name="helloservice.HelloIF"/>
</service>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml
index 3d1440f..0c1bbbb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
<wsdl location="build/MyHelloService.wsdl"
packageName="helloservice"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
index b6e2784..559fdbe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
@@ -31,8 +31,8 @@
public class Client extends HttpServlet {
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
index fff8fac..79ce40d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jaxrpc-hello-web"/>
<property name="appname" value="${module}"/>
@@ -30,11 +30,11 @@
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
+ value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+ value="descriptor/sun-application-client.xml"/>
<property name="sun-application.xml"
- value="descriptor/sun-application.xml"/>
+ value="descriptor/sun-application.xml"/>
<property name="appclientjar.files" value="${build.classes.dir}"/>
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
index 8efec2b..448785b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
@@ -51,22 +51,22 @@
</path>
<target name="all" depends="clean,deploy,assemble-client,deploy-client,runtest,undeploy"/>
-
+
<target name="create-war" description="Packages the WAR file">
<echo message="Creating the WAR...."/>
<delete file="${assemble.war}/${war.file}" />
<delete dir="${assemble.war}/WEB-INF" />
<copy todir="${assemble.war}/WEB-INF/classes/">
- <fileset dir="${build}/"
- includes="**/*.class"
+ <fileset dir="${build}/"
+ includes="**/*.class"
excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
</copy>
<copy file="${build}/MyHelloService.wsdl" todir="${assemble.war}/WEB-INF/wsdl" />
<copy file="${build}/mapping.xml" todir="${assemble.war}/${build}/" />
<copy file="sun-web.xml" todir="${assemble.war}/WEB-INF" />
<copy file="webservices.xml" todir="${assemble.war}/WEB-INF" />
- <war destfile="${assemble.war}/${war.file}"
+ <war destfile="${assemble.war}/${war.file}"
webxml="./web.xml" filesonly="true" >
<fileset dir="${assemble.war}" includes="WEB-INF/**, build/**" />
</war>
@@ -102,7 +102,7 @@
<arg line="${warname}"/>
</exec>
</target>
-
+
<!-- <target name="build-client" depends="build-static"
description="Executes the targets needed to build a static stub client.">
@@ -133,7 +133,7 @@
<param name="src" value="client"/>
</antcall>
<mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${assemble.war}/WEB-INF/wsdl/MyHelloService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
+ <copy file="${assemble.war}/WEB-INF/wsdl/MyHelloService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
@@ -201,7 +201,7 @@
</target>
<target name="undeploy" depends="undeploy-war1,undeploy-client"/>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml
index 4c2b3b1..dccfbc0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java
index 90c5f6e..9ce543f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java
@@ -31,30 +31,30 @@
/* private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("jaxrpc-hello-web-client");
Client client = new Client();
client.doTest(args);
stat.printSummary("jaxrpc-hello-web-client");
}
-
+
public void doTest(String[] args) {
- try {
-
+ try {
+
String targetEndpointAddress = args[0];
Context ic = new InitialContext();
MyHelloService myHelloService =
(MyHelloService) ic.lookup(
"java:comp/env/service/helloservice");
-
+
HelloIF helloPort = myHelloService.getHelloIFPort();
-
-
+
+
((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
-
+
System.out.println("endpoint address = " + targetEndpointAddress);
System.out.println("Invocation returned " + helloPort.sayHello("All"));
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java
index 2029adb..d1bf354 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml
index 5416691..b13a575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml
@@ -19,10 +19,10 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
+ <service
+ name="MyHelloService"
+ targetNamespace="urn:Foo"
+ typeNamespace="urn:Foo"
packageName="helloservice">
<interface name="helloservice.HelloIF"/>
</service>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml
index 3d1440f..0c1bbbb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
<wsdl location="build/MyHelloService.wsdl"
packageName="helloservice"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml
index eb9e97d..4083642 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<description>simple jaxrpc service ref</description>
<service-ref-name>service/helloservice</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/MyHelloService.wsdl</wsdl-file>
+ <wsdl-file>META-INF/wsdl/MyHelloService.wsdl</wsdl-file>
<jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:Foo">servicens:HelloIF</service-qname>
+ <service-qname xmlns:servicens="urn:Foo">servicens:HelloIF</service-qname>
<port-component-ref>
<service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
index c712efe..4e12afb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
@@ -31,8 +31,8 @@
public class Client extends HttpServlet {
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties
index 7dda984..091806f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/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="bare_doc_literal-bc_consumer_se_provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml
index 2e58611..f5916ad 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml
@@ -34,7 +34,7 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest,undeploy"/>
+ <target name="all" depends="clean, setup, runtest,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java
index 449840b..6b8e459 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java
@@ -28,41 +28,41 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider";
+ private static String testId = "jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer();
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer();
stat.printSummary(testId);
}
private void addUsingSOAPConsumer() {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 500 + 50 = " + port.add(50));
- stat.addStatus(testId, stat.PASS);
- System.out.println(" No Exception thrown");
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 500 + 50 = " + port.add(50));
+ stat.addStatus(testId, stat.PASS);
+ System.out.println(" No Exception thrown");
- } catch(Exception e) {
- //e.printStackTrace();
- if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
- stat.addStatus(testId, stat.FAIL);
- else {
- stat.addStatus(testId, stat.FAIL);
- System.out.println(" SOAPFaultException Not thrown");
- }
- }
+ } catch(Exception e) {
+ //e.printStackTrace();
+ if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
+ stat.addStatus(testId, stat.FAIL);
+ else {
+ stat.addStatus(testId, stat.FAIL);
+ System.out.println(" SOAPFaultException Not thrown");
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java
index a4da07d..34c9263 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java
@@ -26,16 +26,16 @@
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod
- public int add(
- @WebParam(name = "number1", targetNamespace = "http://example.com/Calculator", partName = "part1")
- int j
- ) throws Exception {
- int i = 500;
+ @WebMethod
+ public int add(
+ @WebParam(name = "number1", targetNamespace = "http://example.com/Calculator", partName = "part1")
+ int j
+ ) throws Exception {
+ int i = 500;
int k = i +j ;
System.out.println("JBI Test :: bare-rpc-literal bc_consumer_se_provider : " + i + "+" + j +" = " + k);
- return k;
- }
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties
index 3081195..a50ac89 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/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="bare_doc_literal-se_consumer_se_provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml
index 8c715f1..4f46f61 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml
@@ -38,9 +38,9 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <delete file="${basedir}/RepRunConf.txt"/>
+ <delete dir="${basedir}/common:endpoint"/>
</target>
<target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client"/>
@@ -52,8 +52,8 @@
</target>
<target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
+ <echo message="classes dir = ${build.classes.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
<antcall target="pkg-war">
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
@@ -69,7 +69,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
includes="common/**, webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -125,11 +125,11 @@
<antcall target="undeploy-client"/>
<antcall target="undeploy-app"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="common/**, client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java
index 076c17f..bab63ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/bare_doc_literal/se_consumer_se_provider";
+ private static String testId = "jbi-serviceengine/bare_doc_literal/se_consumer_se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
@@ -45,8 +45,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -57,15 +57,15 @@
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer();
String line = null;
- boolean found = false;
+ boolean found = false;
while ((line = input.readLine()) != null) {
- if(line.indexOf("SUCCESS") != -1) found = true;
- buffer.append(line + "\n");
+ if(line.indexOf("SUCCESS") != -1) found = true;
+ buffer.append(line + "\n");
}
log(buffer.toString());
- if(!found) return 505;
+ if(!found) return 505;
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java
index fd53726..0f7fdcd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java
@@ -28,20 +28,20 @@
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod
- public int add(
- /*
- @WebParam(name = "number1", targetNamespace = "http://example.web.service/Calculator", partName = "part1")
- int i , */
- @WebParam(name = "number2", targetNamespace = "http://example.web.service/Calculator", partName = "part2")
- int j
- ) throws Exception {
- int i = 50;
+ @WebMethod
+ public int add(
+ /*
+ @WebParam(name = "number1", targetNamespace = "http://example.web.service/Calculator", partName = "part1")
+ int i , */
+ @WebParam(name = "number2", targetNamespace = "http://example.web.service/Calculator", partName = "part2")
+ int j
+ ) throws Exception {
+ int i = 50;
int k = i +j ;
System.out.println("JBI Test :: bare-rpc-literal se_consumer_se_provider : " + i + "+" + j +" = " + k);
- return k;
- }
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
index c6abd3c..1c486bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
@@ -30,38 +30,38 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
- int k = port.add(505);
- printSuccess("SUCCESS :: Sum of 505 and 50 is : ", out,k);
+ int k = port.add(505);
+ printSuccess("SUCCESS :: Sum of 505 and 50 is : ", out,k);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -74,13 +74,13 @@
}
public void printSuccess(String message, PrintWriter out, long result) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
}
public void printSuccess(String message, PrintWriter out, String result) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml
index 0060f08..5ce3ca2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml
@@ -33,7 +33,7 @@
<delete file="${env.APS_HOME}/test_results.xml"/>
<record name="jbi-serviceengine.output" action="start" />
<ant dir="server" target="all"/>
- <ant dir="client" target="all"/>
+ <ant dir="client" target="all"/>
<ant dir="jax-rpc" target="all"/>
<ant dir="soapfault" target="all"/>
<ant dir="oneway" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties
index 3f83010..e302d5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/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="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml
index 3f1cac9..3abc8bb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -110,11 +110,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java
index aae9cb4..dd4e70c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/client/web";
+ private static String testId = "jbi-serviceengine/client/web";
public boolean found1 = false;
public boolean found2 = false;
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java
index 6951320..bed1e0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml
index d5d9d09..9e6cf3e 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml
index ea2027c..483c557 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml
index 2484752..f641655 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
<service-name>
- <namespace-uri>http://example.web.service/Calculator</namespace-uri>
- <local-part>CalculatorService</local-part>
+ <namespace-uri>http://example.web.service/Calculator</namespace-uri>
+ <local-part>CalculatorService</local-part>
</service-name>
<endpoint-name>CalculatorPort</endpoint-name>
<endpoint-role>provider</endpoint-role>
- <address-location>http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>add</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://example.web.service/Calculator</namespace-uri>
</input>
<output>
<namespace-uri>http://example.web.service/Calculator</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
index e653d46..b38ca7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties
index d40be86..863c93c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/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="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value=".consumer//web.xml"/>
<property name="sun-web.xml" value="./consumer/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml
index 4f8dd0b..7522344 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml
@@ -54,10 +54,10 @@
<mkdir dir="${assemble.dir}"/>
<jar destfile="${assemble.dir}/${appname}-ejb.jar"
basedir="${build.classes.dir}"
- includes="endpoint/**">
+ includes="endpoint/**">
</jar>
</target>
-
+
<target name="compile" depends="init-common">
<antcall target="compile-common">
<param name="src" value="provider/endpoint"/>
@@ -99,8 +99,8 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
</antcall>
<javac srcdir="consumer" destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
- debug="on"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ debug="on"
includes="webclient/**"/>
<copy file="./consumer/client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./consumer/client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -178,12 +178,12 @@
<arg line="${appname}-ejb"/>
</exec>
</target>
-
+
<target name="runtest" depends="init-common">
<echo message="Running the test client"/>
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="consumer/client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml
index d6e89dc..d4a0f3e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml
@@ -26,12 +26,12 @@
<port-info>
<service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
<wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
</wsdl-port>
<stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
+ <name>jbi-enabled</name>
+ <value>true</value>
</stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml
index 10c3295..19c131c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java
index 271281d..17bdb07 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml
index d3211f6..16580c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_ejb_consumer_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_ejb_consumer_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml
index a19cedf..11dbddd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml
@@ -27,6 +27,6 @@
<consumes interface-name="tns:Hello"
service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
index b0c8667..5cdb041 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
@@ -29,8 +29,8 @@
@WebServiceRef(name="sun-web.serviceref/HelloEJBService")
HelloEJBService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -38,7 +38,7 @@
throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
+ Hello port = service.getHelloEJBPort();
// Get Stub
/*
BindingProvider stub = (BindingProvider)port;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
index afab69f..eff66a1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
@@ -25,7 +25,7 @@
public class HelloEJB implements Hello {
public String sayHello(String who) {
- System.out.println("**** EJB Called");
+ System.out.println("**** EJB Called");
return "WebSvcTest-Hello " + who;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml
index a7b7b55..0727c38 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_ejb_provider_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_ejb_provider_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml
index a479d41..c68eac2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml
@@ -27,6 +27,6 @@
<provides interface-name="tns:Hello"
service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties
index 0300108..6003a7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/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="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml
index dc63f00..632eb41 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/AdderService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -116,11 +116,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java
index 2701365..e342175 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java
@@ -32,7 +32,7 @@
public boolean found1 = false;
- private static String testId = "jbi-serviceengine/inout-sample";
+ private static String testId = "jbi-serviceengine/inout-sample";
public static void main (String[] args) {
stat.addDescription(testId);
@@ -45,13 +45,13 @@
String url = args[0];
try {
- //for(int i=0; i<1000; i++) {
+ //for(int i=0; i<1000; i++) {
int code = invokeServlet(url);
- //System.out.println("client ID : " + i);
+ //System.out.println("client ID : " + i);
report(code);
- //}
- } catch (Exception e) {
- fail();
+ //}
+ } catch (Exception e) {
+ fail();
}
}
@@ -66,7 +66,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Value is") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java
index 4fc103f..9f835ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java
@@ -26,17 +26,17 @@
targetNamespace="http://example.web.service/Adder"
)
public class Adder {
- public Adder() {}
+ public Adder() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i -j ;
System.err.println(i + "-" + j +" = " + k);
- return k;
+ return k;
- /*
- if(i == 101)
- throw new RuntimeException("This is my exception in add ...");
- */
- }
+ /*
+ if(i == 101)
+ throw new RuntimeException("This is my exception in add ...");
+ */
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml
index 7bb96bc..70b9ea1 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Adder"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:AdderServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Adder"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:AdderServiceInterface"
service-name="tns:AdderService"
endpoint-name="AdderPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml
index da86bf4..e532ce1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Adder Service</description>
- <display-name>AdderWAR</display-name>
+ <description>WebTier for the Adder Service</description>
+ <display-name>AdderWAR</display-name>
- <servlet>
- <description>Endpoint for Adder Web Service</description>
- <display-name>AdderWebService</display-name>
- <servlet-name>Adder</servlet-name>
- <servlet-class>endpoint.Adder</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Adder Web Service</description>
+ <display-name>AdderWebService</display-name>
+ <servlet-name>Adder</servlet-name>
+ <servlet-class>endpoint.Adder</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Adder</servlet-name>
- <url-pattern>/webservice/AdderService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Adder</servlet-name>
+ <url-pattern>/webservice/AdderService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
index cffbfe9..2fdd8dd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
@@ -28,39 +28,39 @@
@WebServiceRef(name="sun-web.serviceref/adder") AdderService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Adder port = service.getAdderPort();
System.out.println("port is : " + port);
int result = port.add(101, 2);
System.out.println("result is : " + result);
- //printFailure(out);
- printSuccess(out, result);
+ //printFailure(out);
+ printSuccess(out, result);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- //printSuccess(out);
- printFailure(out);
+ e.printStackTrace();
+ //printSuccess(out);
+ printFailure(out);
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -73,7 +73,7 @@
}
public void printSuccess(PrintWriter out, int result) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml
index 9f4f161..4bbfc2b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml
@@ -25,6 +25,6 @@
<target name="all">
<ant dir="consumer" target="all"/>
- <ant dir="provider" target="all"/>
+ <ant dir="provider" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties
index c2a4564..d41ec0c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/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="findinterest"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="jbi-component-su-assembly" value="ejb_findinterest_provider_assembly"/>
<property name="jbi-component-su" value="ejb_jaxrpc_provider_su"/>
<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml
index c39b0c0..26f5936 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml
@@ -39,7 +39,7 @@
<target name="setup" depends="init-common">
<property name="root.dir" value="." />
<property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
+ <property name="appname" value="FindInterestApp" />
<property name="build.dir" value="${env.APS_HOME}/build/module" />
<property name="build.repository" value="${build.dir}/buildears"/>
@@ -58,13 +58,13 @@
<property name="debug" value="on" />
</target>
-
+
<target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
+ <delete dir="${build.dir}"/>
<delete dir="${build.repository}"/>
<delete dir="${build.appclient}"/>
</target>
-
+
<!-- target name="compile" depends="setup,clean" -->
<target name="compile" depends="wscompile,setup" >
<!-- ant target="makedirs"/ -->
@@ -96,8 +96,8 @@
<include name="**/FindInterest_Schema.xsd" />
</fileset>
</jar>
-
- <antcall target="copy-to-webinf" />
+
+ <antcall target="copy-to-webinf" />
<jar jarfile="${build.jars}/web.war" >
<fileset dir="${build.webinf}">
@@ -106,7 +106,7 @@
<fileset dir="${build.mapping}">
<include name="IntrClientMapping.xml" />
</fileset>
-
+
<fileset dir="${build.webinf}">
<include name="**/web.xml" />
@@ -116,8 +116,8 @@
</fileset>
</jar>
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
+ <jar jarfile="${build.jars}/appclient.jar"
+ manifest="${build.desc}/client/MANIFEST.MF">
<fileset dir="${build.mapping}">
<include name="IntrClientMapping.xml" />
@@ -138,18 +138,18 @@
</target>
<target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- </copy>
+ <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
+ <fileset dir="${build.dest}">
+ <include name="myclient/*.class"/>
+ </fileset>
+ </copy>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.webinf}/WEB-INF/classes"/>
</target>
<target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
+ <ear earfile="${build.ear}/${appname}.ear"
+ appxml="${build.desc}/application.xml"
+ manifest="${build.desc}/MANIFEST.MF">
<fileset dir="${build.jars}" includes="*.jar,*.war" excludes="ejb.jar"/>
@@ -158,9 +158,9 @@
</fileset>
</ear>
</target>
-
+
<target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -171,7 +171,7 @@
<arg value="--retrieve" />
<arg value="${build.appclient}" />
<arg value="${build.ear}/${appname}.ear" />
- </exec>
+ </exec>
<exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
@@ -192,9 +192,9 @@
<antcall target="deploy-jbi-component-su"/>
</target>
-
+
<target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -203,7 +203,7 @@
<arg value="--port" />
<arg value="${admin.port}" />
<arg value="${appname}" />
- </exec>
+ </exec>
<exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
@@ -222,10 +222,10 @@
<echo message="Executing an appclient"/>
<exec executable="${APPCLIENT}">
<env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
+ <arg value="-client" />
+ <arg value="${build.appclient}/${appname}Client.jar"/>
+ <arg value="-name" />
+ <arg value="MyAppClient" />
</exec>
</target>
@@ -266,14 +266,14 @@
<include name="*.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor/client" >
<include name="*.xml" />
- <include name="MANIFEST.MF" />
+ <include name="MANIFEST.MF" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor" >
<include name="application.xml" />
@@ -286,7 +286,7 @@
<include name="sun-j2ee-ri.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/ejb" >
<include name="**/*.java" />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java
index 927d54a..52152c9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java
@@ -30,7 +30,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/consumer";
public FindInterestClient() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -40,15 +40,15 @@
client.doTest();
// client.doServletTest();
}
-
+
public double doTest() {
//String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
+ // "http://localhost:8080/findintr/FindInterest";
String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
+ "http://localhost:12013/InterestIFPort";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -56,29 +56,29 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
+ + interest);
+
+ if (interest == 105.0) {
+ status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
+ }
return interest;
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ } catch (Exception ex) {
+ status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
+ }
return -1;
}
/* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -87,22 +87,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ + interest);
+
+ if (interest == 210.0) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+ } catch (Exception ex) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
+ }
+ status.printSummary("JSR109 - FindInterestTest");
}*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java
index 2214af5..4a58b80 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java
@@ -30,7 +30,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/consumer";
public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -40,13 +40,13 @@
client.doTest();
// client.doServletTest();
}
-
+
public double doTest() {
String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
+ "http://localhost:8080/findintr/FindInterest";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -54,29 +54,29 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
+ + interest);
+
+ if (interest == 105.0) {
+ status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
+ }
return interest;
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ } catch (Exception ex) {
+ status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
+ }
return -1;
}
/* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -85,22 +85,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ + interest);
+
+ if (interest == 210.0) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+ } catch (Exception ex) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
+ }
+ status.printSummary("JSR109 - FindInterestTest");
}*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
index 08c0656..86c89e1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
@@ -20,12 +20,12 @@
import jakarta.servlet.http.*;
import java.io.Serializable;
import java.io.PrintWriter;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.namespace.QName;
public class FindInterestServletClient extends HttpServlet
- {
+ {
HttpServletResponse resp;
public FindInterestServletClient() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -36,7 +36,7 @@
this.resp = resp;
doPost(req, resp);
}
-
+
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try{
@@ -49,9 +49,9 @@
}
public void calculateInterest() throws Exception {
- System.out.println("calculateInterest invoked from servlet ");
+ System.out.println("calculateInterest invoked from servlet ");
FindInterestClient client = new FindInterestClient();
- double interest= client.doTest();
+ double interest= client.doTest();
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java
index 079755b..3dfffb1 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java
@@ -23,19 +23,19 @@
public class SOAPEjbConsumer {
private double balance = 300.00;
private double period = 3.5;
-
+
private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
+
private static String testId = "jbi-serviceengine/jax-rpc/consumer";
public SOAPEjbConsumer() {
status.addDescription(testId);
}
-
+
public static void main (String[] args) {
-
+
SOAPEjbConsumer client = new SOAPEjbConsumer();
-
+
client.doTest();
}
@@ -44,23 +44,23 @@
// "http://localhost:8080/soap/web/findinterest";
String targetEndpointAddress =
"http://localhost:12013/InterestIFPort";
-
+
try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
-
+
InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
+
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
+
double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
+ interest);
-
+
if (interest == 105.0) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
}
-
+
} catch (Exception ex) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java
index 7c4bfbb..87a75ed 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java
@@ -23,42 +23,42 @@
public class SOAPEjbConsumerNonHttpBC {
private double balance = 300.00;
private double period = 3.5;
-
+
private static SimpleReporterAdapter status = new SimpleReporterAdapter();
private static String testId = "jbi-serviceengine/jax-rpc/consumer";
-
+
public SOAPEjbConsumerNonHttpBC() {
status.addDescription(testId);
}
-
+
public static void main (String[] args) {
-
+
SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
-
+
client.doTest();
}
private void doTest() {
String targetEndpointAddress =
"http://localhost:8080/soap/web/findinterest";
-
+
try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
-
+
InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
+
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
+
double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
+ interest);
-
+
if (interest == 105.0) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
}
-
+
} catch (Exception ex) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java
index 6a8ba34..502a10e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF FindInterest SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[105.0]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml
index 3542c06..2b0cec3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml
@@ -26,7 +26,7 @@
<wsdl-port>
<namespaceURI>http://hello.org/wsdl</namespaceURI>
<localpart>InterestIFPort</localpart>
-</wsdl-port>
+</wsdl-port>
<stub-property name="jbi-enabled" value="true"/>
</port-info>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
index d6f94af..8d70941 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
@@ -17,7 +17,7 @@
package myejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class InterestEJB implements SessionBean {
private SessionContext sc;
-
+
public InterestEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
+ System.out.println("In InterestEJB::ejbCreate !!");
}
public double calculateInterest(double balance, double period) {
@@ -39,13 +39,13 @@
}
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index a1e9ffa..ac2e5e6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
index c4f6ccb..3df5914 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:FindInterestInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://hello.org/wsdl"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:FindInterestInterface"
service-name="tns:FindInterest"
endpoint-name="InterestIFPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml
index 1acec95..73efb32 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml
index 1610dee..762ce45 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://hello.org/wsdl"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:FindInterestInterface"
+ service-name="tns:FindInterest"
endpoint-name="InterestIFPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml
index 9b0812b..a4da6aa 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
<service-name>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- <local-part>FindInterest</local-part>
+ <namespace-uri>http://hello.org/wsdl</namespace-uri>
+ <local-part>FindInterest</local-part>
</service-name>
<endpoint-name>InterestIFPort</endpoint-name>
<endpoint-role>provider</endpoint-role>
- <address-location>http://localhost:8080/findintr/FindInterest</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/findintr/FindInterest</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>calculateInterest</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://hello.org/wsdl</namespace-uri>
</input>
<output>
<namespace-uri>http://hello.org/wsdl</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
index df6620d..49ed367 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
import jakarta.servlet.SingleThreadModel;
-public class FindInterestServletImpl implements
- SingleThreadModel, ServiceLifecycle {
+public class FindInterestServletImpl implements
+ SingleThreadModel, ServiceLifecycle {
public FindInterestServletImpl() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -44,7 +44,7 @@
}
public double calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint");
- return 0.2*balance*period;
+ System.out.println("calculateInterest invoked from servlet endpoint");
+ return 0.2*balance*period;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml
index 4cfb954..c11b886 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml
index ebff69c..9c318c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myclient"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties
index ed94c05..d7cd8c0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/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="findinterest"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="jbi-component-su-assembly" value="ejb_findinterest_assembly"/>
<property name="jbi-component-su" value="ejb_jaxrpc_consumer_su"/>
<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml
index 486b684..cf9cd0c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml
@@ -37,7 +37,7 @@
<target name="setup" depends="init-common">
<property name="root.dir" value="." />
<property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
+ <property name="appname" value="FindInterestApp" />
<property name="build.dir" value="${env.APS_HOME}/build/module" />
<property name="build.repository" value="${build.dir}/buildears"/>
@@ -56,13 +56,13 @@
<property name="debug" value="on" />
</target>
-
+
<target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
+ <delete dir="${build.dir}"/>
<delete dir="${build.repository}"/>
<delete dir="${build.appclient}"/>
</target>
-
+
<!-- target name="compile" depends="setup,clean" -->
<target name="compile" depends="wscompile,setup" >
<!-- ant target="makedirs"/ -->
@@ -99,8 +99,8 @@
<include name="**/FindInterest_Schema.xsd" />
</fileset>
</jar>
-
- <antcall target="copy-to-webinf" />
+
+ <antcall target="copy-to-webinf" />
<jar jarfile="${build.jars}/web.war" >
<fileset dir="${build.webinf}">
@@ -125,8 +125,8 @@
</fileset>
</jar>
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
+ <jar jarfile="${build.jars}/appclient.jar"
+ manifest="${build.desc}/client/MANIFEST.MF">
<!--
<fileset dir=".">
<include name="FIMappingClient.xml" />
@@ -152,17 +152,17 @@
</target>
<target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myweb/*.class"/>
- </fileset>
- </copy>
+ <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
+ <fileset dir="${build.dest}">
+ <include name="myweb/*.class"/>
+ </fileset>
+ </copy>
</target>
<target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
+ <ear earfile="${build.ear}/${appname}.ear"
+ appxml="${build.desc}/application.xml"
+ manifest="${build.desc}/MANIFEST.MF">
<!--<fileset dir="${build.jars}" includes="*.jar,.war"/>-->
<fileset dir="${build.jars}" includes="*.jar"/>
@@ -172,9 +172,9 @@
</fileset>
</ear>
</target>
-
+
<target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -185,12 +185,12 @@
<arg value="--retrieve" />
<arg value="${build.appclient}" />
<arg value="${build.ear}/${appname}.ear" />
- </exec>
+ </exec>
<antcall target="deploy-jbi-component-su"/>
</target>
-
+
<target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -199,18 +199,18 @@
<arg value="--port" />
<arg value="${admin.port}" />
<arg value="${appname}" />
- </exec>
+ </exec>
<antcall target="undeploy-jbi-component-su"/>
</target>
<target name="runclient" depends="setup">
<exec executable="${APPCLIENT}">
<env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
+ <arg value="-client" />
+ <arg value="${build.appclient}/${appname}Client.jar"/>
+ <arg value="-name" />
+ <arg value="MyAppClient" />
+ </exec>
</target>
<target name="makedirs">
@@ -250,14 +250,14 @@
<include name="*.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor/client" >
<include name="*.xml" />
- <include name="MANIFEST.MF" />
+ <include name="MANIFEST.MF" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor" >
<include name="application.xml" />
@@ -270,7 +270,7 @@
<include name="sun-j2ee-ri.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/ejb" >
<include name="**/*.java" />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java
index e08f586..1537c1a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
public FindInterestClient() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,15 +41,15 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
//String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
+ // "http://localhost:8080/findintr/FindInterest";
String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
+ "http://localhost:12013/InterestIFPort";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -57,23 +57,23 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ interestIFPort.calculateInterest(balance, period);
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+
+ } catch (Exception ex) {
+ status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
+ }
}
/* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -82,22 +82,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ + interest);
+
+ if (interest == 210.0) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+ } catch (Exception ex) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
+ }
+ status.printSummary("JSR109 - FindInterestTest");
}*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java
index ee2f42a..293a5cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,13 +41,13 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
+ "http://localhost:8080/findintr/FindInterest";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -55,23 +55,23 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ interestIFPort.calculateInterest(balance, period);
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+
+ } catch (Exception ex) {
+ status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
+ }
}
/* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -80,22 +80,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ + interest);
+
+ if (interest == 210.0) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+ } catch (Exception ex) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
+ }
+ status.printSummary("JSR109 - FindInterestTest");
}*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java
index fa02d5f..e536ed6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java
@@ -23,19 +23,19 @@
public class SOAPEjbConsumer {
private double balance = 300.00;
private double period = 3.5;
-
+
private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
+
private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
public SOAPEjbConsumer() {
status.addDescription(testId);
}
-
+
public static void main (String[] args) {
-
+
SOAPEjbConsumer client = new SOAPEjbConsumer();
-
+
client.doTest();
status.printSummary(testId);
}
@@ -45,20 +45,20 @@
// "http://localhost:8080/soap/web/findinterest";
String targetEndpointAddress =
"http://localhost:12013/InterestIFPort";
-
+
try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
-
+
InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
+
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
+
interestIFPort.calculateInterest(balance, period);
-
+
status.addStatus(testId + "1 : EJB Endpoint Test", status.PASS);
-
+
} catch (Exception ex) {
status.addStatus(testId + "1 : EJB Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java
index 2b59393..9bbacd5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java
@@ -23,19 +23,19 @@
public class SOAPEjbConsumerNonHttpBC {
private double balance = 300.00;
private double period = 3.5;
-
+
private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
+
private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
public SOAPEjbConsumerNonHttpBC() {
status.addDescription(testId);
}
-
+
public static void main (String[] args) {
-
+
SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
-
+
client.doTest();
status.printSummary(testId);
}
@@ -43,20 +43,20 @@
private void doTest() {
String targetEndpointAddress =
"http://localhost:8080/soap/web/findinterest";
-
+
try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
-
+
InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
+
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- interestIFPort.calculateInterest(balance, period);
-
+
+ interestIFPort.calculateInterest(balance, period);
+
status.addStatus(testId + "1 : EJB Endpoint Test", status.PASS);
-
+
} catch (Exception ex) {
status.addStatus(testId + "1 : EJB Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
index 4d1f19f..42dbc5a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
@@ -17,7 +17,7 @@
package myejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class InterestEJB implements SessionBean {
private SessionContext sc;
-
+
public InterestEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
+ System.out.println("In InterestEJB::ejbCreate !!");
}
public void calculateInterest(double balance, double period) {
@@ -38,13 +38,13 @@
}
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index d16c157..f1b3f7a 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
index f73203b..cd67dfe 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,10 +18,10 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- </services>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://hello.org/wsdl"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
index 67f2288..df397b7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
import jakarta.servlet.SingleThreadModel;
-public class FindInterestServletImpl implements
- SingleThreadModel, ServiceLifecycle {
+public class FindInterestServletImpl implements
+ SingleThreadModel, ServiceLifecycle {
public FindInterestServletImpl() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -44,6 +44,6 @@
}
public void calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint " + (0.2*balance*period));
+ System.out.println("calculateInterest invoked from servlet endpoint " + (0.2*balance*period));
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml
index 4cfb954..c11b886 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml
index ebff69c..9c318c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myclient"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml
index 9d1e12f..e8001cd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myweb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties
index ed94c05..d7cd8c0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/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="findinterest"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="jbi-component-su-assembly" value="ejb_findinterest_assembly"/>
<property name="jbi-component-su" value="ejb_jaxrpc_consumer_su"/>
<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml
index ef9df39..359671c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml
@@ -39,7 +39,7 @@
<target name="setup" depends="init-common">
<property name="root.dir" value="." />
<property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
+ <property name="appname" value="FindInterestApp" />
<property name="build.dir" value="${env.APS_HOME}/build/module" />
<property name="build.repository" value="${build.dir}/buildears"/>
@@ -58,13 +58,13 @@
<property name="debug" value="on" />
</target>
-
+
<target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
+ <delete dir="${build.dir}"/>
<delete dir="${build.repository}"/>
<delete dir="${build.appclient}"/>
</target>
-
+
<!-- target name="compile" depends="setup,clean" -->
<target name="compile" depends="wscompile,setup" >
<!-- ant target="makedirs"/ -->
@@ -101,8 +101,8 @@
<include name="**/FindInterest_Schema.xsd" />
</fileset>
</jar>
-
- <antcall target="copy-to-webinf" />
+
+ <antcall target="copy-to-webinf" />
<jar jarfile="${build.jars}/web.war" >
<fileset dir="${build.webinf}">
@@ -127,8 +127,8 @@
</fileset>
</jar>
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
+ <jar jarfile="${build.jars}/appclient.jar"
+ manifest="${build.desc}/client/MANIFEST.MF">
<!--
<fileset dir=".">
<include name="FIMappingClient.xml" />
@@ -154,17 +154,17 @@
</target>
<target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myweb/*.class"/>
- </fileset>
- </copy>
+ <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
+ <fileset dir="${build.dest}">
+ <include name="myweb/*.class"/>
+ </fileset>
+ </copy>
</target>
<target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
+ <ear earfile="${build.ear}/${appname}.ear"
+ appxml="${build.desc}/application.xml"
+ manifest="${build.desc}/MANIFEST.MF">
<!--<fileset dir="${build.jars}" includes="*.jar,.war"/>-->
<fileset dir="${build.jars}" includes="*.jar"/>
@@ -174,9 +174,9 @@
</fileset>
</ear>
</target>
-
+
<target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -187,12 +187,12 @@
<arg value="--retrieve" />
<arg value="${build.appclient}" />
<arg value="${build.ear}/${appname}.ear" />
- </exec>
+ </exec>
<antcall target="deploy-jbi-component-su"/>
</target>
-
+
<target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -201,18 +201,18 @@
<arg value="--port" />
<arg value="${admin.port}" />
<arg value="${appname}" />
- </exec>
+ </exec>
<antcall target="undeploy-jbi-component-su"/>
</target>
<target name="runclient" depends="setup">
<exec executable="${APPCLIENT}">
<env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
+ <arg value="-client" />
+ <arg value="${build.appclient}/${appname}Client.jar"/>
+ <arg value="-name" />
+ <arg value="MyAppClient" />
+ </exec>
</target>
<target name="makedirs">
@@ -252,14 +252,14 @@
<include name="*.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor/client" >
<include name="*.xml" />
- <include name="MANIFEST.MF" />
+ <include name="MANIFEST.MF" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor" >
<include name="application.xml" />
@@ -272,7 +272,7 @@
<include name="sun-j2ee-ri.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/ejb" >
<include name="**/*.java" />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java
index c73a5d0..559eb3e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider";
public FindInterestClient() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,15 +41,15 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
//String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
+ // "http://localhost:8080/findintr/FindInterest";
String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
+ "http://localhost:12013/InterestIFPort";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -57,27 +57,27 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
+ + interest);
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ if (interest == 105.0) {
+ status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+
+ } catch (Exception ex) {
+ status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
+ }
}
/* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -86,22 +86,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ + interest);
+
+ if (interest == 210.0) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+ } catch (Exception ex) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
+ }
+ status.printSummary("JSR109 - FindInterestTest");
}*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java
index 8b9660c..c4e6df0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider";
public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,13 +41,13 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
+ "http://localhost:8080/findintr/FindInterest";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -55,27 +55,27 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
+ + interest);
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ if (interest == 105.0) {
+ status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+
+ } catch (Exception ex) {
+ status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
+ }
}
/* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -84,22 +84,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ double interest = interestIFPort.calculateInterest(balance, period);
System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ + interest);
+
+ if (interest == 210.0) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ }
+ } catch (Exception ex) {
+ status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
+ }
+ status.printSummary("JSR109 - FindInterestTest");
}*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java
index e123fea..d26175a 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java
@@ -23,19 +23,19 @@
public class SOAPEjbConsumer {
private double balance = 300.00;
private double period = 3.5;
-
+
private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
+
private static String testId = "jbi-serviceengine/jax-rpc/provider";
public SOAPEjbConsumer() {
status.addDescription(testId);
}
-
+
public static void main (String[] args) {
-
+
SOAPEjbConsumer client = new SOAPEjbConsumer();
-
+
client.doTest();
status.printSummary(testId);
}
@@ -45,23 +45,23 @@
// "http://localhost:8080/soap/web/findinterest";
String targetEndpointAddress =
"http://localhost:12013/InterestIFPort";
-
+
try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
-
+
InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
+
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
+
double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
+ interest);
-
+
if (interest == 105.0) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
}
-
+
} catch (Exception ex) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java
index 52ddb6f..a32d4ef 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java
@@ -23,19 +23,19 @@
public class SOAPEjbConsumerNonHttpBC {
private double balance = 300.00;
private double period = 3.5;
-
+
private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
+
private static String testId = "jbi-serviceengine/jax-rpc/provider";
public SOAPEjbConsumerNonHttpBC() {
status.addDescription(testId);
}
-
+
public static void main (String[] args) {
-
+
SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
-
+
client.doTest();
status.printSummary(testId);
}
@@ -43,23 +43,23 @@
private void doTest() {
String targetEndpointAddress =
"http://localhost:8080/soap/web/findinterest";
-
+
try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
-
+
InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
+
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
+
double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
+ interest);
-
+
if (interest == 105.0) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
}
-
+
} catch (Exception ex) {
status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
System.out.println("findintr client failed");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
index d6f94af..8d70941 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
@@ -17,7 +17,7 @@
package myejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class InterestEJB implements SessionBean {
private SessionContext sc;
-
+
public InterestEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
+ System.out.println("In InterestEJB::ejbCreate !!");
}
public double calculateInterest(double balance, double period) {
@@ -39,13 +39,13 @@
}
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index d16c157..f1b3f7a 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml
index e08915c..bee67a9 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://hello.org/wsdl"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:FindInterestInterface"
service-name="tns:FindInterest"
endpoint-name="InterestIFPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml
index fcc0007..3891d55 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml
index 1610dee..762ce45 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://hello.org/wsdl"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:FindInterestInterface"
+ service-name="tns:FindInterest"
endpoint-name="InterestIFPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml
index 0a7869d..2a2654d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
<service-name>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- <local-part>FindInterest</local-part>
+ <namespace-uri>http://hello.org/wsdl</namespace-uri>
+ <local-part>FindInterest</local-part>
</service-name>
<endpoint-name>InterestIFPort</endpoint-name>
<endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/web/findinterest</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/soap/web/findinterest</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>calculateInterest</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://hello.org/wsdl</namespace-uri>
</input>
<output>
<namespace-uri>http://hello.org/wsdl</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
index df6620d..49ed367 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
import jakarta.servlet.SingleThreadModel;
-public class FindInterestServletImpl implements
- SingleThreadModel, ServiceLifecycle {
+public class FindInterestServletImpl implements
+ SingleThreadModel, ServiceLifecycle {
public FindInterestServletImpl() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -44,7 +44,7 @@
}
public double calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint");
- return 0.2*balance*period;
+ System.out.println("calculateInterest invoked from servlet endpoint");
+ return 0.2*balance*period;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml
index 4cfb954..c11b886 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml
index ebff69c..9c318c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myclient"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml
index 9d1e12f..e8001cd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myweb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml
index 02e8c57..f33335c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml
@@ -30,7 +30,7 @@
<target name="deploy-service-assembly" depends="init-common">
<property name="base-dir" value="."/>
<property name="temp" value="${base-dir}/temp" />
- <property name="su-dir" value="${base-dir}/${jbi-component-su-dir}"/>
+ <property name="su-dir" value="${base-dir}/${jbi-component-su-dir}"/>
<mkdir dir="${temp}"/>
<jar basedir="${su-dir}/su" destfile="${temp}/${jbi-component-su}.jar"/>
<copy todir="${temp}">
@@ -50,7 +50,7 @@
<antcall target="shut-down-service-assembly"/>
<antcall target="undeploy-service-assembly"/>
</target>
-
+
<target name="stop-service-assembly" depends="init-common">
<ant dir="${jbi-installation}/bin" antfile="${jbi-installation}/bin/jbi_admin.xml" target=
"stop-service-assembly">
@@ -92,12 +92,12 @@
</ant>
</target>
- <!--
- Arguments to this target are-
- appName - application name
- wsName - web service name
- module - ejb-module|web-module|j2ee-application.ejb-module|j2ee-application.web-module
- flag - true|false
+ <!--
+ Arguments to this target are-
+ appName - application name
+ wsName - web service name
+ module - ejb-module|web-module|j2ee-application.ejb-module|j2ee-application.web-module
+ flag - true|false
-->
<target name="set-jbi-enabled" depends="init-common">
<antcall target="asadmin-common">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties
index 579dec6..5ed0eb7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/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="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml
index a2e7360..1bfc164 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/OneWayService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -109,11 +109,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java
index d7662ef..da7cc17 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/oneway";
+ private static String testId = "jbi-serviceengine/oneway";
public boolean found1 = false;
public static void main (String[] args) {
@@ -44,12 +44,12 @@
String url = args[0];
try {
- //for(int i=0; i<100; i++) {
+ //for(int i=0; i<100; i++) {
int code = invokeServlet(url);
report(code);
- //}
- } catch (Exception e) {
- fail();
+ //}
+ } catch (Exception e) {
+ fail();
}
}
@@ -65,7 +65,7 @@
log(line);
//if(line.indexOf("Exception thrown Successfully") != -1)
if(line.indexOf("Endpoint is invoked successfully") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java
index f09b38b..082b475 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java
@@ -26,20 +26,20 @@
targetNamespace="http://example.web.service/OneWay"
)
public class OneWay {
- public OneWay() {}
+ public OneWay() {}
- @WebMethod(operationName="subtract", action="urn:Subtract")
- @Oneway
- public void subtract(int i, int j) {
- System.out.println("*** Inside subtract("+i+", "+j+")");
+ @WebMethod(operationName="subtract", action="urn:Subtract")
+ @Oneway
+ public void subtract(int i, int j) {
+ System.out.println("*** Inside subtract("+i+", "+j+")");
int k = i -j ;
- if(i == 101)
- throw new RuntimeException("This is my exception in subtract ...");
- }
+ if(i == 101)
+ throw new RuntimeException("This is my exception in subtract ...");
+ }
- @WebMethod(operationName="sayHi", action="urn:SayHi")
- @Oneway
- public void sayHi() {
+ @WebMethod(operationName="sayHi", action="urn:SayHi")
+ @Oneway
+ public void sayHi() {
System.out.println("*** Hi from OneWay");
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 9587376..e35e148 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
index 5350f5e..c33f165 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/OneWay"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:OneWayServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/OneWay"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:OneWayServiceInterface"
service-name="tns:OneWayService"
endpoint-name="OneWayPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml
index 226f654..c08901f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the OneWay Service</description>
- <display-name>OneWayWAR</display-name>
+ <description>WebTier for the OneWay Service</description>
+ <display-name>OneWayWAR</display-name>
- <servlet>
- <description>Endpoint for OneWay Web Service</description>
- <display-name>OneWayWebService</display-name>
- <servlet-name>OneWay</servlet-name>
- <servlet-class>endpoint.OneWay</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for OneWay Web Service</description>
+ <display-name>OneWayWebService</display-name>
+ <servlet-name>OneWay</servlet-name>
+ <servlet-class>endpoint.OneWay</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>OneWay</servlet-name>
- <url-pattern>/webservice/OneWayService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>OneWay</servlet-name>
+ <url-pattern>/webservice/OneWayService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
index 1e8b6aa..1413f8e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
@@ -27,40 +27,40 @@
public class Client extends HttpServlet {
@WebServiceRef(name="sun-web.serviceref/oneway") OneWayService service;
- //static OneWay port;
+ //static OneWay port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
OneWay port = service.getOneWayPort();
- //if (port == null) port = service.getOneWayPort();
+ //if (port == null) port = service.getOneWayPort();
System.out.println("port is : " + port);
port.subtract(101, 2);
port.sayHi();
- printSuccess(out);
+ printSuccess(out);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- printFailure(out);
+ e.printStackTrace();
+ printFailure(out);
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -73,7 +73,7 @@
}
public void printSuccess(PrintWriter out) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties
index 91ad899..f18d2da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/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="rpc-literal-bundled-wsdl-bc-consumer-se-provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml
index 2e56421..d5fe041 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml
@@ -34,11 +34,11 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest,undeploy"/>
+ <target name="all" depends="clean, setup, runtest,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete dir="common:endpoint"/>
+ <delete dir="common:endpoint"/>
</target>
<target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
@@ -54,16 +54,16 @@
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- Add the WSDL -->
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
- <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
- </fileset>
- </jar>
+ <!-- Add the WSDL -->
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
+ <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
+ </fileset>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java
index f9d5e69..c5dd990 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/bundled-wsdl";
+ private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/bundled-wsdl";
public static void main(String[] args) {
stat.addDescription(testId);
@@ -38,29 +38,29 @@
client.addUsingSOAPConsumer();
stat.printSummary(testId);
}
-
+
private void addUsingSOAPConsumer() {
Calculator port= null;
try {
-
+
System.out.println(" After creating CalculatorService");
-
+
port = service.getCalculatorPort();
System.out.println(" After getting port");
-
+
// Get Stub
BindingProvider stub = (BindingProvider)port;
String endpointURI ="http://localhost:12011/calculatorendpoint";
stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
endpointURI);
System.out.println(" After setting endpoint address URI");
-
+
IncomeTaxDetails itDetails = new IncomeTaxDetails();
itDetails.setFirstName( "bhavani");
itDetails.setLastName("s");
itDetails.setAnnualIncome( 400000);
itDetails.setStatus("salaried");
-
+
long startTime = System.currentTimeMillis();
long ret = 0;
// Make 100 calls to see how much time it takes.
@@ -78,37 +78,37 @@
);
//}
long timeTaken = System.currentTimeMillis() - startTime;
-
+
//int ret = port.add(1, 2);
printSuccess("Your income tax is : Rs ", ret, timeTaken);
startTime = System.currentTimeMillis();
int k = port.add(505, 50);
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Sum of 505 and 50 is : ", k, timeTaken);
-
+
startTime = System.currentTimeMillis();
String hi = port.sayHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Output from webservice : ", hi, timeTaken);
-
- /*
+
+ /*
startTime = System.currentTimeMillis();
port.printHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi in server.log", timeTaken);
-
+
startTime = System.currentTimeMillis();
port.printHiToMe("JavaEEServiceEngine");
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi to me in server.log", timeTaken);
*/
stat.addStatus(testId, stat.PASS);
-
+
} catch(java.lang.Exception e) {
stat.addStatus(testId, stat.FAIL);
}
}
-
+
public void printFailure(String errMsg) {
System.out.println("<html>");
System.out.println("<head>");
@@ -121,17 +121,17 @@
System.out.println("</body>");
System.out.println("</html>");
}
-
+
public void printSuccess(String message, long result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
public void printSuccess(String message, String result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java
index 69c9acc..55b94c6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java
@@ -29,12 +29,12 @@
wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
)
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
-
+
public class Calculator {
-
+
public static final String testName = "\nTest :: rpc-literal-bundled-wsdl-bc-consumer-se-provider : ";
public Calculator() {}
-
+
@WebMethod(operationName="add", action="urn:Add")
public int add(
@WebParam(name = "int_1", partName = "int_1") int i,
@@ -44,7 +44,7 @@
System.out.println(testName + i + "+" + j +" = " + k);
return k;
}
-
+
@WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
public long calculateIncomeTax(IncomeTaxDetails details
, IncomeTaxDetails details2
@@ -64,18 +64,18 @@
System.out.println(testName +"Tax to be paid = " + taxToBePaid);
return taxToBePaid;
}
-
+
@WebMethod(operationName="sayHi", action="urn:SayHi")
public String sayHi() {
return testName + "Hi from sayHi()";
}
-
+
@WebMethod(operationName="printHi", action="urn:PrintHi")
@Oneway
public void printHi() {
System.out.println(testName +"Hi from printHi()");
}
-
+
@WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
@Oneway
public void printHiToMe(String name) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml
index 81c5309..cf35496 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties
index 1060c7a..b13fb09 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/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="rpc-literal-bundled-wsdl-bc-consumer-se-provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml
index 2d4c393..e0bba4d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml
@@ -34,11 +34,11 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest,undeploy"/>
+ <target name="all" depends="clean, setup, runtest,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete dir="common:endpoint"/>
+ <delete dir="common:endpoint"/>
</target>
<target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
@@ -54,18 +54,18 @@
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- Add the WSDL -->
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/MessageTypes.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
- <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
- <include name="WEB-INF/wsdl/MessageTypes.wsdl"/>
- </fileset>
- </jar>
+ <!-- Add the WSDL -->
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/MessageTypes.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
+ <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
+ <include name="WEB-INF/wsdl/MessageTypes.wsdl"/>
+ </fileset>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java
index c54716f..dab0d2e 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/wsdl-import";
+ private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/wsdl-import";
public static void main(String[] args) {
stat.addDescription(testId);
@@ -38,29 +38,29 @@
client.addUsingSOAPConsumer();
stat.printSummary(testId);
}
-
+
private void addUsingSOAPConsumer() {
Calculator port= null;
try {
-
+
System.out.println(" After creating CalculatorService");
-
+
port = service.getCalculatorPort();
System.out.println(" After getting port");
-
+
// Get Stub
BindingProvider stub = (BindingProvider)port;
String endpointURI ="http://localhost:12011/calculatorendpoint";
stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
endpointURI);
System.out.println(" After setting endpoint address URI");
-
+
IncomeTaxDetails itDetails = new IncomeTaxDetails();
itDetails.setFirstName( "bhavani");
itDetails.setLastName("s");
itDetails.setAnnualIncome( 400000);
itDetails.setStatus("salaried");
-
+
long startTime = System.currentTimeMillis();
long ret = 0;
// Make 100 calls to see how much time it takes.
@@ -78,37 +78,37 @@
);
//}
long timeTaken = System.currentTimeMillis() - startTime;
-
+
//int ret = port.add(1, 2);
printSuccess("Your income tax is : Rs ", ret, timeTaken);
startTime = System.currentTimeMillis();
int k = port.add(505, 50);
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Sum of 505 and 50 is : ", k, timeTaken);
-
+
startTime = System.currentTimeMillis();
String hi = port.sayHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Output from webservice : ", hi, timeTaken);
-
- /*
+
+ /*
startTime = System.currentTimeMillis();
port.printHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi in server.log", timeTaken);
-
+
startTime = System.currentTimeMillis();
port.printHiToMe("JavaEEServiceEngine");
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi to me in server.log", timeTaken);
*/
stat.addStatus(testId, stat.PASS);
-
+
} catch(java.lang.Exception e) {
stat.addStatus(testId, stat.FAIL);
}
}
-
+
public void printFailure(String errMsg) {
System.out.println("<html>");
System.out.println("<head>");
@@ -121,17 +121,17 @@
System.out.println("</body>");
System.out.println("</html>");
}
-
+
public void printSuccess(String message, long result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
public void printSuccess(String message, String result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java
index 69c9acc..55b94c6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java
@@ -29,12 +29,12 @@
wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
)
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
-
+
public class Calculator {
-
+
public static final String testName = "\nTest :: rpc-literal-bundled-wsdl-bc-consumer-se-provider : ";
public Calculator() {}
-
+
@WebMethod(operationName="add", action="urn:Add")
public int add(
@WebParam(name = "int_1", partName = "int_1") int i,
@@ -44,7 +44,7 @@
System.out.println(testName + i + "+" + j +" = " + k);
return k;
}
-
+
@WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
public long calculateIncomeTax(IncomeTaxDetails details
, IncomeTaxDetails details2
@@ -64,18 +64,18 @@
System.out.println(testName +"Tax to be paid = " + taxToBePaid);
return taxToBePaid;
}
-
+
@WebMethod(operationName="sayHi", action="urn:SayHi")
public String sayHi() {
return testName + "Hi from sayHi()";
}
-
+
@WebMethod(operationName="printHi", action="urn:PrintHi")
@Oneway
public void printHi() {
System.out.println(testName +"Hi from printHi()");
}
-
+
@WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
@Oneway
public void printHiToMe(String name) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml
index 81c5309..cf35496 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml
index 90d05e9..a7b7e91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml
@@ -25,7 +25,7 @@
<target name="all">
<ant dir="se_consumer_se_provider/generated_wsdl" target="all"/>
<ant dir="se_consumer_se_provider/bundled_wsdl" target="all"/>
- <ant dir="bc_consumer_sc_provider/wsdl-import" target="all"/>
- <ant dir="bc_consumer_sc_provider/bundled-wsdl" target="all"/>
+ <ant dir="bc_consumer_sc_provider/wsdl-import" target="all"/>
+ <ant dir="bc_consumer_sc_provider/bundled-wsdl" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties
index 849c555..d7953f6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/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="rpc-literal-bundled-wsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml
index 87c424a..df83aaf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml
@@ -38,9 +38,9 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <delete file="${basedir}/RepRunConf.txt"/>
+ <delete dir="${basedir}/common:endpoint"/>
</target>
<target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
@@ -52,35 +52,35 @@
</target>
<target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
+ <echo message="classes dir = ${build.classes.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
<antcall target="pkg-war">
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml"/>
+ </fileset>
+ </jar>
- <!-- Add the WSDL -->
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
- <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
- </fileset>
- </jar>
+ <!-- Add the WSDL -->
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
+ <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
+ </fileset>
+ </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
</target>
<target name="assemble-client" depends="init-common">
@@ -92,7 +92,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
includes="common/**,webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -131,11 +131,11 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="common/**,client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java
index 4296a7f..628253f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/bundled_wsdl";
+ private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/bundled_wsdl";
public static void main (String[] args) {
@@ -46,8 +46,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -58,15 +58,15 @@
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer();
String line = null;
- boolean found = false;
+ boolean found = false;
while ((line = input.readLine()) != null) {
- if(line.indexOf("SUCCESS") != -1) found = true;
- buffer.append(line + "\n");
+ if(line.indexOf("SUCCESS") != -1) found = true;
+ buffer.append(line + "\n");
}
log(buffer.toString());
- if(!found) return 505;
+ if(!found) return 505;
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java
index 238dfd8..b4bc8a3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java
@@ -26,15 +26,15 @@
name="Calculator",
serviceName="CalculatorService",
targetNamespace="http://example.web.service/Calculator",
- wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
+ wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
)
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
public class Calculator {
- public static final String testName = "\nTest :: rpc-literal-bundled-wsdl : ";
+ public static final String testName = "\nTest :: rpc-literal-bundled-wsdl : ";
public Calculator() {}
-
+
@WebMethod(operationName="add", action="urn:Add")
public int add(
@WebParam(name = "int_1", partName = "int_1") int i,
@@ -45,38 +45,38 @@
return k;
}
- @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
- public long calculateIncomeTax(IncomeTaxDetails details
- , IncomeTaxDetails details2
- , IncomeTaxDetails details3
- , IncomeTaxDetails details4
- , IncomeTaxDetails details5
- , IncomeTaxDetails details6
- , IncomeTaxDetails details7
- , IncomeTaxDetails details8
- , IncomeTaxDetails details9
- , IncomeTaxDetails details10
- ) {
- long income = details.annualIncome;
- System.out.println(testName + "Annual income = " + income);
- long taxRate = 30; // 30%
- long taxToBePaid = income / taxRate;
- System.out.println(testName +"Tax to be paid = " + taxToBePaid);
- return taxToBePaid;
- }
+ @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
+ public long calculateIncomeTax(IncomeTaxDetails details
+ , IncomeTaxDetails details2
+ , IncomeTaxDetails details3
+ , IncomeTaxDetails details4
+ , IncomeTaxDetails details5
+ , IncomeTaxDetails details6
+ , IncomeTaxDetails details7
+ , IncomeTaxDetails details8
+ , IncomeTaxDetails details9
+ , IncomeTaxDetails details10
+ ) {
+ long income = details.annualIncome;
+ System.out.println(testName + "Annual income = " + income);
+ long taxRate = 30; // 30%
+ long taxToBePaid = income / taxRate;
+ System.out.println(testName +"Tax to be paid = " + taxToBePaid);
+ return taxToBePaid;
+ }
- @WebMethod(operationName="sayHi", action="urn:SayHi")
- public String sayHi() {
- return testName + "Hi from sayHi()";
- }
+ @WebMethod(operationName="sayHi", action="urn:SayHi")
+ public String sayHi() {
+ return testName + "Hi from sayHi()";
+ }
- @WebMethod(operationName="printHi", action="urn:PrintHi")
- public void printHi() {
- System.out.println(testName +"Hi from printHi()");
- }
+ @WebMethod(operationName="printHi", action="urn:PrintHi")
+ public void printHi() {
+ System.out.println(testName +"Hi from printHi()");
+ }
- @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
- public void printHiToMe(String name) {
- System.out.println(testName +"Hi to " + name + " from printHiToMe()");
- }
+ @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
+ public void printHiToMe(String name) {
+ System.out.println(testName +"Hi to " + name + " from printHiToMe()");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml
index 1c0872c..8d3678f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml
@@ -19,16 +19,16 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
<name>rpc-literal-bundled-wsdl-se-consumer-se-provider</name>
<description>Client web calculator service assembly</description>
</identification>
- <service-unit>
+ <service-unit>
<identification>
<name>rpc-literal-bundled-wsdl</name>
<description>provider service</description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml
index 9a201a0..9e11499 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
index 89c6f62..f935575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
@@ -30,79 +30,79 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
- IncomeTaxDetails itDetails = new IncomeTaxDetails();
- itDetails.setFirstName ( "bhavani");
- itDetails.setLastName ("s");
- itDetails.setAnnualIncome ( 400000);
- itDetails.setStatus ("salaried");
+ IncomeTaxDetails itDetails = new IncomeTaxDetails();
+ itDetails.setFirstName ( "bhavani");
+ itDetails.setLastName ("s");
+ itDetails.setAnnualIncome ( 400000);
+ itDetails.setStatus ("salaried");
- long startTime = System.currentTimeMillis();
- long ret = 0;
- // Make 100 calls to see how much time it takes.
- //for(int i=0; i<1000; i++) {
- ret = port.calculateIncomeTax(itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- );
- //}
- long timeTaken = System.currentTimeMillis() - startTime;
-
+ long startTime = System.currentTimeMillis();
+ long ret = 0;
+ // Make 100 calls to see how much time it takes.
+ //for(int i=0; i<1000; i++) {
+ ret = port.calculateIncomeTax(itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ );
+ //}
+ long timeTaken = System.currentTimeMillis() - startTime;
+
//int ret = port.add(1, 2);
- printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
- startTime = System.currentTimeMillis();
- int k = port.add(505, 50);
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
+ printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
+ startTime = System.currentTimeMillis();
+ int k = port.add(505, 50);
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
- startTime = System.currentTimeMillis();
- String hi = port.sayHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Output from webservice : ", out, hi, timeTaken);
+ startTime = System.currentTimeMillis();
+ String hi = port.sayHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Output from webservice : ", out, hi, timeTaken);
- startTime = System.currentTimeMillis();
- port.printHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
- startTime = System.currentTimeMillis();
- port.printHiToMe("JavaEEServiceEngine");
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHiToMe("JavaEEServiceEngine");
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -115,14 +115,14 @@
}
public void printSuccess(String message, PrintWriter out, long result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
public void printSuccess(String message, PrintWriter out, String result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties
index 198c549..c2b65de 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/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="rpc-literal-generated-wsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml
index 0c682b8..3fa5407 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml
@@ -38,9 +38,9 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <delete file="${basedir}/RepRunConf.txt"/>
+ <delete dir="${basedir}/common:endpoint"/>
</target>
<target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client"/>
@@ -52,8 +52,8 @@
</target>
<target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
+ <echo message="classes dir = ${build.classes.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
<antcall target="pkg-war">
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
@@ -69,7 +69,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
includes="common/**, webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -125,11 +125,11 @@
<antcall target="undeploy-client"/>
<antcall target="undeploy-app"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="common/**, client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java
index a94c08e..b31b71e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/generated_wsdl";
+ private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/generated_wsdl";
public static void main (String[] args) {
stat.addDescription(testId);
@@ -45,8 +45,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -57,15 +57,15 @@
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer();
String line = null;
- boolean found = false;
+ boolean found = false;
while ((line = input.readLine()) != null) {
- if(line.indexOf("SUCCESS") != -1) found = true;
- buffer.append(line + "\n");
+ if(line.indexOf("SUCCESS") != -1) found = true;
+ buffer.append(line + "\n");
}
log(buffer.toString());
- if(!found) return 505;
+ if(!found) return 505;
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java
index 1c414ca..e0f2a44 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java
@@ -31,49 +31,49 @@
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
public class Calculator {
- public static final String testName = "\nTest :: rpc-literal-generated-wsdl : ";
- public Calculator() {}
+ public static final String testName = "\nTest :: rpc-literal-generated-wsdl : ";
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(testName + i + "+" + j +" = " + k);
- //throw new java.lang.Exception("This is my exception");
- return k;
- }
+ //throw new java.lang.Exception("This is my exception");
+ return k;
+ }
- @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
- public long calculateIncomeTax(IncomeTaxDetails details
- , IncomeTaxDetails details2
- , IncomeTaxDetails details3
- , IncomeTaxDetails details4
- , IncomeTaxDetails details5
- , IncomeTaxDetails details6
- , IncomeTaxDetails details7
- , IncomeTaxDetails details8
- , IncomeTaxDetails details9
- , IncomeTaxDetails details10
- ) {
- long income = details.annualIncome;
- System.out.println(testName + "Annual income = " + income);
- long taxRate = 30; // 30%
- long taxToBePaid = income / taxRate;
- System.out.println(testName +"Tax to be paid = " + taxToBePaid);
- return taxToBePaid;
- }
+ @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
+ public long calculateIncomeTax(IncomeTaxDetails details
+ , IncomeTaxDetails details2
+ , IncomeTaxDetails details3
+ , IncomeTaxDetails details4
+ , IncomeTaxDetails details5
+ , IncomeTaxDetails details6
+ , IncomeTaxDetails details7
+ , IncomeTaxDetails details8
+ , IncomeTaxDetails details9
+ , IncomeTaxDetails details10
+ ) {
+ long income = details.annualIncome;
+ System.out.println(testName + "Annual income = " + income);
+ long taxRate = 30; // 30%
+ long taxToBePaid = income / taxRate;
+ System.out.println(testName +"Tax to be paid = " + taxToBePaid);
+ return taxToBePaid;
+ }
- @WebMethod(operationName="sayHi", action="urn:SayHi")
- public String sayHi() {
- return testName + "Hi from sayHi()";
- }
+ @WebMethod(operationName="sayHi", action="urn:SayHi")
+ public String sayHi() {
+ return testName + "Hi from sayHi()";
+ }
- @WebMethod(operationName="printHi", action="urn:PrintHi")
- public void printHi() {
- System.out.println(testName +"Hi from printHi()");
- }
+ @WebMethod(operationName="printHi", action="urn:PrintHi")
+ public void printHi() {
+ System.out.println(testName +"Hi from printHi()");
+ }
- @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
- public void printHiToMe(String name) {
- System.out.println(testName +"Hi to " + name + " from printHiToMe()");
- }
+ @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
+ public void printHiToMe(String name) {
+ System.out.println(testName +"Hi to " + name + " from printHiToMe()");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
index 89c6f62..f935575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
@@ -30,79 +30,79 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
- IncomeTaxDetails itDetails = new IncomeTaxDetails();
- itDetails.setFirstName ( "bhavani");
- itDetails.setLastName ("s");
- itDetails.setAnnualIncome ( 400000);
- itDetails.setStatus ("salaried");
+ IncomeTaxDetails itDetails = new IncomeTaxDetails();
+ itDetails.setFirstName ( "bhavani");
+ itDetails.setLastName ("s");
+ itDetails.setAnnualIncome ( 400000);
+ itDetails.setStatus ("salaried");
- long startTime = System.currentTimeMillis();
- long ret = 0;
- // Make 100 calls to see how much time it takes.
- //for(int i=0; i<1000; i++) {
- ret = port.calculateIncomeTax(itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- );
- //}
- long timeTaken = System.currentTimeMillis() - startTime;
-
+ long startTime = System.currentTimeMillis();
+ long ret = 0;
+ // Make 100 calls to see how much time it takes.
+ //for(int i=0; i<1000; i++) {
+ ret = port.calculateIncomeTax(itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ );
+ //}
+ long timeTaken = System.currentTimeMillis() - startTime;
+
//int ret = port.add(1, 2);
- printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
- startTime = System.currentTimeMillis();
- int k = port.add(505, 50);
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
+ printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
+ startTime = System.currentTimeMillis();
+ int k = port.add(505, 50);
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
- startTime = System.currentTimeMillis();
- String hi = port.sayHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Output from webservice : ", out, hi, timeTaken);
+ startTime = System.currentTimeMillis();
+ String hi = port.sayHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Output from webservice : ", out, hi, timeTaken);
- startTime = System.currentTimeMillis();
- port.printHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
- startTime = System.currentTimeMillis();
- port.printHiToMe("JavaEEServiceEngine");
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHiToMe("JavaEEServiceEngine");
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -115,14 +115,14 @@
}
public void printSuccess(String message, PrintWriter out, long result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
public void printSuccess(String message, PrintWriter out, String result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties
index 04aed80..5aed126 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/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="secured-ejbWS"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml
index 31f24a7..ea9bfa2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml
@@ -50,15 +50,15 @@
<target name="create-user" depends="init-common">
<antcall target="create-user-common">
- <param name="user" value="${fileUser}"/>
- <param name="password" value="${fileUserPassword}"/>
- <param name="groups" value="${fileUserGroups}"/>
+ <param name="user" value="${fileUser}"/>
+ <param name="password" value="${fileUserPassword}"/>
+ <param name="groups" value="${fileUserGroups}"/>
</antcall>
</target>
<target name="delete-user" depends="init-common">
<antcall target="delete-user-common">
- <param name="user" value="${fileUser}"/>
+ <param name="user" value="${fileUser}"/>
</antcall>
</target>
@@ -107,10 +107,10 @@
<param name="contextroot" value="${appname}"/>
</antcall>
<antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
+ <param name="appName" value="${appname}-ejb"/>
+ <param name="wsName" value="HelloEJB"/>
+ <param name="module" value="ejb-module"/>
+ <param name="flag" value="true"/>
</antcall>
</target>
@@ -118,7 +118,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -145,8 +145,8 @@
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
@@ -154,7 +154,7 @@
<pathelement path="${build.classes.dir}/client"/>
</classpath>
<arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- <arg value="${fileUser}:${fileUserPassword}"/>
+ <arg value="${fileUser}:${fileUserPassword}"/>
</java>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml
index 6327b13..4f0f66a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml
@@ -29,15 +29,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml
index 1d1f3fe..8e2c646 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java
index 086ff49..c1732e8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url,passwd);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -57,9 +57,9 @@
private int invokeServlet(String url, String userPassword) throws Exception {
log("Invoking url = " + url+", password = " + userPassword);
URL u = new URL(url);
- String encoding = new sun.misc.BASE64Encoder().encode (userPassword.getBytes());
+ String encoding = new sun.misc.BASE64Encoder().encode (userPassword.getBytes());
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- c1.setRequestProperty ("Authorization", "Basic " + encoding);
+ c1.setRequestProperty ("Authorization", "Basic " + encoding);
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
@@ -67,9 +67,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[JBI-SecurityTest PrincipalSent=user PrincipalGot=user]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
index 140281c..f6f5b04 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
@@ -30,10 +30,10 @@
@Resource private SessionContext ctx;
public String sayHello(String who) {
- System.out.println("**** sayHello("+ who+")");
- Principal p = ctx.getCallerPrincipal();
- String principal = (p == null)? "NULL": p.toString();
- System.out.println("****EJB: principal = " + principal);
+ System.out.println("**** sayHello("+ who+")");
+ Principal p = ctx.getCallerPrincipal();
+ String principal = (p == null)? "NULL": p.toString();
+ System.out.println("****EJB: principal = " + principal);
return "JBI-SecurityTest " + who + " PrincipalGot="+principal;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
index 86fa3e4..2ac21cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
@@ -38,13 +38,13 @@
throws jakarta.servlet.ServletException {
try {
Principal p = req.getUserPrincipal();
- String principal = (p==null)? "NULL": p.toString();
+ String principal = (p==null)? "NULL": p.toString();
System.out.println("****Servlet: principal = " + principal);
Hello port = service.getHelloEJBPort();
- String ret = port.sayHello("PrincipalSent="+principal);
+ String ret = port.sayHello("PrincipalSent="+principal);
System.out.println("Return value from webservice:"+ret);
-
+
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml
index 475b1f4..0cb86b0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml
@@ -25,6 +25,6 @@
<target name="all">
<ant dir="web" target="all"/>
- <ant dir="ejb" target="all"/>
+ <ant dir="ejb" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml
index 2e76fc1..3eaeea3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml
@@ -21,6 +21,6 @@
]>
<project name="jsr108-integration tests" default="all" basedir=".">
<target name="all">
- <ant dir="hello" target="all"/>
+ <ant dir="hello" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties
index eb742fe..bc96034 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="jbi-component-su-assembly" value="ejb_noname_HiEJB_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml
index 5df479e..d3c4062 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml
@@ -42,7 +42,7 @@
<target name="my-wsdl-import">
<antcall target="wsdl-import">
<param name="server" value="${server}"/>
- <param name="port" value="HiEJB"/>
+ <param name="port" value="HiEJB"/>
</antcall>
</target>
@@ -52,6 +52,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java
index dbe07ce..f21e9f5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/jaxws")
public interface Hi {
- public String sayHi(String who);
+ public String sayHi(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
index f9801bb..03532ad 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
@@ -24,7 +24,7 @@
public class HiEJB implements Hi {
public String sayHi(String who) {
- System.out.println("In EJB2");
+ System.out.println("In EJB2");
return "WebSvcTest-Hi" + who;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 45ec233..399e3b7 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml
index c3bc41f..9306af5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://endpoint/jaxws"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://endpoint/jaxws"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
<consumes interface-name="tns:HiEJBServiceInterface"
service-name="tns:HiEJBService"
endpoint-name="HiEJBPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties
index 69d2ca1..0740662 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/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="subtractorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml
index 3aab8b5..0f9676e 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml
@@ -75,7 +75,7 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-jbi-component-su"/>
</target>
-
+
<target name="configure-webservice-management" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="configure-webservice-management"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml
index afae8e7..22df5e6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java
index 1b66b9d..9f9d4af 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java
@@ -25,15 +25,15 @@
targetNamespace="http://example.com/Subtractor"
)
public class Subtractor {
- static int count = 0;
- public Subtractor() {}
+ static int count = 0;
+ public Subtractor() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i -j ;
- count++;
+ count++;
System.out.println(i + "-" + j +" = " + k);
- System.out.println("Count is: "+count);
- return k;
- }
+ System.out.println("Count is: "+count);
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 1658a40..9d5fb26 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml
index 6b9b035..13c33de 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Subtractor"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:SubtractorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Subtractor"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:SubtractorService"
link-type="standard"
service-name="tns:SubtractorService"
endpoint-name="SubtractorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml
index e4c9a56..1a84ff0 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Subtractor Service</description>
- <display-name>SubtractorWAR</display-name>
+ <description>WebTier for the Subtractor Service</description>
+ <display-name>SubtractorWAR</display-name>
- <servlet>
- <description>Endpoint for Subtractor Web Service</description>
- <display-name>SubtractorWebService</display-name>
- <servlet-name>Subtractor</servlet-name>
- <servlet-class>endpoint.Subtractor</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Subtractor Web Service</description>
+ <display-name>SubtractorWebService</display-name>
+ <servlet-name>Subtractor</servlet-name>
+ <servlet-class>endpoint.Subtractor</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Subtractor</servlet-name>
- <url-pattern>/webservice/SubtractorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Subtractor</servlet-name>
+ <url-pattern>/webservice/SubtractorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
index b23c90f..3667a7d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef(name="sun-web.serviceref/subtractor") SubtractorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties
index 88925b3..46e1a58 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="jbi-component-su-assembly" value="ejb_noname_HelloEJB_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml
index c19eac4..1d085f4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml
@@ -44,8 +44,8 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
<target name="deploy-test" depends="clean">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java
index 56b3216..3ae163e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java
@@ -27,16 +27,16 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello";
+ private static String testId = "jbi-serviceengine/server/ejb/hello";
@WebServiceRef
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription(testId);
+ stat.addDescription(testId);
JAXWSClient client = new JAXWSClient();
client.doTest(args);
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
public void doTest(String[] args) {
@@ -44,11 +44,11 @@
Hello port = service.getHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(testId, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java
index 7ccfee4..1890078 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java
@@ -29,15 +29,15 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello";
+ private static String testId = "jbi-serviceengine/server/ejb/hello";
@WebServiceRef
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription(testId);
+ stat.addDescription(testId);
SOAPEjbConsumer client = new SOAPEjbConsumer();
client.doTest(args);
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
public void doTest(String[] args) {
@@ -51,11 +51,11 @@
endpointURI);
System.out.println(" After setting endpoint address URI");
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(testId, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java
index b6f7fd1..bc96cd6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java
@@ -28,16 +28,16 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello";
+ private static String testId = "jbi-serviceengine/server/ejb/hello";
@WebServiceRef
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription(testId);
+ stat.addDescription(testId);
SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
client.doTest(args);
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
public void doTest(String[] args) {
@@ -50,11 +50,11 @@
endpointURI);
System.out.println(" After setting endpoint address URI");
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(testId, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java
index fd4f6f0..226bf5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/jaxws")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 8762c4e..13ae4f3 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml
index 8eec636..fce247d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://endpoint/jaxws"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://endpoint/jaxws"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
<consumes interface-name="tns:HelloEJBServiceInterface"
service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml
index c95ba9a..9e71a61 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml
index 1658d16..09567cc 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://endpoint/jaxws"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:HelloEJBServiceInterface"
- service-name="tns:HelloEJBService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://endpoint/jaxws"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:HelloEJBServiceInterface"
+ service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml
index d2492b6..d31fcfa 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
<service-name>
- <namespace-uri>http://endpoint/jaxws</namespace-uri>
- <local-part>HelloEJBService</local-part>
+ <namespace-uri>http://endpoint/jaxws</namespace-uri>
+ <local-part>HelloEJBService</local-part>
</service-name>
<endpoint-name>HelloEJBPort</endpoint-name>
<endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/ejb/noname/helloendpoint</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/soap/ejb/noname/helloendpoint</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>sayHello</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://endpoint/jaxws</namespace-uri>
</input>
<output>
<namespace-uri>http://endpoint/jaxws</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml
index d6e3731..f42d6d6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml
@@ -76,7 +76,7 @@
</target>
<target name="another_servlet">
- <ant inheritAll="false" dir="./another_servlet"/>
+ <ant inheritAll="false" dir="./another_servlet"/>
</target>
@@ -91,6 +91,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java
index 6511b48..649a29b 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java
@@ -27,7 +27,7 @@
import com.example.subtractor.SubtractorService;
import com.example.subtractor.Subtractor;
-
+
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -37,42 +37,42 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-public class StressClient extends Thread {
+public class StressClient extends Thread {
int clientId;
Hello port;
Hi port1;
Subtractor port2;
- private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
+ private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
static long startTime = 0;
static int minutesToRun = 0;
static long endTime = 0;
-
+
private SimpleReporterAdapter stat ;
-
+
HelloEJBService service;
HiEJBService service1;
SubtractorService service2;
StressClient(int i,SimpleReporterAdapter stat) {
System.out.println("Instantiating a stress client");
- //stat.addDescription("jsr108-serverside-webservices-ejb-noname-annotation");
+ //stat.addDescription("jsr108-serverside-webservices-ejb-noname-annotation");
clientId = i;
- this.stat = stat;
+ this.stat = stat;
}
void setServiceHandle( HelloEJBService ser, HiEJBService ser1, SubtractorService ser2){
service = ser;
- service1 = ser1;
- service2 = ser2;
+ service1 = ser1;
+ service2 = ser2;
}
static void setTimeToRun( int minutes ) {
minutesToRun = minutes;
- startTime = System.currentTimeMillis();
+ startTime = System.currentTimeMillis();
}
public void run() {
@@ -84,63 +84,63 @@
endpointURI);
System.out.println(clientId + ":" + " After setting endpoint address URI");
- port1 = service1.getHiEJBPort();
- BindingProvider stub1 = (BindingProvider)port1;
+ port1 = service1.getHiEJBPort();
+ BindingProvider stub1 = (BindingProvider)port1;
String endpointURI1 ="http://localhost:12017/HiEJBPort";
stub1.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI1);
+ endpointURI1);
- port2 = service2.getSubtractorPort();
- BindingProvider stub2 = (BindingProvider)port2;
+ port2 = service2.getSubtractorPort();
+ BindingProvider stub2 = (BindingProvider)port2;
String endpointURI2 ="http://localhost:12018/subtractorendpoint";
stub2.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI2);
-
+ endpointURI2);
- while((endTime - startTime) < minutesToRun*60*1000) {
+
+ while((endTime - startTime) < minutesToRun*60*1000) {
// Iterative tester for stress, per Thread
for ( int i=0 ; i < 10; i++)
- doTest("Stress Tester",i);
- endTime = System.currentTimeMillis();
- }
+ doTest("Stress Tester",i);
+ endTime = System.currentTimeMillis();
}
-
+ }
+
public void doTest(String toSend, int id) {
try {
- Integer i = (Integer)id;
+ Integer i = (Integer)id;
String ret = port.sayHello(toSend+i);
- String ret1 = port1.sayHi(toSend+i);
- int res = port2.add(5,2);
+ String ret1 = port1.sayHi(toSend+i);
+ int res = port2.add(5,2);
- if(ret.indexOf("WebSvcTest-Hello") == -1 || ret.indexOf(i.toString()) == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1 || ret.indexOf(i.toString()) == -1) {
System.out.println(clientId + ":" + "Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
- stat.printSummary(testId);
+ stat.printSummary(testId);
return;
- }
- //pass();
+ }
+ //pass();
System.out.println(clientId + ":" + ret);
- if(ret1.indexOf("WebSvcTest-Hi") == -1 || ret1.indexOf(i.toString()) == -1) {
- System.out.println(clientId + ":" + "Unexpected greeting " + ret1);
- stat.addStatus(testId, stat.FAIL);
- return;
- }
- //pass();
- System.out.println(clientId + ":" + ret1);
+ if(ret1.indexOf("WebSvcTest-Hi") == -1 || ret1.indexOf(i.toString()) == -1) {
+ System.out.println(clientId + ":" + "Unexpected greeting " + ret1);
+ stat.addStatus(testId, stat.FAIL);
+ return;
+ }
+ //pass();
+ System.out.println(clientId + ":" + ret1);
- if( res != 3) {
- System.out.println(clientId + ":" + "Unexpected result " + res);
- stat.addStatus(testId, stat.FAIL);
- return;
- }
+ if( res != 3) {
+ System.out.println(clientId + ":" + "Unexpected result " + res);
+ stat.addStatus(testId, stat.FAIL);
+ return;
+ }
//pass();
- System.out.println(clientId + "Result is :" + res);
+ System.out.println(clientId + "Result is :" + res);
- } catch(Exception e) {
+ } catch(Exception e) {
stat.addStatus(testId, stat.FAIL);
- stat.printSummary(testId);
+ stat.printSummary(testId);
e.printStackTrace();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java
index d0de694..defa929 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java
@@ -31,12 +31,12 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
+ private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
@WebServiceRef
static HelloEJBService service;
- @WebServiceRef
+ @WebServiceRef
static HiEJBService service1;
@WebServiceRef(wsdlLocation="http://localhost:8080/subtractorservice/webservice/SubtractorService?WSDL")
@@ -44,32 +44,32 @@
static long startTime = 0;
- static int minutesToRun = 0;
- static long endTime = 0;
+ static int minutesToRun = 0;
+ static long endTime = 0;
StressSOAPEjbConsumer() {
- //create multiple instances of iterative test clients.
+ //create multiple instances of iterative test clients.
StressClient clients[] = new StressClient[100];
for(int i = 0 ; i < 100 ; i++) {
- clients[i] = new StressClient(i,stat);
+ clients[i] = new StressClient(i,stat);
clients[i].setServiceHandle(service,service1,service2);
clients[i].start();
}
- }
+ }
public static void main(String[] args) throws Exception {
stat.addDescription(testId);
-
- if( args != null && args.length > 0 && args[0] != null)
- try {
+
+ if( args != null && args.length > 0 && args[0] != null)
+ try {
minutesToRun = Integer.parseInt(args[0]);
- } catch(NumberFormatException numEx) {
- minutesToRun = 3;
- }
- System.out.println("Time to run is: "+minutesToRun);
- Thread.currentThread().sleep(2000);
- StressClient.setTimeToRun(minutesToRun);
+ } catch(NumberFormatException numEx) {
+ minutesToRun = 3;
+ }
+ System.out.println("Time to run is: "+minutesToRun);
+ Thread.currentThread().sleep(2000);
+ StressClient.setTimeToRun(minutesToRun);
StressSOAPEjbConsumer stressClient = new StressSOAPEjbConsumer();
//stat.addStatus("jsr108-serverside-webservices-ejb-noname-annotation", stat.PASS);
- //stat.printSummary("jsr108-serverside-webservices-ejb-noname-annotation");
+ //stat.printSummary("jsr108-serverside-webservices-ejb-noname-annotation");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties
index 68987bd..7200f32 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/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="calculatorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml
index 404fff8..d041889 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml
@@ -34,7 +34,7 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest,undeploy"/>
+ <target name="all" depends="clean, setup, runtest,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
@@ -85,7 +85,7 @@
<echo message="Running negative test by setting jbi-enabled flag to false"/>
<antcall target="runtest-jbi-enabled-false"/>
<echo message="Running JAXWS client"/>
- <antcall target="runtest-jaxws"/>
+ <antcall target="runtest-jaxws"/>
<echo message="Running positive test by setting jbi-enabled flag to true"/>
<antcall target="runtest-jbi-enabled-true"/>
@@ -101,7 +101,7 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
+ </antcall>
<antcall target="run-client">
<param name="client-class" value="client.SOAPWebConsumerNonHttpBC"/>
<param name="other-args" value="jbi-enabled-false"/>
@@ -112,14 +112,14 @@
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=true"/>
- </antcall>
+ </antcall>
<antcall target="runtest-soap-binding"/>
</target>
<target name="configure-webservice-management" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="configure-webservice-management"/>
<param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
+ </antcall>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java
index 8946243..3339fd4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java
@@ -27,18 +27,18 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/web/client";
-
+ private static String testId = "jbi-serviceengine/server/web/client";
+
@WebServiceRef(wsdlLocation="http://localhost:8080/calculatorservice/webservice/CalculatorService?WSDL")
static CalculatorService service;
public static void main(String[] args) {
try {
- stat.addDescription(testId);
+ stat.addDescription(testId);
//CalculatorService service = new CalculatorService();
JAXWSClient client = new JAXWSClient();
client.doTest(args, service);
- stat.printSummary(testId);
+ stat.printSummary(testId);
} catch(Exception e) {
e.printStackTrace();
}
@@ -50,11 +50,11 @@
Calculator port = service.getCalculatorPort();
for (int i=0;i<10;i++) {
int ret = port.add(i, 10);
- if(ret != (i + 10)) {
+ if(ret != (i + 10)) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(" Adding : " + i + " + 10 = " + ret);
}
stat.addStatus(testId, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java
index a9088d0..8579255 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java
@@ -28,42 +28,42 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/web/client";
+ private static String testId = "jbi-serviceengine/server/web/client";
public static void main (String[] args) {
stat.addDescription(testId + args[0]);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer(args);
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer(args);
stat.printSummary(testId + args[0]);
}
private void addUsingSOAPConsumer(String[] args) {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- //String endpointURI ="http://localhost:8080/soap/web/calculatorendpoint";
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ //String endpointURI ="http://localhost:8080/soap/web/calculatorendpoint";
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
if(args[0].equals("jbi-enabled-true"))
- stat.addStatus(testId, stat.PASS);
- else
- stat.addStatus(testId, stat.FAIL);
+ stat.addStatus(testId, stat.PASS);
+ else
+ stat.addStatus(testId, stat.FAIL);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
if(args[0].equals("jbi-enabled-false"))
stat.addStatus(testId, stat.PASS);
else
- stat.addStatus(testId, stat.FAIL);
- }
+ stat.addStatus(testId, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java
index f336b8d..29d0f67 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java
@@ -28,42 +28,42 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/web/client";
+ private static String testId = "jbi-serviceengine/server/web/client";
public static void main (String[] args) {
stat.addDescription(testId + args[0]);
- SOAPWebConsumerNonHttpBC client = new SOAPWebConsumerNonHttpBC();
- client.addUsingSOAPConsumer(args);
+ SOAPWebConsumerNonHttpBC client = new SOAPWebConsumerNonHttpBC();
+ client.addUsingSOAPConsumer(args);
stat.printSummary(testId + args[0]);
}
private void addUsingSOAPConsumer(String[] args) {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
if(args[0].equals("jbi-enabled-true"))
- stat.addStatus(testId, stat.PASS);
- else
- stat.addStatus(testId, stat.FAIL);
+ stat.addStatus(testId, stat.PASS);
+ else
+ stat.addStatus(testId, stat.FAIL);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
if(args[0].equals("jbi-enabled-false"))
stat.addStatus(testId, stat.PASS);
else
- stat.addStatus(testId, stat.FAIL);
- }
+ stat.addStatus(testId, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java
index f59f430..36a99d9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.com/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml
index 8e62a0f..ed274ad 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml
index 4190ac7..8516cfd 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorServiceInterface"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorServiceInterface"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts role="consumer" xmlns="" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml
index 4bef58a..5c84868 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
<service-name>
- <namespace-uri>http://example.com/Calculator</namespace-uri>
- <local-part>CalculatorService</local-part>
+ <namespace-uri>http://example.com/Calculator</namespace-uri>
+ <local-part>CalculatorService</local-part>
</service-name>
<endpoint-name>CalculatorPort</endpoint-name>
<endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/web/calculatorendpoint</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/soap/web/calculatorendpoint</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>add</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://example.com/Calculator</namespace-uri>
</input>
<output>
<namespace-uri>http://example.com/Calculator</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties
index d70fe04..fcc0685 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/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="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml
index c1ab93b..18a38af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
</target>
<target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
@@ -50,23 +50,23 @@
</target>
<target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
+ <echo message="classes dir = ${build.classes.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
<antcall target="pkg-war">
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml"/>
+ </fileset>
+ </jar>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
</target>
<target name="assemble-client" depends="init-common">
@@ -78,7 +78,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/AddNumberService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -117,11 +117,11 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java
index bf2db23..e3f1114 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/add-numbers";
+ private static String testId = "jbi-serviceengine/service_unit/add-numbers";
public boolean found1 = false;
@@ -46,8 +46,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -62,7 +62,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Result is") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java
index 840c6c9..f29b919 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java
@@ -26,13 +26,13 @@
targetNamespace="http://example.web.service/AddNumber"
)
public class AddNumber {
- public AddNumber() {}
+ public AddNumber() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- //throw new java.lang.Exception("This is my exception");
- return k;
- }
+ //throw new java.lang.Exception("This is my exception");
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml
index aea15a6..b045160 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml
@@ -19,16 +19,16 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
<name>client_web_calculator_service_assembly</name>
<description>Client web calculator service assembly</description>
</identification>
- <service-unit>
+ <service-unit>
<identification>
<name>calc-web-client</name>
<description>provider service</description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml
index 2ff1f0c..eec6b06 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/AddNumber"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:AddNumberServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/AddNumber"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:AddNumberServiceInterface"
service-name="tns:AddNumberService"
endpoint-name="AddNumberPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml
index 104b580..2085ed3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the AddNumber Service</description>
- <display-name>AddNumberWAR</display-name>
+ <description>WebTier for the AddNumber Service</description>
+ <display-name>AddNumberWAR</display-name>
- <servlet>
- <description>Endpoint for AddNumber Web Service</description>
- <display-name>AddNumberWebService</display-name>
- <servlet-name>AddNumber</servlet-name>
- <servlet-class>endpoint.AddNumber</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumber Web Service</description>
+ <display-name>AddNumberWebService</display-name>
+ <servlet-name>AddNumber</servlet-name>
+ <servlet-class>endpoint.AddNumber</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumber</servlet-name>
- <url-pattern>/webservice/AddNumberService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumber</servlet-name>
+ <url-pattern>/webservice/AddNumberService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
index 7de5cf6..d79eeaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
@@ -28,35 +28,35 @@
@WebServiceRef(name="sun-web.serviceref/calculator") AddNumberService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
AddNumber port = service.getAddNumberPort();
int ret = port.add(1, 2);
- printSuccess(out,ret);
+ printSuccess(out,ret);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -69,7 +69,7 @@
}
public void printSuccess(PrintWriter out, int result) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml
index f70a9c0..ef14a7f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml
@@ -38,6 +38,6 @@
<ant dir="endpoint_mapping_consumer" target="clean"/>
<ant dir="add-numbers" target="clean"/>
<ant dir="enterprise_app" target="clean"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties
index e318c43..ca6a039 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/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="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml
index 9eba418..a243147 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml
@@ -76,7 +76,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -98,11 +98,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java
index afd178a..b4847a7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/compApp-client";
+ private static String testId = "jbi-serviceengine/service_unit/compApp-client";
public boolean found1 = false;
public boolean found2 = false;
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java
index 6951320..bed1e0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml
index 1fa92bd..53f9c86 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <consumes interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <consumes interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml
index f9171c9..4dc4f31 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
index ed78bcb..ee2ff26 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties
index 72c2645..d7e40ce 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/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="calculatorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml
index 868d396..b0ee5a5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml
@@ -34,7 +34,7 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest,undeploy"/>
+ <target name="all" depends="clean, setup, runtest,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
@@ -54,7 +54,7 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
<jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <metainf file="jbi.xml"/>
+ <metainf file="jbi.xml"/>
</jar>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java
index 0b73c13..b94bb13 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java
@@ -28,42 +28,42 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/compApp-server";
+ private static String testId = "jbi-serviceengine/service_unit/compApp-server";
public static void main (String[] args) {
stat.addDescription(testId + args[0]);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer(args);
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer(args);
stat.printSummary(testId + args[0]);
}
private void addUsingSOAPConsumer(String[] args) {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
if(args[0].equals("jbi-enabled-true"))
- stat.addStatus(testId, stat.PASS);
- else
- stat.addStatus(testId, stat.FAIL);
+ stat.addStatus(testId, stat.PASS);
+ else
+ stat.addStatus(testId, stat.FAIL);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
if(args[0].equals("jbi-enabled-false"))
stat.addStatus(testId, stat.PASS);
else
- stat.addStatus(testId, stat.FAIL);
- }
+ stat.addStatus(testId, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java
index f59f430..36a99d9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.com/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml
index f915dc2..80539e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:CalculatorService"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:CalculatorService"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml
index 090b430..4434e5c 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties
index d70fe04..fcc0685 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/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="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml
index db511ea..487b99c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
</target>
<target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
@@ -50,23 +50,23 @@
</target>
<target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
+ <echo message="classes dir = ${build.classes.dir}"/>
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
<antcall target="pkg-war">
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml"/>
+ </fileset>
+ </jar>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
</target>
<target name="assemble-client" depends="init-common">
@@ -78,7 +78,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/EndpointMappingService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -117,11 +117,11 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java
index eed8e5a..7bdb43a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/endpoint-naming";
+ private static String testId = "jbi-serviceengine/service_unit/endpoint-naming";
public boolean found1 = false;
@@ -46,8 +46,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -62,7 +62,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Result is") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java
index 6a8c037..7a5b2d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java
@@ -26,13 +26,13 @@
targetNamespace="http://example.web.service/EndpointMapping"
)
public class EndpointMapping {
- public EndpointMapping() {}
+ public EndpointMapping() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- //throw new java.lang.Exception("This is my exception");
- return k;
- }
+ //throw new java.lang.Exception("This is my exception");
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml
index 956186b..dd2f19c 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml
@@ -19,17 +19,17 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns0="http://example.web.service/EndpointMapping"
+ xmlns:ns0="http://example.web.service/EndpointMapping"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
<name>client_web_calculator_service_assembly</name>
<description>Client web calculator service assembly</description>
</identification>
- <service-unit>
+ <service-unit>
<identification>
<name>calc-web-client</name>
<description>provider service</description>
@@ -41,10 +41,10 @@
</service-unit>
<connections>
- <connection>
- <consumer endpoint-name="EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
- <provider endpoint-name="javaee_EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
- </connection>
+ <connection>
+ <consumer endpoint-name="EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
+ <provider endpoint-name="javaee_EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
+ </connection>
</connections>
</service-assembly>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml
index 54fe804..198633b 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml
@@ -18,13 +18,13 @@
-->
<jbi xmlns="http://java.sun.com/xml/ns/jbi" xmlns:javaee_ext="http://javaee.serviceengine.sun.com/endpoint/naming/extension" xmlns:ns0="http://example.web.service/EndpointMapping" version="1.0">
- <services binding-component="false">
- <provides endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService"/>
- <javaee_ext:ept-mappings>
- <javaee_ext:ept-mapping>
- <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
- <javaee_ext:wsdl-ept endpoint-name="EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
- </javaee_ext:ept-mapping>
- </javaee_ext:ept-mappings>
- </services>
+ <services binding-component="false">
+ <provides endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService"/>
+ <javaee_ext:ept-mappings>
+ <javaee_ext:ept-mapping>
+ <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
+ <javaee_ext:wsdl-ept endpoint-name="EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
+ </javaee_ext:ept-mapping>
+ </javaee_ext:ept-mappings>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml
index 358740a..f3c6d5d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the EndpointMapping Service</description>
- <display-name>EndpointMappingWAR</display-name>
+ <description>WebTier for the EndpointMapping Service</description>
+ <display-name>EndpointMappingWAR</display-name>
- <servlet>
- <description>Endpoint for EndpointMapping Web Service</description>
- <display-name>EndpointMappingWebService</display-name>
- <servlet-name>EndpointMapping</servlet-name>
- <servlet-class>endpoint.EndpointMapping</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for EndpointMapping Web Service</description>
+ <display-name>EndpointMappingWebService</display-name>
+ <servlet-name>EndpointMapping</servlet-name>
+ <servlet-class>endpoint.EndpointMapping</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>EndpointMapping</servlet-name>
- <url-pattern>/webservice/EndpointMappingService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EndpointMapping</servlet-name>
+ <url-pattern>/webservice/EndpointMappingService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
index f7bf467..f05bdc4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
@@ -28,35 +28,35 @@
@WebServiceRef(name="sun-web.serviceref/calculator") EndpointMappingService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
EndpointMapping port = service.getEndpointMappingPort();
int ret = port.add(1, 2);
- printSuccess(out,ret);
+ printSuccess(out,ret);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -69,7 +69,7 @@
}
public void printSuccess(PrintWriter out, int result) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties
index acc57f3..c2f7a50 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/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="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml
index fc8855f..6c6d910 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml
@@ -76,7 +76,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -98,11 +98,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java
index 6b64922..75549c2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/endpoint_mapping_consumer";
+ private static String testId = "jbi-serviceengine/service_unit/endpoint_mapping_consumer";
public boolean found1 = false;
public boolean found2 = false;
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EndpointMappingConsumer add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java
index b8bd78b..e50ea4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/EndpointMappingConsumer"
)
public class EndpointMappingConsumer {
- public EndpointMappingConsumer() {}
+ public EndpointMappingConsumer() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml
index 3e17b8c..db3551a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml
@@ -18,21 +18,21 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
- xmlns:javaee_ext="http://javaee.serviceengine.sun.com/endpoint/naming/extension"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <consumes interface-name="ns0:EndpointMappingConsumerServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
+ xmlns:javaee_ext="http://javaee.serviceengine.sun.com/endpoint/naming/extension"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <consumes interface-name="ns0:EndpointMappingConsumerServiceInterface"
service-name="ns0:EndpointMappingConsumerService"
endpoint-name="javaee_EndpointMappingConsumerPort"/>
- <javaee_ext:ept-mappings>
- <javaee_ext:ept-mapping>
- <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
- <javaee_ext:wsdl-ept endpoint-name="EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
- </javaee_ext:ept-mapping>
- </javaee_ext:ept-mappings>
- </services>
+ <javaee_ext:ept-mappings>
+ <javaee_ext:ept-mapping>
+ <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
+ <javaee_ext:wsdl-ept endpoint-name="EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
+ </javaee_ext:ept-mapping>
+ </javaee_ext:ept-mappings>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml
index c322df7..1935ac5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml
@@ -19,10 +19,10 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
@@ -52,10 +52,10 @@
</service-unit>
<connections>
- <connection>
- <consumer endpoint-name="javaee_EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
- <provider endpoint-name="EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
- </connection>
+ <connection>
+ <consumer endpoint-name="javaee_EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
+ <provider endpoint-name="EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
+ </connection>
</connections>
</service-assembly>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml
index 0f959c9..19bbafe 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/EndpointMappingConsumer"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:EndpointMappingConsumerServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/EndpointMappingConsumer"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:EndpointMappingConsumerServiceInterface"
service-name="tns:EndpointMappingConsumerService"
endpoint-name="EndpointMappingConsumerPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml
index c3440c3..3b035ea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the EndpointMappingConsumer Service</description>
- <display-name>EndpointMappingConsumerWAR</display-name>
+ <description>WebTier for the EndpointMappingConsumer Service</description>
+ <display-name>EndpointMappingConsumerWAR</display-name>
- <servlet>
- <description>Endpoint for EndpointMappingConsumer Web Service</description>
- <display-name>EndpointMappingConsumerWebService</display-name>
- <servlet-name>EndpointMappingConsumer</servlet-name>
- <servlet-class>endpoint.EndpointMappingConsumer</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for EndpointMappingConsumer Web Service</description>
+ <display-name>EndpointMappingConsumerWebService</display-name>
+ <servlet-name>EndpointMappingConsumer</servlet-name>
+ <servlet-class>endpoint.EndpointMappingConsumer</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>EndpointMappingConsumer</servlet-name>
- <url-pattern>/webservice/EndpointMappingConsumerService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EndpointMappingConsumer</servlet-name>
+ <url-pattern>/webservice/EndpointMappingConsumerService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
index 1778d2b..1b95b39 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef EndpointMappingConsumerService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml
index fe440c0..3ebe52b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml
@@ -25,23 +25,23 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- pre-init: called before initialization of project properties
- post-init: called after initialization of project properties
- pre-compile: called before javac compilation
- post-compile: called after javac compilation
+ pre-init: called before initialization of project properties
+ post-init: called after initialization of project properties
+ pre-compile: called before javac compilation
+ post-compile: called after javac compilation
pre-compile-single: called before javac compilation of single file
post-compile-single: called after javac compilation of single file
- pre-dist: called before jar building
- post-dist: called after jar building
- post-clean: called after cleaning build products
+ pre-dist: called before jar building
+ post-dist: called after jar building
+ post-clean: called after cleaning build products
pre-run-deploy: called before deploying
post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -49,20 +49,20 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-debug: defines macro for class debugging
do-dist: jar archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -70,10 +70,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml
index 144d630..cb08385 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
@@ -49,11 +49,11 @@
<mkdir dir="${sjsas.resources.dir}/META-INF"/>
<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
<property name="lefty" value="<"/>
-
+
<property name="righty" value=">"/>
<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
-${lefty}!DOCTYPE resources PUBLIC
- "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+${lefty}!DOCTYPE resources PUBLIC
+ "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
${lefty}resources${righty}
${lefty}/resources${righty}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml
index 62135aa..4128528 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml
@@ -36,8 +36,8 @@
<project name="EntApp-ejb-impl" default="build" basedir=".." xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
<import file="ant-deploy.xml"/>
<target name="default" depends="dist,javadoc" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
+ <!--
+ INITIALIZATION SECTION
-->
<target name="-pre-init">
<!-- Empty placeholder for easier customization. -->
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
index 2788e7c..6321cdf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
@@ -49,5 +49,5 @@
System.out.println(hello);
return hello;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml
index a151ac1..027ea2b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml
@@ -25,27 +25,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before jar building
- -post-dist: called after jar building
- -post-clean: called after cleaning build products
+ -pre-dist: called before jar building
+ -post-dist: called after jar building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -53,21 +53,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: jar archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -75,10 +75,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml
index 144d630..cb08385 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
@@ -49,11 +49,11 @@
<mkdir dir="${sjsas.resources.dir}/META-INF"/>
<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
<property name="lefty" value="<"/>
-
+
<property name="righty" value=">"/>
<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
-${lefty}!DOCTYPE resources PUBLIC
- "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+${lefty}!DOCTYPE resources PUBLIC
+ "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
${lefty}resources${righty}
${lefty}/resources${righty}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml
index 3b4a7cb..7fe97b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml
@@ -662,7 +662,7 @@
</target>
<target name="javadoc" depends="init,javadoc-build,javadoc-browse" description="Build Javadoc."/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
@@ -704,7 +704,7 @@
</target>
<target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target name="-pre-test-run" if="have.tests" depends="init">
@@ -731,7 +731,7 @@
</target>
<target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
@@ -747,7 +747,7 @@
</target>
<target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target name="deps-clean" depends="init" if="no.dist.ear.dir" unless="no.deps">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java
index c1ea04b..1afeef3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java
@@ -46,5 +46,5 @@
System.out.println(hello);
return hello;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml
index 768e2c3..715ccfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml
@@ -25,21 +25,21 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- pre-init: called before initialization of project properties
- post-init: called after initialization of project properties
- pre-compile: called before javac compilation
- post-compile: called after javac compilation
- pre-dist: called before jar building
- post-dist: called after jar building
- post-clean: called after cleaning build products
+ pre-init: called before initialization of project properties
+ post-init: called after initialization of project properties
+ pre-compile: called before javac compilation
+ post-compile: called after javac compilation
+ pre-dist: called before jar building
+ post-dist: called after jar building
+ post-clean: called after cleaning build products
pre-run-deploy: called before deploying
post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -47,17 +47,17 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
do-dist: jar archive building
- run: execution of project
+ run: execution of project
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -65,10 +65,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
index 144d630..cb08385 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
@@ -49,11 +49,11 @@
<mkdir dir="${sjsas.resources.dir}/META-INF"/>
<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
<property name="lefty" value="<"/>
-
+
<property name="righty" value=">"/>
<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
-${lefty}!DOCTYPE resources PUBLIC
- "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+${lefty}!DOCTYPE resources PUBLIC
+ "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
${lefty}resources${righty}
${lefty}/resources${righty}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
index cd5c7cf..6917e5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
@@ -35,8 +35,8 @@
<project name="EntApp-impl" default="build" basedir=".." xmlns:ear2="http://www.netbeans.org/ns/j2ee-earproject/2">
<import file="ant-deploy.xml"/>
<target name="default" depends="dist" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
+ <!--
+ INITIALIZATION SECTION
-->
<target name="pre-init">
<!-- Empty placeholder for easier customization. -->
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties
index 068f84e..1dfb07e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
Don't rename jdk.home as java.home
jdk.home=${env.JAVA_HOME}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml
index d5b0f47..8102c78 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml
@@ -19,168 +19,168 @@
<project name="Plain EJB invocation from JBI" default="all" basedir=".">
- <property environment="env"/>
+ <property environment="env"/>
<property file="build.properties"/>
-
- <target name="all" depends="clean, setup, runtest, undeploy">
- <antcall target="clean"/>
- </target>
+
+ <target name="all" depends="clean, setup, runtest, undeploy">
+ <antcall target="clean"/>
+ </target>
- <target name="setup">
- <antcall target="compile-entapp"/>
- <antcall target="wsgen-sun-http-binding"/>
- <antcall target="build-serviceassembly"/>
- <antcall target="deploy-serviceassembly"/>
- </target>
+ <target name="setup">
+ <antcall target="compile-entapp"/>
+ <antcall target="wsgen-sun-http-binding"/>
+ <antcall target="build-serviceassembly"/>
+ <antcall target="deploy-serviceassembly"/>
+ </target>
- <target name="runtest">
+ <target name="runtest">
- <!-- Build the client -->
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-d"/>
- <arg line="build"/>
- <arg line="-keep"/>
- <arg line="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl"/>
- </exec>
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-d"/>
- <arg line="build"/>
- <arg line="-keep"/>
- <arg line="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl"/>
- </exec>
+ <!-- Build the client -->
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-d"/>
+ <arg line="build"/>
+ <arg line="-keep"/>
+ <arg line="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl"/>
+ </exec>
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-d"/>
+ <arg line="build"/>
+ <arg line="-keep"/>
+ <arg line="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl"/>
+ </exec>
- <javac srcdir="client" includes="Client.java" destdir="build" classpath="${client.classpath}" debug="true"/>
+ <javac srcdir="client" includes="Client.java" destdir="build" classpath="${client.classpath}" debug="true"/>
- <java classname="client.Client" classpath="${client.classpath}" fork="true"/>
-
- </target>
-
- <target name="clean">
-
- <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant">
- <arg line="clean"/>
- </exec>
-
- <delete dir="build"/>
-
- <delete includeemptydirs="true" failonerror="false">
- <fileset dir="service-assembly/sun-http-binding" includes="*.wsdl, *.xsd"/>
- <fileset dir="service-assembly/sun-http-binding/entapp"/>
- </delete>
-
- </target>
-
- <target name="undeploy">
- <antcall target="undeploy-serviceassembly"/>
- </target>
-
- <target name="compile-entapp">
- <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant"/>
- <!--
- <ant dir="${ent.app}"/>
- -->
-
- <!-- Add jbi.xml file to the .ear file -->
- <jar destfile="${ent.app}/dist/EntApp.ear"
- basedir="service-assembly/sun-javaee-engine"
- includes="META-INF/jbi.xml"
- update="true"
- />
- </target>
-
- <target name="wsgen-sun-http-binding">
- <!-- generate WSDL for the EJB web service -->
- <exec executable="${env.S1AS_HOME}/bin/wsgen">
- <arg line="-cp"/>
- <arg line="${ent.app}/${ejb.module}/build/ear-module"/>
- <arg line="${ejb.webservice.class}"/>
- <arg line="-wsdl"/>
- <arg line="-d"/>
- <arg line="service-assembly/sun-http-binding"/>
- </exec>
- <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
- <replace file="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl">
- <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
- <replacevalue>http://localhost:12000/entapp/ejb/HelloEJB</replacevalue>
- </replace>
-
- <!-- generate WSDL for the Servlet web service -->
- <exec executable="${env.S1AS_HOME}/bin/wsgen">
- <arg line="-cp"/>
- <arg line="${ent.app}/${web.module}/build/ear-module/WEB-INF/classes"/>
- <arg line="${web.webservice.class}"/>
- <arg line="-wsdl"/>
- <arg line="-d"/>
- <arg line="service-assembly/sun-http-binding"/>
- </exec>
- <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
- <replace file="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl">
- <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
- <replacevalue>http://localhost:12000/entapp/web/HelloEJB</replacevalue>
- </replace>
+ <java classname="client.Client" classpath="${client.classpath}" fork="true"/>
</target>
- <target name="build-serviceassembly">
- <mkdir dir="build"/>
+ <target name="clean">
- <!-- Build the service unit & assembly jars -->
- <jar destfile="build/sun-http-binding.jar"
- basedir="service-assembly/sun-http-binding"
- includes="*.wsdl, *.xsd, META-INF/jbi.xml"
- />
- <jar destfile="build/EntApp.zip"
- basedir="build"
- includes="sun-http-binding.jar"
- />
- <jar destfile="build/EntApp.zip"
- update="true"
- basedir="${ent.app}/dist"
- includes="EntApp.ear"
- />
- <jar destfile="build/EntApp.zip"
- basedir="service-assembly"
- includes="META-INF/jbi.xml"
- update="true"
- />
- </target>
+ <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant">
+ <arg line="clean"/>
+ </exec>
- <target name="deploy-serviceassembly">
- <exec executable="${asadmin.command}">
- <arg line="deploy-jbi-service-assembly"/>
- <arg line="build/EntApp.zip"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="start-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- </target>
-
- <target name="undeploy-serviceassembly">
- <exec executable="${asadmin.command}">
- <arg line="stop-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="shut-down-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="undeploy-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- </target>
+ <delete dir="build"/>
- <target name="restart-ejbmodule">
- <exec executable="${asadmin.command}">
- <arg line="disable"/>
- <arg line="${ejb.module}"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="enable"/>
- <arg line="${ejb.module}"/>
- </exec>
- </target>
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="service-assembly/sun-http-binding" includes="*.wsdl, *.xsd"/>
+ <fileset dir="service-assembly/sun-http-binding/entapp"/>
+ </delete>
+
+ </target>
+
+ <target name="undeploy">
+ <antcall target="undeploy-serviceassembly"/>
+ </target>
+
+ <target name="compile-entapp">
+ <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant"/>
+ <!--
+ <ant dir="${ent.app}"/>
+ -->
+
+ <!-- Add jbi.xml file to the .ear file -->
+ <jar destfile="${ent.app}/dist/EntApp.ear"
+ basedir="service-assembly/sun-javaee-engine"
+ includes="META-INF/jbi.xml"
+ update="true"
+ />
+ </target>
+
+ <target name="wsgen-sun-http-binding">
+ <!-- generate WSDL for the EJB web service -->
+ <exec executable="${env.S1AS_HOME}/bin/wsgen">
+ <arg line="-cp"/>
+ <arg line="${ent.app}/${ejb.module}/build/ear-module"/>
+ <arg line="${ejb.webservice.class}"/>
+ <arg line="-wsdl"/>
+ <arg line="-d"/>
+ <arg line="service-assembly/sun-http-binding"/>
+ </exec>
+ <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
+ <replace file="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl">
+ <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
+ <replacevalue>http://localhost:12000/entapp/ejb/HelloEJB</replacevalue>
+ </replace>
+
+ <!-- generate WSDL for the Servlet web service -->
+ <exec executable="${env.S1AS_HOME}/bin/wsgen">
+ <arg line="-cp"/>
+ <arg line="${ent.app}/${web.module}/build/ear-module/WEB-INF/classes"/>
+ <arg line="${web.webservice.class}"/>
+ <arg line="-wsdl"/>
+ <arg line="-d"/>
+ <arg line="service-assembly/sun-http-binding"/>
+ </exec>
+ <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
+ <replace file="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl">
+ <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
+ <replacevalue>http://localhost:12000/entapp/web/HelloEJB</replacevalue>
+ </replace>
+
+ </target>
+
+ <target name="build-serviceassembly">
+ <mkdir dir="build"/>
+
+ <!-- Build the service unit & assembly jars -->
+ <jar destfile="build/sun-http-binding.jar"
+ basedir="service-assembly/sun-http-binding"
+ includes="*.wsdl, *.xsd, META-INF/jbi.xml"
+ />
+ <jar destfile="build/EntApp.zip"
+ basedir="build"
+ includes="sun-http-binding.jar"
+ />
+ <jar destfile="build/EntApp.zip"
+ update="true"
+ basedir="${ent.app}/dist"
+ includes="EntApp.ear"
+ />
+ <jar destfile="build/EntApp.zip"
+ basedir="service-assembly"
+ includes="META-INF/jbi.xml"
+ update="true"
+ />
+ </target>
+
+ <target name="deploy-serviceassembly">
+ <exec executable="${asadmin.command}">
+ <arg line="deploy-jbi-service-assembly"/>
+ <arg line="build/EntApp.zip"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="start-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ </target>
+
+ <target name="undeploy-serviceassembly">
+ <exec executable="${asadmin.command}">
+ <arg line="stop-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="shut-down-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="undeploy-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ </target>
+
+ <target name="restart-ejbmodule">
+ <exec executable="${asadmin.command}">
+ <arg line="disable"/>
+ <arg line="${ejb.module}"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="enable"/>
+ <arg line="${ejb.module}"/>
+ </exec>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java
index 093f01e..c11f36b 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java
@@ -25,33 +25,33 @@
public class Client {
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/enterprise_app";
+ private static String testId = "jbi-serviceengine/service_unit/enterprise_app";
public static void main (String[] args) {
stat.addDescription(testId);
- Client client = new Client();
- client.invoke();
+ Client client = new Client();
+ client.invoke();
stat.printSummary(testId );
}
private void invoke() {
- try {
+ try {
- HelloEJBService helloEJBService = new HelloEJBService();
- HelloEJB port = helloEJBService.getHelloEJBPort();
- String hello = port.sayHello("Bhavani");
- System.out.println("Output :: " + hello);
+ HelloEJBService helloEJBService = new HelloEJBService();
+ HelloEJB port = helloEJBService.getHelloEJBPort();
+ String hello = port.sayHello("Bhavani");
+ System.out.println("Output :: " + hello);
- HelloWebService helloWebService = new HelloWebService();
- HelloWeb webPort = helloWebService.getHelloWebPort();
- hello = webPort.sayHello("Bhavani");
- System.out.println("Output :: " + hello);
+ HelloWebService helloWebService = new HelloWebService();
+ HelloWeb webPort = helloWebService.getHelloWebPort();
+ hello = webPort.sayHello("Bhavani");
+ System.out.println("Output :: " + hello);
- stat.addStatus(testId, stat.PASS);
+ stat.addStatus(testId, stat.PASS);
- } catch(Exception ex) {
- ex.printStackTrace();
- stat.addStatus(testId, stat.FAIL);
- }
- }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ stat.addStatus(testId, stat.FAIL);
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml
index 9962281..2edfeb9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml
@@ -19,10 +19,10 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:tns="http://glassfish.samples.sun.com/"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tns="http://glassfish.samples.sun.com/"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml
index 9bd2a21..3470077 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml
@@ -18,18 +18,18 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:ejb="http://ejb.entapp/"
- xmlns:web="http://web.entapp/"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="ejb:HelloEJBService"
- service-name="ejb:HelloEJBService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:ejb="http://ejb.entapp/"
+ xmlns:web="http://web.entapp/"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="ejb:HelloEJBService"
+ service-name="ejb:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <consumes interface-name="web:HelloWebService"
- service-name="web:HelloWebService"
+ <consumes interface-name="web:HelloWebService"
+ service-name="web:HelloWebService"
endpoint-name="HelloWebPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml
index 53b12f0..838d380 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml
@@ -18,18 +18,18 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:ejb="http://ejb.entapp/"
- xmlns:web="http://web.entapp/"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="ejb:HelloEJBService"
- service-name="ejb:HelloEJBService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:ejb="http://ejb.entapp/"
+ xmlns:web="http://web.entapp/"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="ejb:HelloEJBService"
+ service-name="ejb:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <provides interface-name="web:HelloWebService"
- service-name="web:HelloWebService"
+ <provides interface-name="web:HelloWebService"
+ service-name="web:HelloWebService"
endpoint-name="HelloWebPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties
index ac59642..c27c121 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/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="provider_su"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./endpoint/web.xml"/>
<property name="jbi-component-su-assembly" value="sample_service_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml
index de94c36..9bf0bea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml
@@ -27,24 +27,24 @@
]>
<project name="warservice" default="all" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, deploy, runtest, undeploy, clean"/>
-
+ <target name="all" depends="clean, deploy, runtest, undeploy, clean"/>
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
<delete file="${basedir}/service_assembly/${appname}.war"/>
<delete file="${basedir}/service_assembly/${http-soap-bc-su}.jar"/>
<delete file="${basedir}/service_assembly/${jbi-component-su-assembly}.zip"/>
</target>
-
+
<target name="assemble" depends="init-common, compile">
-
+
<!-- Step1. Build the provider service unit -->
<echo message="classes dir = ${build.classes.dir}"/>
<echo message="assemble.dir = ${assemble.dir}/${appname}.war"/>
@@ -63,7 +63,7 @@
</jar>
<!-- Copy the JavaEE app to the service assembly -->
<copy file="${assemble.dir}/${appname}.war" todir="${basedir}/service_assembly"/>
-
+
<!-- Step2. Build the consumer service unit -->
<jar jarfile="${basedir}/service_assembly/${http-soap-bc-su}.jar">
<fileset dir="${basedir}/service_assembly/service_units/soap-bc-su">
@@ -73,64 +73,64 @@
<include name="CalculatorService_schema1.xsd"/>
</fileset>
</jar>
-
+
<!-- Step2. Build the service assembly -->
<zip destfile="${basedir}/service_assembly/${jbi-component-su-assembly}.zip" basedir="${basedir}/service_assembly">
<include name="META-INF/jbi.xml"/>
<include name="${http-soap-bc-su}.jar"/>
<include name="${javaee-se-su}.war"/>
</zip>
-
+
</target>
- <target name="install" depends="init-common">
- <copy file="${env.S1AS_HOME}/jbi/sharedlibraries/wsdl/installer/wsdlsl.jar" todir="${servicemix-autodeploy-dir}"/>
- <echo message="Installing SunWSDLSharedLibrary..."/>
- <sleep seconds="10"/>
- <copy file="${env.S1AS_HOME}/jbi/components/javaeeserviceengine/installer/appserv-jbise.jar" todir="${servicemix-autodeploy-dir}"/>
- <echo message="Installing Java EE Service Engine..."/>
- <sleep seconds="15"/>
- </target>
-
- <target name="uninstall" depends="init-common">
- <delete file="${servicemix-autodeploy-dir}/appserv-jbise.jar"/>
- <echo message="Uninstalling Java EE Service Engine..."/>
- <sleep seconds="10"/>
- <delete file="${servicemix-autodeploy-dir}/wsdlsl.jar"/>
- <echo message="Uninstalling SunWSDLSharedLibrary..."/>
- <sleep seconds="10"/>
- </target>
-
- <target name="deploy" depends="assemble">
- <copy file="${basedir}/service_assembly/${jbi-component-su-assembly}.zip" todir="${servicemix-autodeploy-dir}"/>
- <sleep seconds="15"/>
- </target>
+ <target name="install" depends="init-common">
+ <copy file="${env.S1AS_HOME}/jbi/sharedlibraries/wsdl/installer/wsdlsl.jar" todir="${servicemix-autodeploy-dir}"/>
+ <echo message="Installing SunWSDLSharedLibrary..."/>
+ <sleep seconds="10"/>
+ <copy file="${env.S1AS_HOME}/jbi/components/javaeeserviceengine/installer/appserv-jbise.jar" todir="${servicemix-autodeploy-dir}"/>
+ <echo message="Installing Java EE Service Engine..."/>
+ <sleep seconds="15"/>
+ </target>
- <target name="undeploy">
- <delete file="${servicemix-autodeploy-dir}/${jbi-component-su-assembly}.zip"/>
- <sleep seconds="15"/>
- </target>
+ <target name="uninstall" depends="init-common">
+ <delete file="${servicemix-autodeploy-dir}/appserv-jbise.jar"/>
+ <echo message="Uninstalling Java EE Service Engine..."/>
+ <sleep seconds="10"/>
+ <delete file="${servicemix-autodeploy-dir}/wsdlsl.jar"/>
+ <echo message="Uninstalling SunWSDLSharedLibrary..."/>
+ <sleep seconds="10"/>
+ </target>
+
+ <target name="deploy" depends="assemble">
+ <copy file="${basedir}/service_assembly/${jbi-component-su-assembly}.zip" todir="${servicemix-autodeploy-dir}"/>
+ <sleep seconds="15"/>
+ </target>
+
+ <target name="undeploy">
+ <delete file="${servicemix-autodeploy-dir}/${jbi-component-su-assembly}.zip"/>
+ <sleep seconds="15"/>
+ </target>
<target name="compile" depends="init-common">
<antcall target="compile-common">
<param name="src" value="endpoint"/>
</antcall>
</target>
-
+
<target name="assemble-web" depends="init-common, compile">
<antcall target="pkg-war">
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-client">
<param name="test-wsdl-uri" value="provider/webservice/CalculatorService?WSDL"/>
<param name="client-src" value="client"/>
</antcall>
</target>
-
+
<target name="runtest" depends="assemble-client">
<echo message="Running SOAP Binding client"/>
<antcall target="run-client">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java
index c2fefe8..ef93dab 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java
@@ -28,41 +28,41 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/sm/bc_consumer_se_provider";
+ private static String testId = "jbi-serviceengine/sm/bc_consumer_se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer();
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer();
stat.printSummary(testId );
}
private void addUsingSOAPConsumer() {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:8192/calculatorendpoint/";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
- stat.addStatus(testId, stat.PASS);
- //System.out.println(" No Exception thrown");
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:8192/calculatorendpoint/";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ stat.addStatus(testId, stat.PASS);
+ //System.out.println(" No Exception thrown");
- } catch(Exception e) {
- e.printStackTrace();
- if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
- stat.addStatus(testId, stat.PASS);
- else {
- stat.addStatus(testId, stat.FAIL);
- System.out.println(" SOAPFaultException Not thrown");
- }
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
+ stat.addStatus(testId, stat.PASS);
+ else {
+ stat.addStatus(testId, stat.FAIL);
+ System.out.println(" SOAPFaultException Not thrown");
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java
index a279a2b..f1c0f31 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java
@@ -25,12 +25,12 @@
targetNamespace="http://example.com/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- return k;
- }
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml
index 287c050..f07df33 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml
index 930693b..dc26680 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml
index 7b48fda..e73bd32 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:javaesb="http://java.sun.com"
xmlns:tns="http://example.com/Calculator"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
+ <services binding-component="true">
<consumes interface-name="tns:CalculatorService"
link-type="standard"
- service-name="tns:CalculatorService"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
</services>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml
index 2f0ece3..c679213 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml
@@ -26,5 +26,5 @@
locationURI="http://localhost:8192/calculatorendpoint"
defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
/>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml
index a8360ec..2639278 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml
@@ -26,6 +26,6 @@
<target name="all">
<ant dir="se_consumerNprovider" target="all"/>
<ant dir="se_provider" target="all"/>
- <ant dir="se_consumer" target="all"/>
+ <ant dir="se_consumer" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties
index 0300108..6003a7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/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="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml
index 65d6dc5..bb98f0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -110,11 +110,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java
index e6aafe7..2e5ce4b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/soapfault/se_consumer";
+ private static String testId = "jbi-serviceengine/soapfault/se_consumer";
public boolean found1 = false;
@@ -47,8 +47,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -63,7 +63,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Exception thrown Successfully") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java
index dc0b90f..fc3b358 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java
@@ -26,13 +26,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- throw new java.lang.Exception("This is my exception");
- //return k;
- }
+ throw new java.lang.Exception("This is my exception");
+ //return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
index e48a408..9464b01 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
@@ -28,37 +28,37 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
int ret = port.add(1, 2);
- printFailure(out);
+ printFailure(out);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- if(e instanceof service.web.example.calculator.Exception_Exception) {
- printSuccess(out);
- }
+ e.printStackTrace();
+ if(e instanceof service.web.example.calculator.Exception_Exception) {
+ printSuccess(out);
+ }
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -71,7 +71,7 @@
}
public void printSuccess(PrintWriter out) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties
index 0300108..6003a7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/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="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml
index 9424e88..d251b75 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -110,11 +110,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java
index 61c6e43..520f2ea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/soapfault/se_consumerNprovider";
+ private static String testId = "jbi-serviceengine/soapfault/se_consumerNprovider";
public boolean found1 = false;
@@ -47,8 +47,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -63,7 +63,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Exception thrown Successfully") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java
index 098fa9d..49894ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java
@@ -26,23 +26,23 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- throw new java.lang.Exception("This is my exception...");
- //return k;
- }
+ throw new java.lang.Exception("This is my exception...");
+ //return k;
+ }
/*
- @WebMethod(operationName="subtract", action="urn:Subtract")
- @Oneway
- public void subtract(int i, int j) {
+ @WebMethod(operationName="subtract", action="urn:Subtract")
+ @Oneway
+ public void subtract(int i, int j) {
int k = i -j ;
System.out.println(i + "-" + j +" = " + k);
- if(i == 101)
- throw new RuntimeException("This is my exception in subtract ...");
- }
+ if(i == 101)
+ throw new RuntimeException("This is my exception in subtract ...");
+ }
*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
index d185f6f..2f7b478 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
@@ -28,35 +28,35 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
int ret = port.add(1, 2);
- printFailure(out);
+ printFailure(out);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- printSuccess(out);
+ e.printStackTrace();
+ printSuccess(out);
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -69,7 +69,7 @@
}
public void printSuccess(PrintWriter out) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties
index 68987bd..7200f32 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/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="calculatorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml
index 8fe560b..242abf3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml
@@ -34,7 +34,7 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest,undeploy"/>
+ <target name="all" depends="clean, setup, runtest,undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java
index c75060d..b433e3d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java
@@ -28,53 +28,53 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/soapfault/se_provider";
+ private static String testId = "jbi-serviceengine/soapfault/se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer();
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer();
stat.printSummary(testId );
}
private void addUsingSOAPConsumer() {
- com.example.calculator.Calculator port= null;
+ com.example.calculator.Calculator port= null;
port = service.getCalculatorPort();
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
- String failedMsg = null;
+ String failedMsg = null;
- try {
- System.out.println("\nInvoking throwRuntimeException");
- port.throwRuntimeException("bhavani");
- } catch(Exception ex) {
- System.out.println(ex);
- if(!(ex instanceof RuntimeException) ||
- !(ex.getMessage().equals("Calculator :: Threw Runtime Exception"))) {
- failedMsg = "port.throwRuntimeException() did not receive RuntimeException 'Calculator :: Threw Runtime Exception'";
- }
- }
+ try {
+ System.out.println("\nInvoking throwRuntimeException");
+ port.throwRuntimeException("bhavani");
+ } catch(Exception ex) {
+ System.out.println(ex);
+ if(!(ex instanceof RuntimeException) ||
+ !(ex.getMessage().equals("Calculator :: Threw Runtime Exception"))) {
+ failedMsg = "port.throwRuntimeException() did not receive RuntimeException 'Calculator :: Threw Runtime Exception'";
+ }
+ }
- try {
- System.out.println("\nInvoking throwApplicationException");
- port.throwApplicationException("bhavani");
- } catch(Exception ex) {
- System.out.println(ex);
- if(!(ex instanceof com.example.calculator.Exception_Exception)) {
- failedMsg = "port.throwApplicationException() did not throw ApplicationException";
- }
- }
+ try {
+ System.out.println("\nInvoking throwApplicationException");
+ port.throwApplicationException("bhavani");
+ } catch(Exception ex) {
+ System.out.println(ex);
+ if(!(ex instanceof com.example.calculator.Exception_Exception)) {
+ failedMsg = "port.throwApplicationException() did not throw ApplicationException";
+ }
+ }
- if(failedMsg != null) {
- stat.addStatus(testId, stat.FAIL);
- } else {
- stat.addStatus(testId, stat.PASS);
- }
+ if(failedMsg != null) {
+ stat.addStatus(testId, stat.FAIL);
+ } else {
+ stat.addStatus(testId, stat.PASS);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java
index 6d87634..10190ca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java
@@ -28,7 +28,7 @@
public class Calculator {
public Calculator() {}
-
+
@WebMethod(operationName="throwRuntimeException", action="urn:ThrowRuntimeException")
public String throwRuntimeException(String name) {
String exceptionMsg = "Calculator :: Threw Runtime Exception";
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties
index 6ae49c8..0c8dea5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/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="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value=".consumer//web.xml"/>
<property name="sun-web.xml" value="./consumer/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml
index 2799738..157e540 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml
@@ -56,7 +56,7 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="compile" depends="init-common">
<antcall target="compile-common">
<param name="src" value="provider/endpoint"/>
@@ -98,7 +98,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="consumer" destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./consumer/client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./consumer/client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -176,12 +176,12 @@
<arg line="${appname}-web"/>
</exec>
</target>
-
+
<target name="runtest" depends="init-common">
<echo message="Running the test client"/>
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="consumer/client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java
index 466e35c..b7662d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml
index 918a957..d635f53 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_web_calculator_consumer_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_web_calculator_consumer_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml
index 5c66b9e..06f6aaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml
@@ -28,5 +28,5 @@
service-name="tns:CalculatorService"
endpoint-name="Calculator"/>
<javaesb:artifactstype>WSDL20</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml
index 676de20..3545ae9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>CalculatorPort</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>CalculatorPort</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>CalculatorPort</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CalculatorPort</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
index e653d46..b38ca7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java
index 6951320..bed1e0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml
index df81455..774ac6d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_web_calculator_provider_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_web_calculator_provider_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml
index 8f38d07..7546ec9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml
@@ -28,5 +28,5 @@
service-name="tns:CalculatorService"
endpoint-name="Calculator"/>
<javaesb:artifactstype>WSDL20</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties
index 3f83010..e302d5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/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="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml
index dba069b..fe23a88 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="webclient/**"/>
<copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
<copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
@@ -111,11 +111,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java
index 5e865d0..c49f5b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
index b522b9f..232817b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
@@ -27,14 +27,14 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
index ba46619..3db57bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
@@ -30,22 +30,22 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
- UserTransaction ut = null;
+ UserTransaction ut = null;
try {
- ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
- ut.begin();
+ ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
+ ut.begin();
System.out.println(" Service is :" + service);
Calculator port = service.getCalculatorPort();
int ret = port.add(1, 2);
- ut.commit();
+ ut.commit();
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
@@ -62,12 +62,12 @@
out.flush();
out.close();
} catch(Exception e) {
- try {
- if(ut != null)
- ut.rollback();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ if(ut != null)
+ ut.rollback();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
e.printStackTrace();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/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="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml
index c169d21..05ecd1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java
index 93df6bf..d5a819b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
index 249df90..452c694 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
@@ -35,36 +35,36 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_cm";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_cm";
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, "Vikas", "vikas@sun.com");
- readData(con, tableName);
+ updateTable(con, tableName, "Vikas", "vikas@sun.com");
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- //ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ //ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
index 52a6554..15b4479 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,21 +45,21 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_cm. This name will be used in the EJB
- String tableName = "CUSTOMER_cm";
- String nameEntry = "Vikas";
- String emailEntry= "vikas@sun.com";
+ String tableName = "CUSTOMER_cm";
+ String nameEntry = "Vikas";
+ String emailEntry= "vikas@sun.com";
try {
- Connection con = ds.getConnection();
+ Connection con = ds.getConnection();
// autocommit is made true so that the table is created and dropped immediately
con.setAutoCommit(true);
- createTable(con, tableName);
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
if(ut.getStatus() != Status.STATUS_ACTIVE) {
@@ -85,15 +85,15 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
@@ -106,19 +106,19 @@
// Check whether the EJB webservice has updated the data in the table.
private boolean isDataUpdated(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
- ResultSet rs = pStmt.executeQuery();
- try {
- while(rs.next()) {
- String db_Name = rs.getString(1);
- String db_Email = rs.getString(2);
- System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
- if(db_Name.equals(name) && db_Email.equals(email))
- return true;
- }
- } finally {
- rs.close();
- }
- return false;
+ PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
+ ResultSet rs = pStmt.executeQuery();
+ try {
+ while(rs.next()) {
+ String db_Name = rs.getString(1);
+ String db_Email = rs.getString(2);
+ System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
+ if(db_Name.equals(name) && db_Email.equals(email))
+ return true;
+ }
+ } finally {
+ rs.close();
+ }
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/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="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml
index c169d21..05ecd1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java
index 89353c1..af512dc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
index b0b504e..b5e84b3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
@@ -35,39 +35,39 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_cm1";
- String nameEntry = "Vikas";
- String emailEntry= "vikas@sun.com";
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_cm1";
+ String nameEntry = "Vikas";
+ String emailEntry= "vikas@sun.com";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, nameEntry, emailEntry);
- readData(con, tableName);
+ updateTable(con, tableName, nameEntry, emailEntry);
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- //ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ //ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
index 5d45796..fcf0d00 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,31 +45,31 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_cm1. This name will be used in the EJB
- String tableName = "CUSTOMER_cm1";
- String[] names = {"Vikas", "VikasAwasthi"};
- String[] emails= {"vikas@sun.com", "VikasA@sun.com"};
+ String tableName = "CUSTOMER_cm1";
+ String[] names = {"Vikas", "VikasAwasthi"};
+ String[] emails= {"vikas@sun.com", "VikasA@sun.com"};
try {
- Connection con = ds.getConnection();
- createTable(con, tableName);
+ Connection con = ds.getConnection();
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
- updateTable(con, tableName, names[1], emails[1]);
+ updateTable(con, tableName, names[1], emails[1]);
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
- if(ut.getStatus() != Status.STATUS_ACTIVE) {
+ if(ut.getStatus() != Status.STATUS_ACTIVE) {
ret += "FAILED";
- } else {
- System.out.println("**** committing transaction");
- ut.commit();
- if(!isDataUpdated(con, tableName, names, emails)) {
- ret += "FAILED";
+ } else {
+ System.out.println("**** committing transaction");
+ ut.commit();
+ if(!isDataUpdated(con, tableName, names, emails)) {
+ ret += "FAILED";
}
- }
+ }
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
@@ -83,55 +83,55 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- // autocommit is made true so that the table is created immediately
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ // autocommit is made true so that the table is created immediately
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
private void dropTable(Connection con, String tableName) throws Exception {
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
PreparedStatement pStmt = con.prepareStatement("DROP TABLE "+tableName);
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
// Check whether the EJB webservice has updated the data in the table.
private boolean isDataUpdated(Connection con, String tableName, String[] names, String[] emails) throws Exception {
- PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
- ResultSet rs = pStmt.executeQuery();
- int allDataCount = 0;
- while(rs.next()) {
- String db_Name = rs.getString(1);
- String db_Email = rs.getString(2);
- System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
- for (int i=0; i < names.length; i++)
- if(db_Name.equals(names[i]) && db_Email.equals(emails[i]))
- allDataCount++;
- }
- rs.close();
- return (allDataCount == names.length);
+ PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
+ ResultSet rs = pStmt.executeQuery();
+ int allDataCount = 0;
+ while(rs.next()) {
+ String db_Name = rs.getString(1);
+ String db_Email = rs.getString(2);
+ System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
+ for (int i=0; i < names.length; i++)
+ if(db_Name.equals(names[i]) && db_Email.equals(emails[i]))
+ allDataCount++;
+ }
+ rs.close();
+ return (allDataCount == names.length);
}
- private void updateTable(Connection con, String tableName, String name, String email)
- throws Exception {
- PreparedStatement pStmt =
- con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
- pStmt.executeUpdate();
+ private void updateTable(Connection con, String tableName, String name, String email)
+ throws Exception {
+ PreparedStatement pStmt =
+ con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
+ pStmt.executeUpdate();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/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="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml
index c169d21..05ecd1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java
index 1d33eab..6db83c0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
index 91ea7e6..053ddbb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
@@ -35,36 +35,36 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_rb";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_rb";
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, "Vikas", "vikas@sun.com");
- readData(con, tableName);
+ updateTable(con, tableName, "Vikas", "vikas@sun.com");
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
index b23f0fb..9f00acf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,26 +45,26 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_rb. This name will be used in the EJB
- String tableName = "CUSTOMER_rb";
+ String tableName = "CUSTOMER_rb";
try {
- Connection con = ds.getConnection();
- con.setAutoCommit(true);
- createTable(con, tableName);
+ Connection con = ds.getConnection();
+ con.setAutoCommit(true);
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
- if(ut.getStatus() != Status.STATUS_MARKED_ROLLBACK) {
+ if(ut.getStatus() != Status.STATUS_MARKED_ROLLBACK) {
ret += "FAILED";
- }
- System.out.println("**** rollbacking transaction");
- ut.rollback();
- if(isDataPresent(con, tableName)) {
+ }
+ System.out.println("**** rollbacking transaction");
+ ut.rollback();
+ if(isDataPresent(con, tableName)) {
ret += "FAILED";
}
PrintWriter out = resp.getWriter();
@@ -80,15 +80,15 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
@@ -101,15 +101,15 @@
// Check whether the EJB webservice has updated the data in the table.
private boolean isDataPresent(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
- ResultSet rs = pStmt.executeQuery();
- while(rs.next()) {
- String db_Name = rs.getString(1);
- String db_Email = rs.getString(2);
- System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
- rs.close();
- return true;
- }
- return false;
+ PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
+ ResultSet rs = pStmt.executeQuery();
+ while(rs.next()) {
+ String db_Name = rs.getString(1);
+ String db_Email = rs.getString(2);
+ System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
+ rs.close();
+ return true;
+ }
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/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="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml
index c169d21..05ecd1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<target name="runtest" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
includes="client/**"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<java classname="client.TestClient">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml
@@ -20,7 +20,7 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<description>A test application</description>
<display-name>WebTier</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java
index 293b817..be9d25e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
index 8d2468d..494ec81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
@@ -35,39 +35,39 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_rb1";
- String nameEntry = "Vikas";
- String emailEntry= "vikas@sun.com";
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_rb1";
+ String nameEntry = "Vikas";
+ String emailEntry= "vikas@sun.com";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, nameEntry, emailEntry);
- readData(con, tableName);
+ updateTable(con, tableName, nameEntry, emailEntry);
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- //ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ //ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml
@@ -18,30 +18,30 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
index 44286cb..52c5be7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,25 +45,25 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_rb1. This name will be used in the EJB
- String tableName = "CUSTOMER_rb1";
+ String tableName = "CUSTOMER_rb1";
String[] names = {"Vikas", "VikasAwasthi"};
String[] emails= {"vikas@sun.com", "VikasA@sun.com"};
try {
- Connection con = ds.getConnection();
- createTable(con, tableName);
+ Connection con = ds.getConnection();
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
- updateTable(con, tableName, names[1], emails[1]);
+ updateTable(con, tableName, names[1], emails[1]);
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
- System.out.println("**** rollbacking transaction");
- ut.rollback();
-
- if(isDataPresent(con, tableName)) {
+ System.out.println("**** rollbacking transaction");
+ ut.rollback();
+
+ if(isDataPresent(con, tableName)) {
ret += "FAILED";
}
@@ -80,30 +80,30 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- // autocommit is made true so that the table is created immediately
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ // autocommit is made true so that the table is created immediately
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
private void dropTable(Connection con, String tableName) throws Exception {
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
PreparedStatement pStmt = con.prepareStatement("DROP TABLE "+tableName);
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
// Check whether the EJB webservice has updated the data in the table.
@@ -120,12 +120,12 @@
return false;
}
- private void updateTable(Connection con, String tableName, String name, String email)
- throws Exception {
- PreparedStatement pStmt =
- con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
- pStmt.executeUpdate();
+ private void updateTable(Connection con, String tableName, String name, String email)
+ throws Exception {
+ PreparedStatement pStmt =
+ con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
+ pStmt.executeUpdate();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
index 7bfba78..0afe722 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="signature"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
index b58f877..d5bef0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -53,11 +53,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . -mapping SignatureMapping_appclient.xml -Xprintstacktrace -Xdebugmodel:appclient.model.txt wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/signature">
- <fileset dir="output/signature"
+ <fileset dir="output/signature"
includes="SignatureTestService.class, SignatureTest.class, MyDateValueType.class, MySecondDateValueType.class"/>
</copy>
<!--
@@ -70,7 +70,7 @@
<param name="src" value="signatureejb"/>
</antcall>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-define -classpath ${build.classes.dir} -mapping SignatureMapping_ejb.xml -Xprintstacktrace -Xdebugmodel:ejb.model.txt wscompile_config_ejb.xml"/>
</antcall>
</target>
@@ -78,24 +78,24 @@
<target name="assemble" depends="init-common, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SignatureTestService.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="SignatureMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="SignatureMapping_appclient.xml,META-INF/wsdl/**,signature/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="SignatureMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="SignatureMapping_ejb.xml,META-INF/wsdl/**,signatureejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -114,19 +114,19 @@
<target name="run" depends="init-common">
<exec executable="${APPCLIENT}" failonerror="false">
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
+ <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
<arg line="http://${http.host}:${http.port}/signatureejb/SignatureTest"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java
index 80ca908..1738490 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java
@@ -28,25 +28,25 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-signature");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-signatureID");
}
-
+
public void doTest(String[] args) {
- try {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
SignatureTestService testService =
(SignatureTestService) ic.lookup("java:comp/env/service/signature");
SignatureTest test = testService.getSignatureTestPort();
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
@@ -58,13 +58,13 @@
System.out.println("MSG: " + msg);
stat.addStatus("signature SEI.sayHello(msg)", stat.PASS);
} catch (Exception e1) {
- e1.printStackTrace();
+ e1.printStackTrace();
stat.addStatus("signature SEI.sayHello(msg)", stat.FAIL);
}
/* uncomment the following when the date->calendar is done
- MySecondDateValueType d =
+ MySecondDateValueType d =
new MySecondDateValueType(new java.util.GregorianCalendar(), "Suck it up and do it!");
MyDateValueType c = new MyDateValueType();
c.setDate(new java.util.GregorianCalendar());
@@ -83,7 +83,7 @@
try {
test.setMyDateValueType(c);
MyDateValueType date2 = test.getMyDateValueType();
- System.out.println("RETURNED ANOTHER LUCKY DATE = "
+ System.out.println("RETURNED ANOTHER LUCKY DATE = "
+ date2.getDate() + "; with message = " + date2.getWhine());
stat.addStatus("signature SEI.setValueTypeWithDate", stat.PASS);
@@ -107,10 +107,10 @@
stat.addStatus("signature SEI.setValueTypeWithDates", stat.FAIL);
}
*/
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("signature client test failed");
ex.printStackTrace();
stat.addStatus("signature client main", stat.FAIL);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
index fd3f1ab..dffacb6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
@@ -27,6 +27,6 @@
<wsdl-file>META-INF/wsdl/SignatureTestService.wsdl</wsdl-file>
<jaxrpc-mapping-file>SignatureMapping_appclient.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="http://signature.org/wsdl">servicens:SignatureTestService
- </service-qname>
+ </service-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java
index 64f30b4..5c864da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java
@@ -25,7 +25,7 @@
public MyDateValueType() {}
- public MyDateValueType(Date date, java.lang.String whine,
+ public MyDateValueType(Date date, java.lang.String whine,
MySecondDateValueType[] dates) {
this.date = date;
this.whine = whine;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
index 26fd613..d60d3fa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
@@ -17,7 +17,7 @@
package signatureejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,55 +33,55 @@
private MyDateValueType[] myDates;
public SignatureEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SignatureEJB::ejbCreate !!");
+ System.out.println("In SignatureEJB::ejbCreate !!");
}
public void SetTestDate(java.util.Date testDate) {
- System.out.println("In SignatureEJB::setTestDate = " + testDate);
+ System.out.println("In SignatureEJB::setTestDate = " + testDate);
date = testDate;
}
public java.util.Date GetTestDate() {
- System.out.println("In SignatureEJB::getTestDate !!");
+ System.out.println("In SignatureEJB::getTestDate !!");
return date;
}
public void setMyDateValueType(MyDateValueType mytestdate) {
- System.out.println("In SignatureEJB::setMyDateValueType: date = "
+ System.out.println("In SignatureEJB::setMyDateValueType: date = "
+ mytestdate.getDate() + " ; whine = " + mytestdate.getWhine());
myDate = mytestdate;
}
public MyDateValueType getMyDateValueType() {
- System.out.println("In SignatureEJB::getMyDateValueType !!");
+ System.out.println("In SignatureEJB::getMyDateValueType !!");
return myDate;
}
public void setMyDateValueTypes(MyDateValueType[] mytestdates) {
- System.out.println("In SignatureEJB::setMyDateValueTypes: dates.size = "
+ System.out.println("In SignatureEJB::setMyDateValueTypes: dates.size = "
+ mytestdates.length);
myDates = mytestdates;
}
public MyDateValueType[] getMyDateValueTypes() {
- System.out.println("In SignatureEJB::getMyDateValueTypes !!");
+ System.out.println("In SignatureEJB::getMyDateValueTypes !!");
return myDates;
}
public String SayHello(String msg) {
- System.out.println("In SignatureEJB::SayHello !!");
+ System.out.println("In SignatureEJB::SayHello !!");
return "Hello! " + msg;
}
-
+
public void setSessionContext(SessionContext sc) {
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
index 8732c3c..cc694df 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SignatureTestService.wsdl"
packageName="signature"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml
index deab13f..4afbf5e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="ns2package.wsdl"
packageName="ns2package"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/report.xml b/appserver/tests/appserv-tests/devtests/webservice/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/report.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties
index 18d8f0e..b251c64 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/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="rpcencodedOneway"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -26,13 +26,13 @@
<property name="web.xml" value="descriptor/web.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.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="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
<property name="mappingfile.location" value="${basedir}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml
index a5afd3f..0f314d0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -43,9 +43,9 @@
-->
<target name="all" depends="simple-mapping, full-mapping"/>
- <target name="simple-mapping"
+ <target name="simple-mapping"
depends="build-simple-mapping,deploy,assemble-client, run,undeploy"/>
- <target name="full-mapping"
+ <target name="full-mapping"
depends="build-full-mapping,deploy,run,undeploy"/>
<target name="compile" depends="">
@@ -77,32 +77,32 @@
<param name="hasWebclient" value="yes"/>
</antcall>
<antcall target="ear-common" />
- </target>
-
+ </target>
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
+ </antcall>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SimpleTest.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="NoMetadata.SimpleTest.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="NoMetadata.SimpleTest.xml"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="NoMetadata.SimpleTest.xml,META-INF/wsdl/**,rpcencoded/*.class,com/**" />
- </antcall>
+ </antcall>
<move file="${assemble.dir}/${appname}-client.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}//RPCEncodedOneway/Hello"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -116,19 +116,19 @@
<delete file ="/tmp/debugModel.txt"/>
<delete file ="/tmp/debugModel.model"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="wscompile" depends="init-common">
<mkdir dir="vo_output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d vo_output -classpath . wscompile_config.xml"/>
</antcall>
<copy todir="${build.classes.dir}/rpcencoded">
- <fileset dir="vo_output/rpcencoded"
+ <fileset dir="vo_output/rpcencoded"
includes="Hello.class"/>
</copy>
<delete dir="vo_output"/>
@@ -139,23 +139,23 @@
<mkdir dir="output"/>
<antcall target="run.wscompile">
<!-- use model -->
-<!--
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:onewayModel.txt -model ${mappingfile.name} wscompile_config.xml"/>
+<!--
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:onewayModel.txt -model ${mappingfile.name} wscompile_config.xml"/>
-->
<!-- use mapping -->
- <param name="wscompile.command"
- value="-import -cp . -keep -d output -Xdebugmodel:onewayModel.txt -mapping ${mappingfile.name} wscompile_config.xml"/>
+ <param name="wscompile.command"
+ value="-import -cp . -keep -d output -Xdebugmodel:onewayModel.txt -mapping ${mappingfile.name} wscompile_config.xml"/>
</antcall>
<delete dir="output"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant clean
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant clean
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
index 03f2404..b3bd06f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
@@ -27,7 +27,7 @@
public class HelloImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
private boolean gotInit = false;
-
+
public void init(Object o) {
System.out.println("Got ServiceLifecycle::init call " + o);
gotInit = true;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml
index a3249e7..235fd41 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SimpleTest.wsdl"
packageName="rpcencoded">
</wsdl>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties
index f52b31e..5a276db 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/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="rpclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml
index 93f91a0..a2eba0a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -52,17 +52,17 @@
<target name="assemble" depends="init-common, build, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SimpleTest.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="RpcLitMapping.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="RpcLitMapping.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="RpcLitMapping.xml,META-INF/wsdl/**,rpclit/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -76,19 +76,19 @@
<target name="run" depends="init-common">
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config.xml"/>
</antcall>
<copy todir="${build.classes.dir}/rpclit">
- <fileset dir="output/rpclit"
+ <fileset dir="output/rpclit"
includes="SimpleTest.class,EchoStringType.class,StringResponseNameType.class"/>
</copy>
<delete dir="output"/>
@@ -99,23 +99,23 @@
<mkdir dir="output"/>
<antcall target="run.wscompile">
<!-- use model -->
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model RpcLitMapping.xml wscompile_config.xml"/>
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model RpcLitMapping.xml wscompile_config.xml"/>
<!-- use mapping -->
-<!--
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
+<!--
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
-->
</antcall>
<delete dir="output"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant clean
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant clean
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
index c0b592e..1e2b4f3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
@@ -15,7 +15,7 @@
*/
/*
- * @(#)SimpleTestImpl.java 1.3 02/04/05
+ * @(#)SimpleTestImpl.java 1.3 02/04/05
*/
package rpclit;
@@ -37,7 +37,7 @@
public SimpleTestImpl(){}
- public EchoStringType echoString(StringResponseNameType v)
+ public EchoStringType echoString(StringResponseNameType v)
throws RemoteException
{
return null; //for now
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml
index 7df0d33..cc296d1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SimpleTest.wsdl"
packageName="rpclit"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/run_test.sh b/appserver/tests/appserv-tests/devtests/webservice/run_test.sh
index 7f1e505..34f882f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/webservice/run_test.sh
@@ -45,11 +45,11 @@
}
get_test_target(){
- case ${1} in
- webservice_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ webservice_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
index 0b38bee..ba913f0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
@@ -28,7 +28,7 @@
&commonSetup;
&commonBuild;
&reporting;
-
+
<target name="check-nss" depends="init-common">
<!--
Determine if we need to use the certutil or the keytool command to
@@ -47,8 +47,8 @@
</and>
</condition>
</target>
-
-
+
+
<target name="setup" depends="init-common, check-nss">
<echo message="Creating the valid certificate in kestore.jks"/>
<exec executable="${java.home}/bin/keytool" failonerror="false">
@@ -77,12 +77,12 @@
<arg value="${ssl.password}"/>
<arg value="-dname"/>
<arg value="cn=Unknown Duke, ou=Prog, o=HackSoft, c=US"/>
- </exec>
+ </exec>
<antcall target="setup-pe"/>
<antcall target="setup-ee"/>
</target>
-
-
+
+
<target name="setup-pe" depends="init-common" unless="use.certutil">
<echo message="Exporting appserver public key from ${admin.domain}"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
@@ -95,20 +95,20 @@
<echo message="Extracting tester public key"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-export -alias s1astester -keystore keystore.jks -storepass ${ssl.password} -file client.cer"/>
- </exec>
+ </exec>
<echo message="Importing tester public key in appserver trusted certificates"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-import -noprompt -alias s1astester -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/cacerts.jks -storepass ${ssl.password} -file client.cer"/>
</exec>
<antcall target="restart-pe-server"/>
</target>
-
+
<target name="setup-ee" depends="init-common" if="use.certutil">
<echo message="Exporting appserver public key from ${admin.domain}"/>
<exec executable ="${env.S1AS_HOME}/lib/certutil" failonerror="true">
<env key="LD_LIBRARY_PATH" path="${env.S1AS_HOME}/lib"/>
- <arg line="-L -n s1as -d ${env.S1AS_HOME}/domains/${admin.domain}/config -a -o appserver.cer"/>
- </exec>
+ <arg line="-L -n s1as -d ${env.S1AS_HOME}/domains/${admin.domain}/config -a -o appserver.cer"/>
+ </exec>
<echo message="Importing the Appserver certificate on the client keystore"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
@@ -117,7 +117,7 @@
<echo message="Extracting tester public key"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-export -rfc -alias s1astester -keystore keystore.jks -storepass ${ssl.password} -file client.cer"/>
- </exec>
+ </exec>
<echo message="Importing tester public key in appserver trusted certificates"/>
<exec executable ="${env.S1AS_HOME}/lib/certutil" failonerror="true">
<env key="LD_LIBRARY_PATH" path="${env.S1AS_HOME}/lib"/>
@@ -125,7 +125,7 @@
</exec>
<antcall target="restart-ee-server"/>
</target>
-
+
<target name="restart-pe-server">
<echo message="Restarting PE server..."/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -151,20 +151,20 @@
<delete file="invalid_keystore.jks"/>
<delete file="keystore.jks"/>
<delete file="appserver.cer"/>
- <delete file="client.cer"/>
+ <delete file="client.cer"/>
<antcall target="unsetup-pe"/>
<antcall target="unsetup-ee"/>
</target>
-
-
+
+
<target name="unsetup-pe" depends="init-common" unless="use.certutil">
<echo message="Removing tester public key from appserver trusted certificates"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-delete -alias s1astester -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/cacerts.jks -storepass ${ssl.password}"/>
- </exec>
+ </exec>
<antcall target="restart-pe-server"/>
- </target>
-
+ </target>
+
<target name="unsetup-ee" depends="init-common" if="use.certutil">
<echo message="Removing tester public key from appserver trusted certificates"/>
<exec executable ="${env.S1AS_HOME}/lib/certutil" failonerror="true">
@@ -172,28 +172,28 @@
<arg line="-D -n s1astester -d ${env.S1AS_HOME}/domains/${admin.domain}/config"/>
</exec>
<antcall target="restart-ee-server"/>
- </target>
+ </target>
<target name="all">
<antcall target="setup"/>
<ant dir="ejb_ssl_cacert" target="all"/>
- <ant dir="ejb3_ssl_cacert" target="all"/>
+ <ant dir="ejb3_ssl_cacert" target="all"/>
<antcall target="unsetup"/>
</target>
<target name="clean">
<delete>
- <fileset dir="${basedir}"
+ <fileset dir="${basedir}"
includes="**.output, count.txt"/>
</delete>
<ant dir="ejb_ssl_cacert" target="clean"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the webservice security tests)
+ <echo>
+ Usage:
+ ant all (Executes all the webservice security tests)
- ant ejb_ssl_cacert (Executes the client certificate ejb ssl endpoint test)
- </echo>
+ ant ejb_ssl_cacert (Executes the client certificate ejb ssl endpoint test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/common.xml b/appserver/tests/appserv-tests/devtests/webservice/security/common.xml
index 7dd6f79..6961891 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/common.xml
@@ -18,15 +18,15 @@
<!-- run appclient in AppServ -->
<target name="runclient-secure" depends="init-common">
-
+
<echo message="Executing appclient at Basedir:${basedir}" />
- <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
+ <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
/>
<echo message="Appname: ${appname}" />
<echo message="Display name for appclient: ${appname}Client" />
<echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
+ <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
<arg line="-name ${appname}Client"/>
<arg line="-textauth"/>
@@ -35,19 +35,19 @@
<arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
<arg line="${appclient.application.args}"/>
</exec>
- </target>
-
+ </target>
+
<!-- run appclient in AppServ -->
<target name="runclient-invalid-secure" depends="init-common">
-
+
<echo message="Executing appclient at Basedir:${basedir}" />
- <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
+ <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
/>
<echo message="Appname: ${appname}" />
<echo message="Display name for appclient: ${appname}Client" />
<echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../invalid_keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
+ <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../invalid_keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
<arg line="-name ${appname}Client"/>
<arg line="-textauth"/>
@@ -56,4 +56,4 @@
<arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
<arg line="${appclient.application.args}"/>
</exec>
- </target>
+ </target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml
index 7c85409..1418c5c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml
@@ -26,18 +26,18 @@
<project name="EJB3_SSL_CACERT" default="core" basedir=".">
- &commonAnnotations;
+ &commonAnnotations;
&commonSetup;
&commonBuild;
&common;
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<property name="app-client-parameters" value="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
-
+
<target name="test-build">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="test-compile"/>
<echo message="Building with package ${pkg-name}"/>
<jar destfile="${env.APS_HOME}/build/module/archive/${server}.jar"
@@ -45,28 +45,28 @@
includes="${pkg-name}/**">
<metainf dir="${pkg-name}"
includes="*.xml"/>
- </jar>
+ </jar>
</target>
-
+
<target name="test-deploy" depends="test-build">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="true">
<arg line="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} ${env.APS_HOME}/build/module/archive/${server}.jar"/>
- </exec>
+ </exec>
</target>
<target name="test-undeploy">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="true">
<arg line="undeploy --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} ${server}"/>
- </exec>
- </target>
+ </exec>
+ </target>
<target name="test-prepare-client">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<antcall target="clean"/>
<mkdir dir="${env.APS_HOME}/build/module/classes"/>
<echo message="Create appclient jar file"/>
@@ -74,34 +74,34 @@
<arg line="-keep -d ${env.APS_HOME}/build/module/classes localwsdl/${server}Service.wsdl"/>
</exec>
<antcall target="compile-client"/>
- <antcall target="unjar-client-utils"/>
+ <antcall target="unjar-client-utils"/>
<jar destfile="${env.APS_HOME}/build/module/archive/HelloAppClient.jar">
<fileset dir="${env.APS_HOME}/build/module/classes"/>
<fileset dir="." includes="localwsdl/**"/>
<manifest>
- <attribute name="Main-Class" value="client.Client"/>
+ <attribute name="Main-Class" value="client.Client"/>
</manifest>
- </jar>
- </target>
+ </jar>
+ </target>
<target name="test-run">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<exec executable="${env.S1AS_HOME}/bin/appclient">
- <arg line="-client ${env.APS_HOME}/build/module/archive/HelloAppClient.jar FAILURE ejb-ssl-cacert-no-certificate-test"/>
- </exec>
+ <arg line="-client ${env.APS_HOME}/build/module/archive/HelloAppClient.jar FAILURE ejb-ssl-cacert-no-certificate-test"/>
+ </exec>
<antcall target="runclient-invalid-secure">
<param name="appname" value="Hello"/>
<param name="appclient.application.args"
value="FAILURE ejb-ssl-cacert-invalid-certificate-test"/>
- </antcall>
+ </antcall>
<antcall target="runclient-secure">
<param name="appname" value="Hello"/>
<param name="appclient.application.args"
value="SUCCESS ejb-ssl-cacert-valid-certificate-test"/>
- </antcall>
- </target>
-
+ </antcall>
+ </target>
+
<target name="all" depends="clean, test-deploy, test-prepare-client, test-run, test-undeploy">
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java
index 872a7bf..82b5970 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java
@@ -36,27 +36,27 @@
public static void main(String[] args) {
boolean successExpected=true;
String description;
- if (args.length>1) {
+ if (args.length>1) {
if (args[0].compareToIgnoreCase("Failure")==0) {
successExpected=false;
- }
+ }
description=args[1];
} else {
successExpected = false;
- description="webservices-ejb-rolesAllowed-annotation-negative";
- }
+ description="webservices-ejb-rolesAllowed-annotation-negative";
+ }
System.out.println("Starting test " + description);
- stat.addDescription(description);
+ stat.addDescription(description);
Client client = new Client();
client.doTest(description, successExpected);
- stat.printSummary(description);
+ stat.printSummary(description);
}
public void doTest(String desc, boolean successExpected) {
-
+
try {
HelloImpl port = service.getHelloImplPort();
-
+
String ret = port.sayHello("Appserver Tester !");
if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
index 3ac0fb9..6198896 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
@@ -26,5 +26,5 @@
public String sayHello(String who) {
return "WebSvcTest-Hello " + who;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml
index 4a1831f..9bc93c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml
@@ -23,11 +23,11 @@
<ejb>
<ejb-name>HelloImpl</ejb-name>
<webservice-endpoint>
- <port-component-name>HelloImpl</port-component-name>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
+ <port-component-name>HelloImpl</port-component-name>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <login-config>
+ <auth-method>CLIENT-CERT</auth-method>
+ </login-config>
</webservice-endpoint>
</ejb>
<webservice-description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties
index ff68a20..8d1274f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ws"/>
-<property name="appname" value="${module}-ejbtaxcal"/>
+<property name="appname" value="${module}-ejbtaxcal"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient"/>
+<property name="test.client"\u0020
+ value="com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient"/>
<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/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/ejb/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/client/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/client/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/client/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/client/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="wsdl-file" value="wsdl/TaxCalEjbService.wsdl"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml
index 8067c24..f2f6ec5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml
@@ -31,14 +31,14 @@
&commonSecurity;
&testproperties;
- <target name="all"
+ <target name="all"
depends="clean, build, deploy, run, undeploy"/>
<target name="run-test" depends="clean, build, deploy, run, undeploy"/>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="init-common,clean-common, generate-artifacts">
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -49,18 +49,18 @@
</target>
<target name="generate-artifacts">
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${ejb-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-ejb.xml"/>
- </antcall>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${client-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-client.xml"/>
- </antcall>
+ <antcall target="import-wsdl">
+ <param name="mapping.file"
+ value="${ejb-mapping.xml}"/>
+ <param name="config-wsdl.file"
+ value="config/config-ejb.xml"/>
+ </antcall>
+ <antcall target="import-wsdl">
+ <param name="mapping.file"
+ value="${client-mapping.xml}"/>
+ <param name="config-wsdl.file"
+ value="config/config-client.xml"/>
+ </antcall>
</target>
<target name="ws-package-appclientjar-common">
<mkdir dir="${assemble.dir}"/>
@@ -121,13 +121,13 @@
</target>
<target name="build" depends="init-common,compile">
- <antcall target="ws-package-ejb-jar-common">
- <param name="ejbjar.classes"
+ <antcall target="ws-package-ejb-jar-common">
+ <param name="ejbjar.classes"
value="com/sun/s1peqe/webservices/ejb/taxcal/*.class" />
<param name="ejbjar.files" value="${build.classes.dir}"/>
<param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- <antcall target="ws-package-appclientjar-common">
+ </antcall>
+ <antcall target="ws-package-appclientjar-common">
<param name="appclientjar.classes"
value="com/sun/s1peqe/webservices/ejb/taxcal/client/*.class" />
<param name="appclientjar.files"
@@ -137,20 +137,20 @@
</antcall>
<antcall target="ear-common"/>
- </target>
+ </target>
<target name="deploy"
depends="init-common, reconfig-common">
<antcall target="deploy-common"/>
</target>
-
-
+
+
<target name="run" depends="init-common">
- <property name="statetax-ejb-endpoint-url"
+ <property name="statetax-ejb-endpoint-url"
value="https://${http.host}:${https.port}/statetaxejb"/>
- <property name="fedtax-ejb-endpoint-url"
+ <property name="fedtax-ejb-endpoint-url"
value="https://${http.host}:${https.port}/fedtaxejb"/>
-
+
<echo message="property statetax-ejb-endpoint-url is set to: ${statetax-ejb-endpoint-url}"/>
<echo message="property fedtax-ejb-endpoint-url is set to: ${fedtax-ejb-endpoint-url}"/>
@@ -161,23 +161,23 @@
<antcall target="runclient-invalid-secure">
<param name="appclient.application.args"
value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False True"/>
- </antcall>
+ </antcall>
<antcall target="runclient-common">
<param name="appclient.application.args"
value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False False"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
- <!--
- =======================================================
+ <!--
+ =======================================================
User Defined specific targets
=======================================================
-->
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java
index 350e156..d91762f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java
@@ -30,12 +30,12 @@
private static String testSuite = "TaxCalEjbbasedWS";
private static String testCase = null;
private static TaxCalEjbService taxCalService = null;
-
+
public static void main(String[] args) {
-
+
boolean stateTaxIntendedResult=true;
boolean fedTaxIntendedResult=true;
-
+
if(args[0] == null || args[1] == null){
System.out.println("TaxCal client: Argument missing. Please provide target" +
"endpoint address as argument");
@@ -48,47 +48,47 @@
fedTaxIntendedResult = (new Boolean(args[3])).booleanValue();
}
}
-
+
stat.addDescription("This is to test ejb based webservice");
try {
TaxCalClient client = new TaxCalClient();
Context ic = new InitialContext();
taxCalService = (TaxCalEjbService)
ic.lookup("java:comp/env/service/TaxCalEjbService");
-
+
client.callStateTaxService(stateTaxIntendedResult);
client.callFedTaxService(fedTaxIntendedResult);
}catch(Exception e){
e.printStackTrace();
}
-
+
stat.printSummary(testSuite);
}
-
+
public void callStateTaxService(boolean intendedResult) {
double income = 85000.00;
double deductions = 5000.00;
-
+
//String targetEndpointAddress =
- // "http://localhost:1024/taxcalculator";
-
+ // "http://localhost:1024/taxcalculator";
+
try {
-
+
StateTaxIF taxCalIFPort = taxCalService.getStateTaxIFPort();
-
+
((Stub)taxCalIFPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
stateTaxEndpoint);
-
+
double stateTax = taxCalIFPort.getStateTax(income, deductions);
System.out.println("State tax from ejb based TaxCalService :" + stateTax);
-
+
if(stateTax == 24000.00 && intendedResult)
stat.addStatus(testSuite + " StateTaxPort", stat.PASS);
else {
- System.out.println("Call succeeded while it should have failed");
+ System.out.println("Call succeeded while it should have failed");
stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
}
-
+
} catch (Exception ex) {
if (intendedResult) {
System.out.println("TaxCalEjbWebservice client failed");
@@ -102,25 +102,25 @@
}
}
}
-
+
public void callFedTaxService(boolean intendedResult) {
double income = 97000.00;
double deductions = 7000.00;
try {
-
+
FedTaxIF taxCalIFPort = taxCalService.getFedTaxIFPort();
((Stub)taxCalIFPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
fedTaxEndpoint);
-
+
double fedTax = taxCalIFPort.getFedTax(income, deductions);
System.out.println("Fed tax from Ejb based TaxCalService :" + fedTax);
-
+
if(fedTax == 18000.00 && intendedResult)
stat.addStatus(testSuite + " FedTaxPort", stat.PASS);
else {
System.out.println("Call succeeded while it should have failed");
stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
- }
+ }
} catch (Exception ex) {
if (intendedResult) {
System.out.println("TaxCalEjbWebService client failed");
@@ -130,7 +130,7 @@
System.out.println("Expected Exception caught :");
System.out.println(ex.getMessage());
stat.addStatus(testSuite + "FedTaxPort", stat.PASS);
- }
+ }
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml
index 9df53d2..e55096d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="wsdl/TaxCalEjbService.wsdl"
packageName="com.sun.s1peqe.webservices.ejb.taxcal.client"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml
index 781ab1b..2afdcaa 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="wsdl/TaxCalEjbService.wsdl"
packageName="com.sun.s1peqe.webservices.ejb.taxcal"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml
index 2583c19..3aa33b1 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml
@@ -18,16 +18,16 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="TaxCalEjbService"
- targetNamespace="http://tax.org/wsdl"
- typeNamespace="http://tax.org/types"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal">
- <interface name="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF"
- servantName="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb"/>
- <interface name="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF"
- servantName="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb">
- </interface>
- </service>
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ <service name="TaxCalEjbService"
+ targetNamespace="http://tax.org/wsdl"
+ typeNamespace="http://tax.org/types"
+ packageName="com.sun.s1peqe.webservices.ejb.taxcal">
+ <interface name="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF"
+ servantName="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb"/>
+ <interface name="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF"
+ servantName="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb">
+ </interface>
+ </service>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
index fffddc9..5b7d729 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
@@ -28,10 +28,10 @@
<webservice-endpoint>
<port-component-name>StateTaxIFPort</port-component-name>
<endpoint-address-uri>statetaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <login-config>
+ <auth-method>CLIENT-CERT</auth-method>
+ </login-config>
</webservice-endpoint>
</ejb>
<ejb>
@@ -40,7 +40,7 @@
<webservice-endpoint>
<port-component-name>FedTaxIFPort</port-component-name>
<endpoint-address-uri>fedtaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
</webservice-endpoint>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
index f45cb45..edcf25c 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.webservices.ejb.taxcal;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class FedTaxEjb implements SessionBean {
private SessionContext sc;
-
+
public FedTaxEjb(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In FedTaxEjb::ejbCreate !!");
+ System.out.println("In FedTaxEjb::ejbCreate !!");
}
public double getFedTax(double income, double deductions) {
@@ -38,13 +38,13 @@
}
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java
index e4c1322..543fb54 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java
@@ -22,6 +22,6 @@
public interface FedTaxIF extends Remote{
- public double getFedTax(double income, double deductions) throws RemoteException;
+ public double getFedTax(double income, double deductions) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
index 78cea45..3357ecc 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
@@ -17,7 +17,7 @@
package com.sun.s1peqe.webservices.ejb.taxcal;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class StateTaxEjb implements SessionBean {
private SessionContext sc;
-
+
public StateTaxEjb(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In StateTaxEjb::ejbCreate !!");
+ System.out.println("In StateTaxEjb::ejbCreate !!");
}
public double getStateTax(double income, double deductions) {
@@ -38,13 +38,13 @@
}
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java
index 3e87a23..38ad453 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java
@@ -22,6 +22,6 @@
public interface StateTaxIF extends Remote{
- public double getStateTax(double income, double deductions) throws RemoteException;
+ public double getStateTax(double income, double deductions) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/report.xml b/appserver/tests/appserv-tests/devtests/webservice/security/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/report.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
index e2ea498..d08aa1d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
@@ -15,26 +15,26 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="simpleservlethandler"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
+<property name="ejbjar.files" value="${build.classes.dir}"/> \u0020
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.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="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
index 4ebd0f9..46b23e4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -46,53 +46,53 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
+ <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
+ <param name="wscompile.command"
+ value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
</antcall>
- </target>
-
+ </target>
+
<target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
+ <param name="hasWebclient" value="yes"/>
<param name="mappingfile.location" value="${build.classes.dir}"/>
<param name="mappingfile.name" value="SimpleHandlerMapping_servlet.xml"/>
<param name="wsdlfile.location" value="${build.classes.dir}/WEB-INF/wsdl"/>
<param name="wsdlfile.name" value="SimpleHandlerServlet.wsdl"/>
<param name="webwar.classes" value="servlet/*.class"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="assemble" depends="assemble-web, assemble-client"/>
-
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
+ </antcall>
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
+ </antcall>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}/ServletHandlerTest/ServletHandlerTest"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
+ <param name="contextroot" value="ServletHandlerTest"/>
+ </antcall>
<antcall target="deploy-client-common"/>
<move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
</target>
@@ -100,10 +100,10 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client-common"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
index 36fe9f5..86dd0ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
@@ -30,28 +30,28 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-simple-soapfault");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-soapfaultID");
}
-
+
public void doTest(String[] args) {
- try {
-
+ try {
+
String targetEndpointAddress = args[0];
-
+
Context ic = new InitialContext();
-
+
Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler");
SimpleServer test = (SimpleServer)
testService.getPort(SimpleServer.class);
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
-
+
System.out.println("endpoint address = " + targetEndpointAddress);
System.out.println("Invocation returned " + test.sayHello("jerome"));
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
index 07e1cb0..4b08059 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
+ <service
+ name="SimpleHandlerServlet"
+ targetNamespace="urn:HandlerTest"
+ typeNamespace="urn:HandlerTest"
packageName="handlertest">
<interface name="servlet.SimpleServer"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
index c14bb7a..d2d8301 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<description>simple handler service ref</description>
<service-ref-name>service/simplehandler</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
+ <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
<jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
+ <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
<port-component-ref>
<service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
index 336e4f8..f9f2117 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
@@ -22,23 +22,23 @@
public class ServletHandlerTestImpl implements SessionBean {
SessionContext sc;
-
+
public String sayHello(String hello) throws RemoteException {
return "salut " + hello;
}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleServer:::ejbCreate !!");
+ System.out.println("In SimpleServer:::ejbCreate !!");
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
- public void ejbPassivate() {}
+
+ public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
index 628a251..c985152 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
@@ -21,13 +21,13 @@
import javax.xml.rpc.handler.*;
public class SimpleHandler extends GenericHandler {
-
+
protected HandlerInfo info = null;
-
+
public void init(HandlerInfo info) {
this.info = info;
}
-
+
public boolean handleRequest(MessageContext context) {
try {
Date startTime = new Date();
@@ -37,7 +37,7 @@
}
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
try {
Date startTime = (Date) context.getProperty("startTime");
@@ -49,7 +49,7 @@
}
return true;
}
-
+
public QName[] getHeaders() {
return new QName[0];
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
index dc5cf26..0675cd2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
@@ -19,7 +19,7 @@
import java.rmi.*;
public interface SimpleServer extends Remote {
-
+
public String sayHello(String source) throws RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
index 4ac9d8f..965eeac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
@@ -21,13 +21,13 @@
import javax.xml.rpc.server.ServletEndpointContext;
public class WebServiceTestImpl implements ServiceLifecycle, WebServiceTest {
-
+
WebServiceTest delegate;
-
+
public void destroy() {
System.out.println("Driver servlet destroyed");
}
-
+
public void init(Object context) {
ServletEndpointContext seContext = (ServletEndpointContext) context;
String testClassName = seContext.getServletContext().getInitParameter("testclassname");
@@ -55,13 +55,13 @@
System.out.println("Error : cannot load delegate " + testClassName + " " + e.getMessage());
}
}
-
+
public String doTest(String[] params) throws RemoteException {
-
+
if (delegate!=null) {
return delegate.doTest(params);
} else {
throw new RemoteException("No delegate for test harness");
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml b/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
index 20a3d45..21c84b0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="WebServiceServletTest"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
+ <service
+ name="WebServiceServletTest"
+ targetNamespace="urn:WebServiceTest"
+ typeNamespace="urn:WebServiceTest"
packageName="test.webservice">
<interface name="test.webservice.WebServiceTest"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
index 4ac3352..aa07f94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
@@ -15,26 +15,26 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="simplesoapfault"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
+<property name="ejbjar.files" value="${build.classes.dir}"/> \u0020
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.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="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
index 99f16a5..d93f199 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -49,45 +49,45 @@
<param name="src" value="ejb"/>
</antcall>
</target>
-
+
<target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SoapFaultMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
+ <param name="wscompile.command"
+ value="-define -mapping ${build.classes.dir}/SoapFaultMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
</antcall>
- </target>
-
+ </target>
+
<target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/ejb/*.class"/>
</antcall>
</target>
-
+
<target name="assemble" depends="assemble-ejb, assemble-client"/>
-
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
+ </antcall>
<antcall target="gen-ejb-wsdl"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/**,com/**" />
- </antcall>
+ </antcall>
<antcall target="deploy-client-common"/>
<move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}/soapfault/SimpleSoapFault"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -95,10 +95,10 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
<antcall target="undeploy-client-common"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
index 94bb7c1..c147d36 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
@@ -30,26 +30,26 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-simple-soapfault");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-soapfaultID");
}
-
+
public void doTest(String[] args) {
- try {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
Service testService = (Service) ic.lookup("java:comp/env/service/soapfault");
- SimpleSoapFaultSEI test = (SimpleSoapFaultSEI)
+ SimpleSoapFaultSEI test = (SimpleSoapFaultSEI)
testService.getPort(new QName("urn:SoapFaultTest", "SimpleSoapFaultSEIPort"),
SimpleSoapFaultSEI.class);
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
@@ -62,11 +62,11 @@
}
stat.addStatus("soapfaultsclient main", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("soapfaults client test failed");
ex.printStackTrace();
stat.addStatus("soapfaultsclient main", stat.FAIL);
//System.exit(15);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
index 7bbdfac..8bef265 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SoapFaultService"
- targetNamespace="urn:SoapFaultTest"
- typeNamespace="urn:SoapFaultTest"
+ <service
+ name="SoapFaultService"
+ targetNamespace="urn:SoapFaultTest"
+ typeNamespace="urn:SoapFaultTest"
packageName="soapfault">
<interface name="soapfault.ejb.SimpleSoapFaultSEI"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
index a25d0ec..87ba024 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<description>simple soapfault service ref</description>
<service-ref-name>service/soapfault</service-ref-name>
<service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SoapFaultService.wsdl</wsdl-file>
+ <wsdl-file>META-INF/wsdl/SoapFaultService.wsdl</wsdl-file>
<jaxrpc-mapping-file>SoapFaultMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:SoapFaultTest">servicens:SoapFaultService</service-qname>
+ <service-qname xmlns:servicens="urn:SoapFaultTest">servicens:SoapFaultService</service-qname>
<port-component-ref>
<service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
index b0bf170..0c58545 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
@@ -17,13 +17,13 @@
package soapfault.ejb;
public class SimpleSoapException extends Exception {
-
+
private String reason;
-
+
public SimpleSoapException(String reason) {
this.reason = reason;
}
-
+
public String getReason() {
return reason;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
index 4f68723..8646555 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
@@ -25,38 +25,38 @@
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
/**
*
* @author dochez
*/
public class SimpleSoapFaultImpl implements SessionBean {
-
+
SessionContext sc;
-
+
/** Creates a new instance of SimpleServerImpl */
public SimpleSoapFaultImpl() {
}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
-}
-
+ System.out.println("In GoogleEJB::ejbCreate !!");
+}
+
public String simpleMethod()
throws SimpleSoapException, RemoteException {
-
+
throw new SimpleSoapException("I only raise exceptions !");
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
index 74df048..113d8f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
@@ -20,7 +20,7 @@
import java.rmi.RemoteException;
public interface SimpleSoapFaultSEI extends Remote {
-
+
public String simpleMethod() throws SimpleSoapException, RemoteException;
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
index 0ba66c2..24c9cd5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="soapfaults"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
index d8f775c..b3b40d8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -58,11 +58,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . -f:explicitcontext wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/soapfaults">
- <fileset dir="output/soapfaults"
+ <fileset dir="output/soapfaults"
includes="TestService.class, Test.class, Test1RequestType.class, Test2RequestType.class, Test1ResponseType.class, FaultOne.class, FaultTwo.class, FaultThree.class"/>
</copy>
<delete dir="output"/>
@@ -71,11 +71,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . -f:explicitcontext wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/soapfaultsejb">
- <fileset dir="output/soapfaultsejb"
+ <fileset dir="output/soapfaultsejb"
includes="TestService.class, Test.class, Test1RequestType.class, Test2RequestType.class, Test1ResponseType.class, FaultOne.class, FaultTwo.class, FaultThree.class"/>
</copy>
<delete dir="output"/>
@@ -84,24 +84,24 @@
<target name="assemble" depends="init-common, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="soapfaults.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="mapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="mapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="mapping_appclient.xml,META-INF/wsdl/**,soapfaults/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="mapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="mapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="mapping_ejb.xml,META-INF/wsdl/**,soapfaultsejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -125,21 +125,21 @@
<param name="appclient.application.args" value="http://${http.host}:${http.port}/soapfaultsejb/SoapFaultsTest"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping_appclient.xml -f:explicitcontext wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping_ejb.xml -f:explicitcontext wscompile_config_ejb.xml"/>
</antcall>
</target>
@@ -148,7 +148,7 @@
<delete dir="out"/>
<mkdir dir="out"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -keep -d out -Xprintstacktrace -Xdebugmodel:good.debugModel.txt -mapping mapping.xml -f:explicitcontext wscompile_config_ejb.xml"/>
</antcall>
</target>
@@ -157,16 +157,16 @@
<delete dir="out"/>
<mkdir dir="out"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:both -cp . -keep -d out -Xprintstacktrace -Xdebugmodel:bad.debugModel.txt -f:explicitcontext config.xml"/>
</antcall>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
index 1a018ca..4e0a26d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
@@ -27,25 +27,25 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-soapfaults");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-soapfaultsID");
}
-
+
public void doTest(String[] args) {
- try {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
TestService testService =
(TestService) ic.lookup("java:comp/env/service/soapfaults");
Test test = testService.getTestPort();
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
@@ -72,11 +72,11 @@
}
stat.addStatus("soapfaultsclient main", stat.PASS);
- } catch (Exception ex) {
+ } catch (Exception ex) {
System.out.println("soapfaults client test failed");
ex.printStackTrace();
stat.addStatus("soapfaultsclient main", stat.FAIL);
//System.exit(15);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
index 05d466c..9ec3319 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
@@ -27,6 +27,6 @@
<wsdl-file>META-INF/wsdl/soapfaults.wsdl</wsdl-file>
<jaxrpc-mapping-file>mapping_appclient.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
+ </service-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
index 4ec0566..263306e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
@@ -17,7 +17,7 @@
package soapfaultsejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -28,14 +28,14 @@
private SessionContext sc;
public SoapFaultsEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SoapFaultsEJB::ejbCreate !!");
+ System.out.println("In SoapFaultsEJB::ejbCreate !!");
}
public Test1ResponseType test1(String a, String b,
Test2RequestType c)
- throws FaultOne, FaultThree, FaultTwo, java.rmi.RemoteException
+ throws FaultOne, FaultThree, FaultTwo, java.rmi.RemoteException
{
MessageContext msgContext = sc.getMessageContext();
System.out.println("msgContext = " + msgContext);
@@ -65,16 +65,16 @@
Test1ResponseType t = new Test1ResponseType(1,2);
return t;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
index 38d7aaa..20a2fdf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="soapfaults.wsdl"
packageName="soapfaults"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
index 6150951..bb3634b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="soapfaults.wsdl"
packageName="soapfaultsejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
index 46c880f..ae631e1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
@@ -15,26 +15,26 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="stubproperties"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
+<property name="ejbjar.files" value="${build.classes.dir}"/> \u0020
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
<property name="webservices.xml" value="webservices.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.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="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
index 24a165c..e86f2a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -49,34 +49,34 @@
<param name="src" value="stubprops"/>
</antcall>
</target>
-
+
<target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SayHelloMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
+ <param name="wscompile.command"
+ value="-define -mapping ${build.classes.dir}/SayHelloMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
</antcall>
- </target>
-
+ </target>
+
<target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
<mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
<copy todir="${build.classes.dir}/WEB-INF/wsdl"
- file="${build.classes.dir}/META-INF/wsdl/SayHelloService.wsdl"/>
+ file="${build.classes.dir}/META-INF/wsdl/SayHelloService.wsdl"/>
<copy todir="." file="descriptor/webservices.xml"/>
<antcall target="ejb-jar-common">
<param name="ejbjar.classes" value="SayHelloMapping_ejb.xml,META-INF/wsdl/**,stubprops/Simple*.class"/>
</antcall>
<delete file="webservices.xml"/>
- </target>
-
-
+ </target>
+
+
<target name="assemble-web" depends="init-common, compile, gen-web-wsdl">
<copy todir="." file="../shared/war/webservices.xml"/>
<copy todir="${build.classes.dir}/WEB-INF" file="${sun-web.xml}"/>
<replace file="${build.classes.dir}/WEB-INF/sun-web.xml" token="@webHost@" value="${http.host}"/>
<replace file="${build.classes.dir}/WEB-INF/sun-web.xml" token="@webPort@" value="${http.port}"/>
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
+ <param name="hasWebclient" value="yes"/>
<param name="sun-web.xml" value="${build.classes.dir}/WEB-INF/sun-web.xml"/>
<param name="mappingfile.location" value="${build.classes.dir}"/>
<param name="mappingfile.name" value="WebServiceTestMapping.xml"/>
@@ -88,61 +88,61 @@
<fileset dir="${build.classes.dir}" casesensitive="yes">
<include name="WEB-INF/wsdl/SayHelloService.wsdl"/>
<include name="SayHelloMapping_ejb.xml"/>
- </fileset>
+ </fileset>
</jar>
- <delete file="webservices.xml"/>
- </target>
-
+ <delete file="webservices.xml"/>
+ </target>
+
<target name="compile-web" depends="">
<antcall target="compile-common">
<param name="src" value="../shared/war"/>
</antcall>
- </target>
-
+ </target>
+
<target name="gen-web-wsdl" depends="init-common">
<!--<mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/> -->
<antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/WebServiceTestMapping.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir} ../shared/war/config.xml"/>
+ <param name="wscompile.command"
+ value="-define -mapping ${build.classes.dir}/WebServiceTestMapping.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir} ../shared/war/config.xml"/>
</antcall>
- </target>
-
+ </target>
+
<target name="assemble" depends="assemble-ejb, assemble-web, assemble-client"/>
-
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
+ </antcall>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="Client.class, test/**,com/**" />
- </antcall>
+ </antcall>
<move file="${assemble.dir}/${appname}-client.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
</target>
-
+
<target name="run" depends="init-common">
<antcall target="runclient-common">
<param name="appclient.application.args" value="http://${http.host}:${http.port}/WebServiceTestServlet/WebServiceTestService"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<antcall target="deploy-war-common">
- <param name="contextroot" value="WebServiceTestServlet"/>
+ <param name="contextroot" value="WebServiceTestServlet"/>
</antcall>
</target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-jar-common"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
index 0429160..11a1660 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
@@ -31,43 +31,43 @@
*/
public class Client {
-
+
private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
stat.addDescription("webservices-web-stubs-properties");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-web-stubs-properties");
+ stat.printSummary("webservices-web-stubs-properties");
}
public void doTest(String[] args) {
try {
dynamic(args);
- stat.addStatus("web-stubs-properties Dynamic Proxy", stat.PASS);
+ stat.addStatus("web-stubs-properties Dynamic Proxy", stat.PASS);
} catch(Exception e) {
System.out.println("Failure " + e.getMessage());
e.printStackTrace();
- stat.addStatus("web-stubs-properties Dynamic Proxy", stat.FAIL);
+ stat.addStatus("web-stubs-properties Dynamic Proxy", stat.FAIL);
}
}
-
+
public void dynamic(String[] args) throws Exception {
String endpoint = args[0];
System.out.println("Invoking dynamic proxies with endpoint at " + endpoint);
URL wsdlURL = new URL(endpoint+"?WSDL");
ServiceFactory factory = ServiceFactory.newInstance();
- Service service = factory.createService(wsdlURL,
+ Service service = factory.createService(wsdlURL,
new QName("urn:WebServiceTest","WebServiceServletTest"));
System.out.println("Obtained Service");
WebServiceTest intf = (WebServiceTest) service.getPort(
- new QName("urn:WebServiceTest","WebServiceTestPort"),
+ new QName("urn:WebServiceTest","WebServiceTestPort"),
WebServiceTest.class);
String[] params = new String[1];
- params[0] = " from client";
+ params[0] = " from client";
System.out.println(intf.doTest(params));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
index 0e0b627..5c9ef91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
+ <service
+ name="SayHelloService"
+ targetNamespace="urn:WebServiceTest"
+ typeNamespace="urn:WebServiceTest"
packageName="stubprops">
<interface name="stubprops.SimpleServer"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml
index 901f2aa..932f37b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml
@@ -26,7 +26,7 @@
<webservice-endpoint>
<port-component-name>SimpleServerPort</port-component-name>
<endpoint-address-uri>simpleserver/SimpleServer</endpoint-address-uri>
- <debugging-enabled>true</debugging-enabled>
+ <debugging-enabled>true</debugging-enabled>
</webservice-endpoint>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml
index 12f6c59..36605da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml
@@ -34,7 +34,7 @@
<stub-property>
<name>javax.xml.rpc.service.endpoint.address</name>
<value>http://@webHost@:@webPort@/simpleserver/SimpleServer </value>
- </stub-property>
+ </stub-property>
</port-info>
- </service-ref>
+ </service-ref>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
index 55e67ca..283ad48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
@@ -41,5 +41,5 @@
<port-component-ref>
<service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
</port-component-ref>
- </service-ref>
+ </service-ref>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
index b3c5973..8c189bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
@@ -22,8 +22,8 @@
package stubprops;
-import java.rmi.RemoteException;
-import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.Remote;
/**
* Simple WebServices Interface
@@ -31,6 +31,6 @@
* @author Jerome Dochez
*/
public interface SimpleServer extends Remote {
-
+
public String sayHello(String who) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
index b71c4fe..4a88917 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
@@ -25,36 +25,36 @@
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
/**
*
* @author dochez
*/
public class SimpleServerImpl implements SessionBean {
-
+
SessionContext sc;
-
+
/** Creates a new instance of SimpleServerImpl */
public SimpleServerImpl() {
}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
-}
-
+ System.out.println("In GoogleEJB::ejbCreate !!");
+}
+
public String sayHello(String who) throws RemoteException {
return "hello" + who;
- }
-
+ }
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
index 3db4899..94706ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
@@ -33,16 +33,16 @@
* @author dochez
*/
public class TestServlet implements WebServiceTest {
-
+
SimpleServer port;
-
+
/** Creates a new instance of TestServlet */
public TestServlet() {
- System.out.println("Test servlet instantiated");
+ System.out.println("Test servlet instantiated");
}
-
+
public String doTest(String[] parameters) throws RemoteException {
-
+
System.out.println("Test servlet invoked");
Service ref;
try {
@@ -60,7 +60,7 @@
java.util.Iterator itr = ref.getPorts();
while (itr.hasNext()) {
System.out.println(itr.next());
-
+
}
port = (SimpleServer) ref.getPort(SimpleServer.class);
@@ -73,6 +73,6 @@
System.out.println("failure : cannot get port");
return "Failed - Cannot get port";
}
- return port.sayHello(parameters[0]);
- }
+ return port.sayHello(parameters[0]);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties
index 0a40a08..b3ecf0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="service_endpoint_address"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb.wsit.descriptors" value="./descriptors"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml
index ede3a10..348af5c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml
@@ -45,7 +45,7 @@
<antcall target="compile-common">
<param name="src" value="endpoint"/>
</antcall>
-
+
<antcall target="pkg-ejb-jar">
<param name="jar.classes" value="endpoint"/>
<param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java
index fcd3cb7..e1e4d2c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java
@@ -32,7 +32,7 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("wls_dd.service_endpoint_address");
+ stat.addDescription("wls_dd.service_endpoint_address");
Client client = new Client();
client.runTest();
stat.printSummary("wls_dd.service_endpoint_address");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties
index 9a4e313..22b6611 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/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="wsdl_exposed_false"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="webservices.xml" value="./webservices.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml
index cca584e..78d64b5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml
@@ -75,8 +75,8 @@
<param name="wsimport.args"
value="-keep -p wls_dd.${ant.project.name}.client -d ${build.classes.dir}/client ${localwsdldir}/AddNumbersService.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java
index cc331e3..8d6d615 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java
@@ -32,7 +32,7 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("wls_dd.wsdl_exposed_false");
+ stat.addDescription("wls_dd.wsdl_exposed_false");
Client client = new Client();
client.runTest();
stat.printSummary("wls_dd.wsdl_exposed_false");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml
index 39bd1a5..06c3052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml
@@ -18,17 +18,17 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>wls_dd.wsdl_exposed_false.endpoint.AddNumbersImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/service</url-pattern>
- </servlet-mapping>
+ xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>wls_dd.wsdl_exposed_false.endpoint.AddNumbersImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/service</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml
index ea2650a..1d0f8b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml
@@ -18,9 +18,9 @@
-->
<application
- version="1.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
<description>WSI Sample Application description</description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml
index 6633c3f..25d7fe5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>WSI-Sample-Application</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
index 0f79eab..95bf199 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="faultcode"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
index 49b7904..f227f99 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -58,11 +58,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/faultcode">
- <fileset dir="output/faultcode"
+ <fileset dir="output/faultcode"
includes="SimpleTestService.class, SimpleTest.class"/>
</copy>
<delete dir="output"/>
@@ -71,11 +71,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/faultcodeejb">
- <fileset dir="output/faultcodeejb"
+ <fileset dir="output/faultcodeejb"
includes="SimpleTestService.class, SimpleTest.class"/>
</copy>
<delete dir="output"/>
@@ -84,24 +84,24 @@
<target name="assemble" depends="init-common, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="faultcode.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="FaultCodeMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="FaultCodeMapping_appclient.xml,META-INF/wsdl/**,faultcode/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="FaultCodeMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="FaultCodeMapping_ejb.xml,META-INF/wsdl/**,faultcodeejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -121,29 +121,29 @@
<param name="appclient.application.args" value="http://${http.host}:${http.port}/faultcodeejb/FaultCodeTest"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping FaultCodeMapping_appclient.xml wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping FaultCodeMapping_ejb.xml wscompile_config_ejb.xml"/>
</antcall>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
index 0950680..75cfd91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
@@ -27,25 +27,25 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-faultcode");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-faultcodeID");
}
-
+
public void doTest(String[] args) {
- try {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
SimpleTestService testService =
(SimpleTestService) ic.lookup("java:comp/env/service/faultcode");
SimpleTest test = testService.getSimpleTest();
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
@@ -65,11 +65,11 @@
System.out.println("RETURN LUCKY NUMBER = " + ret);
*/
stat.addStatus("xsdanyclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } catch (Exception ex) {
System.out.println("xsdany client test failed");
ex.printStackTrace();
stat.addStatus("xsdanyclient main", stat.FAIL);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
index 25ff5b5..1ccab9c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
@@ -27,6 +27,6 @@
<wsdl-file>META-INF/wsdl/faultcode.wsdl</wsdl-file>
<jaxrpc-mapping-file>FaultCodeMapping_appclient.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
+ </service-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
index e997514..548d61c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
@@ -17,7 +17,7 @@
package faultcodeejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -28,25 +28,25 @@
private SessionContext sc;
public FaultCodeEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In FaultCodeEJB::ejbCreate !!");
+ System.out.println("In FaultCodeEJB::ejbCreate !!");
}
public String echoString(String body) {
- System.out.println("In FaultCodeEJB:: echoString = " + body);
+ System.out.println("In FaultCodeEJB:: echoString = " + body);
return body;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
index 59bb4ea..1dde122 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="faultcode.wsdl"
packageName="faultcode"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml
index f064674..af5e53f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="faultcode.wsdl"
packageName="faultcodeejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
index b8b6a3a..320b811 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="xsdany"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
<property name="webservices.xml" value="descriptor/webservices.xml"/>
<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
+<property name="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
index c68415a..3587f03 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -58,11 +58,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
</antcall>
<copy todir="${build.classes.dir}/xsdany">
- <fileset dir="output/xsdany"
+ <fileset dir="output/xsdany"
includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
</copy>
<delete dir="output"/>
@@ -71,11 +71,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
</antcall>
<copy todir="${build.classes.dir}/xsdanyejb">
- <fileset dir="output/xsdanyejb"
+ <fileset dir="output/xsdanyejb"
includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
</copy>
<delete dir="output"/>
@@ -84,24 +84,24 @@
<target name="assemble" depends="init-common, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="xsdany.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_appclient.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="XsdAnyMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="XsdAnyMapping_appclient.xml,META-INF/wsdl/**,xsdany/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="XsdAnyMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="XsdAnyMapping_ejb.xml,META-INF/wsdl/**,xsdanyejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -121,29 +121,29 @@
<param name="appclient.application.args" value="http://${http.host}:${http.port}/xsdanyejb/XsdAnyTest"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping XsdAnyMapping_appclient.xml wscompile_config_appclient.xml"/>
</antcall>
</target>
<target name="gen-mapping-ejb" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen -cp . -mapping XsdAnyMapping_ejb.xml wscompile_config_ejb.xml"/>
</antcall>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
index b3fab97..eaac596 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
@@ -27,25 +27,25 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main (String[] args) {
stat.addDescription("webservices-xsdany");
Client client = new Client();
client.doTest(args);
stat.printSummary("webservices-xsdanyID");
}
-
+
public void doTest(String[] args) {
- try {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
TestService testService =
(TestService) ic.lookup("java:comp/env/service/xsdany");
Test test = testService.getTestPort();
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
@@ -63,11 +63,11 @@
System.out.println("RETURN LUCKY NUMBER = " + ret);
stat.addStatus("xsdanyclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } catch (Exception ex) {
System.out.println("xsdany client test failed");
ex.printStackTrace();
stat.addStatus("xsdanyclient main", stat.FAIL);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
index 5dca417..f018ec8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
@@ -27,6 +27,6 @@
<wsdl-file>META-INF/wsdl/xsdany.wsdl</wsdl-file>
<jaxrpc-mapping-file>XsdAnyMapping_appclient.xml</jaxrpc-mapping-file>
<service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
+ </service-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
index be667d5..1047c96 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
@@ -17,7 +17,7 @@
package xsdanyejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -28,15 +28,15 @@
private SessionContext sc;
public XsdAnyEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In XsdAnyEJB::ejbCreate !!");
+ System.out.println("In XsdAnyEJB::ejbCreate !!");
}
- public int test1(int a,
- xsdanyejb.SingleWildcardType c,
- xsdanyejb.RepeatedWildcardType d)
- throws java.rmi.RemoteException
+ public int test1(int a,
+ xsdanyejb.SingleWildcardType c,
+ xsdanyejb.RepeatedWildcardType d)
+ throws java.rmi.RemoteException
{
MessageContext msgContext = sc.getMessageContext();
System.out.println("msgContext = " + msgContext);
@@ -57,16 +57,16 @@
return a;
}
-
+
public void setSessionContext(SessionContext sc) {
-
+
this.sc = sc;
}
-
+
public void ejbRemove() throws RemoteException {}
-
+
public void ejbActivate() {}
-
+
public void ejbPassivate() {}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
index 881891f..bcb953b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="xsdany.wsdl"
packageName="xsdany"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
index bbeb29b..cc2b737 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="xsdany.wsdl"
packageName="xsdanyejb"/>
</configuration>
